From 11d12011f3e08aaca73ef2a84d3a9c29e818cfe5 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Fri, 17 Feb 2006 15:54:23 +0000 Subject: [PATCH] * scripts/dpkg-gencontrol.pl: Make -isp the default behaviour. * man/C/dpkg-source.1: Document the behaviour change in dpkg-gencontrol. Closes: #215233 --- ChangeLog | 6 ++++++ debian/changelog | 3 +++ man/C/dpkg-source.1 | 17 +++++++---------- scripts/dpkg-gencontrol.pl | 15 ++++----------- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fc1af1c..3aae3eb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 * debian/dselect.install: Install only dselect domain. diff --git a/debian/changelog b/debian/changelog index 5ecb8b5d..35fd3c60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ dpkg (1.13.16~) UNRELEASED; urgency=low [ 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 Fri, 17 Feb 2006 03:52:59 +0200 diff --git a/man/C/dpkg-source.1 b/man/C/dpkg-source.1 index a4110421..5ee47743 100644 --- a/man/C/dpkg-source.1 +++ b/man/C/dpkg-source.1 @@ -441,16 +441,13 @@ Assume the filename of the package will be 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 diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl index 7ba35760..2336e189 100755 --- a/scripts/dpkg-gencontrol.pl +++ b/scripts/dpkg-gencontrol.pl @@ -34,9 +34,7 @@ Options: -p print control file for package -P temporary build dir instead of debian/tmp -n assume the package filename will be -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= override or add a field and value -U remove a field -V= set a substitution variable @@ -70,13 +68,8 @@ while (@ARGV) { $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 $_ (keys %fi) { 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)) { -- 2.39.5