Author: djpig
Date: 2006-02-17 15:54:23 +0000 (Fri, 17 Feb 2006)
New Revision: 153
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/man/C/dpkg-source.1
trunk/scripts/dpkg-gencontrol.pl
Log:
* scripts/dpkg-gencontrol.pl: Make -isp the default
behaviour.
* man/C/dpkg-source.1: Document the behaviour
change in dpkg-gencontrol.
Closes: #215233
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-02-17 14:35:13 UTC (rev 152)
+++ trunk/ChangeLog 2006-02-17 15:54:23 UTC (rev 153)
@@ -3,6 +3,12 @@
* scripts/dpkg-scanpackages.pl: Fix override handling
which was broken by the latest changes.
+ * scripts/dpkg-gencontrol.pl: Make -isp the default
+ behaviour.
+ * man/C/dpkg-source.1: Document the behaviour
+ change in dpkg-gencontrol.
+
+
2006-02-17 Guillem Jover <[EMAIL PROTECTED]>
* debian/dselect.install: Install only dselect domain.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-02-17 14:35:13 UTC (rev 152)
+++ trunk/debian/changelog 2006-02-17 15:54:23 UTC (rev 153)
@@ -11,6 +11,9 @@
[ Frank Lichtenheld ]
* Fix override handling in dpkg-scanpackages which was broken in
1.13.14 and .15. Closes: #353305
+ * Make -isp the default behaviour of dpkg-gencontrol as it is
+ always used anyway these days. Suggested by Matthew Vernon.
+ Closes: #215233
-- Guillem Jover <[EMAIL PROTECTED]> Fri, 17 Feb 2006 03:52:59 +0200
Modified: trunk/man/C/dpkg-source.1
===================================================================
--- trunk/man/C/dpkg-source.1 2006-02-17 14:35:13 UTC (rev 152)
+++ trunk/man/C/dpkg-source.1 2006-02-17 15:54:23 UTC (rev 153)
@@ -441,16 +441,13 @@
instead of the normal package_version_arch.deb filename.
.TP
.BR \-is ", " \-ip ", " \-isp
-Include the
-.BR Section " and " Priority
-fields for this package from the main source control file in the
-binary package control file being generated. Usually this information
-is not included here, but only in the
-.B .changes
-file.
-.B \-isp
-includes both fields,
-.BR \-is " only the " Section " and " \-ip " only the " Priority .
+These options are ignored for compatibility with older versions of
+dpkg-dev but are now deprecated. Previously they were used to tell
+dpkg-gencontrol to include the Section and Priority fields in the
+control file. This is now the default behaviour. If you want to
+get the old behaviour you can use the
+.B \-U
+option to delete the fields from the control file.
.TP
.BI \-P packagebuilddir
Tells
Modified: trunk/scripts/dpkg-gencontrol.pl
===================================================================
--- trunk/scripts/dpkg-gencontrol.pl 2006-02-17 14:35:13 UTC (rev 152)
+++ trunk/scripts/dpkg-gencontrol.pl 2006-02-17 15:54:23 UTC (rev 153)
@@ -34,9 +34,7 @@
-P<packagebuilddir> temporary build dir instead of debian/tmp
-n<filename> assume the package filename will be <filename>
-O write to stdout, not .../DEBIAN/control
- -is include section field
- -ip include priority field
- -isp|-ips include both section and priority
+ -is, -ip, -isp, -ips deprecated, ignored for compatibility
-D<field>=<value> override or add a field and value
-U<field> remove a field
-V<name>=<value> set a substitution variable
@@ -70,13 +68,8 @@
$forceversion= $1;
} elsif (m/^-O$/) {
$stdout= 1;
- } elsif (m/^-is$/) {
- $spinclude{'Section'}=1;
- } elsif (m/^-ip$/) {
- $spinclude{'Priority'}=1;
- } elsif (m/^-isp$/ || m/^-ips$/) {
- $spinclude{'Section'}=1;
- $spinclude{'Priority'}=1;
+ } elsif (m/^-i[sp][sp]?$/) {
+ # ignored for backwards compatibility
} elsif (m/^-F([0-9a-z]+)$/) {
$changelogformat=$1;
} elsif (m/^-D([^\=:]+)[=:]/) {
@@ -205,7 +198,7 @@
for $f (qw(Section Priority)) {
$spvalue{$f}= $spdefault{$f} unless length($spvalue{$f});
- $f{$f}= $spvalue{$f} if $spinclude{$f} && length($spvalue{$f});
+ $f{$f}= $spvalue{$f} if length($spvalue{$f});
}
for $f (qw(Package Version)) {
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
