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 8ff75f056ff3486f133882d89fe85ed13373f8d9..6cc9a7b34b1dad01967090ed4115275e25bd24b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,19 @@
+Sun Jul 16 12:43:59 EDT 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * 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 <peterk@debian.org>
 
   * po/sv.po: More corrections.
 
+Thu Jul 13 10:22:43 EDT 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * 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 <wakkerma@debian.org>
 
   * main/enquiry.c: modify getttywidth() to check COLUMNS environment

diff --git a/debian/changelog b/debian/changelog
index 3074aea696a8ec4b4f189259f28a21925ad79fcd..2e3bb8c9112ff07780c129fe3c565c3e0593657e 100644 (file)
--- 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 <wakkerma@debian.org>  UNRELEASED

diff --git a/debian/copyright b/debian/copyright
index 5def4f690806117d58d2a4ab4d51d036372589d5..6956613b489b98cd1d87fb8a58c9e28d5af7ccdc 100644 (file)
--- 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 <wakkerma@debian.org>
 Copyright (C) 1999 Ben Collins <bcollins@debian.org>
 Copyright (C) 1997-1998 Juho Vuori <javuori@cc.helsinki.fi>
 Copyright (C) 1998 Nils Rennebarth <nils@debian.org>
-Copyright (C) 1998 Miquel van Smoorenburg <miquels@cistron.nl>
+Copyright (C) 1996,1998 Miquel van Smoorenburg <miquels@cistron.nl>
 Copyright (C) 1998 Juan Cespedes <cespedes@debian.org>
 Copyright (C) 1998 Jim Van Zandt <jrv@vanzandt.mv.com>
 copyright (C) 1997 Charles Briscoe-Smith <cpbs@debian.org>
 Copyright (C) 1995,1996 Erick Branderhorst <branderhorst@heel.fgg.eur.nl>
-Copyright (C) 1996 Miquel van Smoorenburg <miquels@cistron.nl>
 Copyright (C) 1996 Kim-Minh Kaplan <kkaplan@cdfhp3.in2p3.fr>
 Copyright (C) 1996 Michael Shields <shields@crosslink.net>
 Copyright (C) 1995 Bruce Perens <bruce@pixar.com>

diff --git a/lib/fields.c b/lib/fields.c
index 2d0a10e4fe1badc99ea63c2c6844f1ad6d26ef73..a4479722a49c0ba837fd64b0fc5d5c97470e6ef0 100644 (file)
--- 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 be249b38e27503d67a5c428e7ad0c677534bed26..0a97ac79858ba0f119a000dfbdf0f6c3d5924d46 100755 (executable)
--- 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 01ba40a1c82da863f80ba1039e599364cafb2694..8b6ec16e1310149aed8b59acffc6bfe245088079 100755 (executable)
--- 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<package>            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 2058115b0ac34dc79632b4f3efe9ed2c727f0f74..be969dd34885dabff63e13401270a8e40e4ed811 100644 (file)
--- 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