From: Wichert Akkerman Date: Mon, 17 Jul 2000 06:53:59 +0000 (+0000) Subject: scripts/dpkg-gencontrol.pl: add Origin, Submit-Bugs-To and Submit-Bugs-Style fields. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b826e444937cd1928fdbd2a0396fd05391b1ac44;p=dpkg scripts/dpkg-gencontrol.pl: add Origin, Submit-Bugs-To and Submit-Bugs-Style fields. scripts/dpkg-source.1: slight formatting update debian/copyright: merge to entries for Miquel van Smoorenburg --- diff --git a/ChangeLog b/ChangeLog index 8ff75f05..6cc9a7b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,19 @@ +Sun Jul 16 12:43:59 EDT 2000 Wichert Akkerman + + * scripts/dpkg-gencontrol.pl: add Origin, Submit-Bugs-To and + Submit-Bugs-Style fields. + * scripts/dpkg-source.1: slight formatting update + * debian/copyright: merge to entries for Miquel van Smoorenburg + Sat Jul 15 14:55:00 CEST 2000 peter karlsson * po/sv.po: More corrections. +Thu Jul 13 10:22:43 EDT 2000 Wichert Akkerman + + * lib/fields.c: make a non-exact versioned provides a warning instead + of an error + Tue Jul 4 17:29:06 CEST 2000 Wichert Akkerman * main/enquiry.c: modify getttywidth() to check COLUMNS environment diff --git a/debian/changelog b/debian/changelog index 3074aea6..2e3bb8c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ dpkg (1.7.0) unstable; urgency=low * dpkg-statoverride: new tool to override ownership and modes for files * Modify dpkg and dselect to allow versioned provides * Check COLUMNS environment for dpkg -l output. Closes: Bug#65536 + * Add Origin, Bugs-Submit-To, Bugs-Submit-Style * Corrections and updates to Swedish translation. -- Wichert Akkerman UNRELEASED diff --git a/debian/copyright b/debian/copyright index 5def4f69..6956613b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -This is Debian Linux's package maintenance system. +This is Debian's package maintenance system. To build your own packages install the `dpkg-dev' package and read the manuals which it installs in /usr/share/doc/dpkg and look at the `hello' @@ -11,12 +11,11 @@ Copyright (C) 1999-2000 Wichert Akkerman Copyright (C) 1999 Ben Collins Copyright (C) 1997-1998 Juho Vuori Copyright (C) 1998 Nils Rennebarth -Copyright (C) 1998 Miquel van Smoorenburg +Copyright (C) 1996,1998 Miquel van Smoorenburg Copyright (C) 1998 Juan Cespedes Copyright (C) 1998 Jim Van Zandt copyright (C) 1997 Charles Briscoe-Smith Copyright (C) 1995,1996 Erick Branderhorst -Copyright (C) 1996 Miquel van Smoorenburg Copyright (C) 1996 Kim-Minh Kaplan Copyright (C) 1996 Michael Shields Copyright (C) 1995 Bruce Perens diff --git a/lib/fields.c b/lib/fields.c index 2d0a10e4..a4479722 100644 --- a/lib/fields.c +++ b/lib/fields.c @@ -335,7 +335,7 @@ void f_dependency(struct pkginfo *pigp, struct pkginfoperfile *pifp, dop->verrel= dvr_exact; } if ((dop->verrel!=dvr_exact) && (fip->integer==dep_provides)) - parseerr(0,filename,lno,warnto,warncount,pigp,0, + parseerr(0,filename,lno,warnto,warncount,pigp,1, _("Only exact versions may be used for Provides")); if (!isspace(*p) && !isalnum(*p)) { diff --git a/scripts/controllib.pl b/scripts/controllib.pl index be249b38..0a97ac79 100755 --- a/scripts/controllib.pl +++ b/scripts/controllib.pl @@ -14,7 +14,7 @@ $parsechangelog= 'dpkg-parsechangelog'; grep($capit{lc $_}=$_, qw(Pre-Depends Standards-Version Installed-Size - Build-Depends Build-Depends-Indep + Build-Depends Build-Depends-Indep Origin Build-Conflicts Build-Conflicts-Indep)); diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl index 01ba40a1..8b6ec16e 100755 --- a/scripts/dpkg-gencontrol.pl +++ b/scripts/dpkg-gencontrol.pl @@ -17,9 +17,11 @@ require 'controllib.pl'; sub usageversion { print STDERR -"Debian GNU/Linux dpkg-gencontrol $version. Copyright (C) 1996 -Ian Jackson. This is free software; see the GNU General Public Licence -version 2 or later for copying conditions. There is NO warranty. +"Debian GNU/Linux dpkg-gencontrol $version. +Copyright (C) 1996 Ian Jackson. +Copyright (C) 2000 Wichert Akkerman. +This is free software; see the GNU General Public Licence version 2 or later +for copying conditions. There is NO warranty. Usage: dpkg-gencontrol [options ...] @@ -43,11 +45,11 @@ Options: -p print control file for package } $i=100;grep($fieldimps{$_}=$i--, - qw(Package Version Section Priority Architecture Essential + qw(Package Version Origin Section Priority Architecture Essential Pre-Depends Depends Recommends Suggests Enhances Optional Conflicts Replaces Provides Installed-Size Maintainer Source Description Build-Depends Build-Depends-Indep Build-Conflicts - Build-Conflicts-Indep Source)); + Build-Conflicts-Indep Source Bugs-Submit-To Bugs-Submit-Style )); while (@ARGV) { $_=shift(@ARGV); @@ -109,7 +111,7 @@ for $_ (keys %fi) { $v= $fi{$_}; if (s/^C //) { #print STDERR "G key >$_< value >$v<\n"; - if (m/^Maintainer$/) { $f{$_}=$v; } + if (m/^Origin|Bugs-(Submit-To|Submit-Style)|Maintainer)$/) { $f{$_}=$v; } elsif (m/^Source$/) { &setsourcepackage; } elsif (s/^X[CS]*B[CS]*-//i) { $f{$_}= $v; } elsif (m/^X[CS]+-|^Standards-Version$|^Build-(Depends|Conflicts)(-Indep)?$/i) { } diff --git a/scripts/dpkg-source.1 b/scripts/dpkg-source.1 index 2058115b..be969dd3 100644 --- a/scripts/dpkg-source.1 +++ b/scripts/dpkg-source.1 @@ -764,7 +764,9 @@ and initial arguments for The utilities and this manpage were written by Ian Jackson. .SH COPYRIGHT Copyright (C) 1995-1996 Ian Jackson +.br Copyright (C) 2000 Wichert Akkerman +.br This is free software; see the GNU General Public Licence version 2 or later for copying conditions. There is NO WARRANTY. See .B /usr/share/doc/dpkg/copyright