The following commit has been merged in the master branch:
commit 655872184c55febb2299eb6a19aa4d0612d2da60
Author: Guillem Jover <guil...@debian.org>
Date: Tue May 19 07:39:08 2009 +0200
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.
diff --git a/README.feature-removal-schedule b/README.feature-removal-schedule
index 76d8365..61f9bcf 100644
--- a/README.feature-removal-schedule
+++ b/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
diff --git a/debian/changelog b/debian/changelog
index 2e9d1d7..263a623 100644
--- a/debian/changelog
+++ b/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
diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index aab42ad..ecbd3e1 100644
--- a/man/dpkg-source.1
+++ b/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
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index f3af7a4..ce5cc1a 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/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/) {
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 6ea264c..1b4f225 100755
--- a/scripts/dpkg-source.pl
+++ b/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);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
