Просмотр исходного кода

Remove deprecated status for substvars in dpkg-source and dpkg-genchanges

Even if there's no use at all for substvars or they are (currently)
undesirable making the source not easily reproducible for Debian and
most derivatives using the same build processesor, it might be
interesting for uses like templated source package generation and
similar, or other interesting ideas we might not have thought about.

Also the same logic we applied for the removal of the substvar support
could be applied to most of the “Build options” as well, as those do not
make sense in the normal build for official packages (like -U, or -D).

Changed the code to stop producing warnings, and remove deprecated notes
from man page.
Guillem Jover лет назад: 17
Родитель
Сommit
655872184c
5 измененных файлов с 4 добавлено и 14 удалено
  1. 0 9
      README.feature-removal-schedule
  2. 2 0
      debian/changelog
  3. 2 2
      man/dpkg-source.1
  4. 0 1
      scripts/dpkg-genchanges.pl
  5. 0 2
      scripts/dpkg-source.pl

+ 0 - 9
README.feature-removal-schedule

@@ -25,15 +25,6 @@ Warning: none
 Why:
  This option has been superseded by -tudeb.
 
-What: substvars support in dpkg-source and dpkg-genchanges
-Status: deprecated
-When: lenny+1
-Warning: program
-Why:
- substvars do not make sense during generation of .dsc and .changes files.
- This also means that it won't be possible anymore to override the Format
- field output by dpkg-genchanges.
-
 What: support of custom changelog parsers understanding only -v
 Status: obsolete
 When: lenny+1

+ 2 - 0
debian/changelog

@@ -125,6 +125,8 @@ dpkg (1.15.1) UNRELEASED; urgency=low
   * Remove obsolete priorities support from dpkg.
   * Remove obsolete 822-date program.
   * Do not right justify the database reading progress percent counter.
+  * Remove deprecated status on substvars for dpkg-source dpkg-genchanges,
+    and stop producing warnings.
 
   [ Frank Lichtenheld ]
   * Dpkg::Version: Remove unnecessary function next_elem which just

+ 2 - 2
man/dpkg-source.1

@@ -96,11 +96,11 @@ multiple times, they are tried in order. It does
 override any format given in \fBdebian/source/format\fP.
 .TP
 .BI \-V name = value
-\fBDeprecated\fP. Set an output substitution variable.
+Set an output substitution variable.
 See \fBdeb\-substvars\fP(5) for a discussion of output substitution.
 .TP
 .BI \-T substvarsfile
-\fBDeprecated\fP. Read substitution variables in
+Read substitution variables in
 .IR substvarsfile ;
 the default is to not read any file.
 .TP

+ 0 - 1
scripts/dpkg-genchanges.pl

@@ -162,7 +162,6 @@ while (@ARGV) {
 	$since= $POSTMATCH;
     } elsif (m/^-T/) {
 	$varlistfile= $POSTMATCH;
-	warning(_g("substvars support is deprecated (see README.feature-removal-schedule)"));
     } elsif (m/^-m/) {
 	$forcemaint= $POSTMATCH;
     } elsif (m/^-e/) {

+ 0 - 2
scripts/dpkg-source.pl

@@ -103,10 +103,8 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
         $options{'require_valid_signature'} = 1;
     } elsif (m/^-V(\w[-:0-9A-Za-z]*)[=:]/) {
         $substvars->set($1, $POSTMATCH);
-        warning(_g("substvars support is deprecated (see README.feature-removal-schedule)"));
     } elsif (m/^-T/) {
         $varlistfile = $POSTMATCH;
-        warning(_g("substvars support is deprecated (see README.feature-removal-schedule)"));
     } elsif (m/^-(h|-help)$/) {
         usage();
         exit(0);