doc/*: remove all references to GNU/Linux and just mention `Debian system': we just...

scripts/dpkg-source.pl: add Format-field to .dsc files
debian/changelog: include changes from 1.6.12.99

diff --git a/ChangeLog b/ChangeLog
index f66bddb0b0d802b60ae51964e01aba9fce6e3e4a..97db654272990a73edcfb06ae68fdcd678083a1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Apr 30 14:19:41 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * doc/*: remove all references to GNU/Linux and just mention `Debian
+    system': we just as well on other operating systems.
+  * scripts/dpkg-source.pl: add Format-field to .dsc files
+  * debian/changelog: include changes from 1.6.12.99
+
 Sat Apr 15 14:53:23 EDT 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * TODO: updated

diff --git a/debian/changelog b/debian/changelog
index 4fd758087a8da506ed83368982d21c085b6380cd..7e4b685f8866c82505e3ef75a1db28a5fbdc560c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,20 @@ dpkg (1.7.0) unstable; urgency=low
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 
+dpkg (1.6.12.99) frozen unstable; urgency=low
+
+  * Pre-release for 1.6.13. which will only feature translation updates
+  * Fix typo in dpkg-divert, Closes: Bug#60243
+  * dpkg-genchanges: recognize non-deb packages (tarballs, such as
+    dpkg-non-deb and boot-floppies disk tarballs). This makes sure that we
+    include them when figuring out the Arch field in the .changes
+  * mark another string as translateable, Closes: Bug#62543
+  * fix location of --abort-after in --help output, Closes: Bug#62464
+  * fix allocation error in checkpath(), Closes: Bug#62364
+  * add Hold to list of desired package states in -l output, Closes: Bug#58765
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Fri, 21 Apr 2000 11:52:59 +0200
+
 dpkg (1.6.12) frozen unstable; urgency=high
 
   * Fix test for gpg/pgp in dpkg-buildpackage. You can now build

diff --git a/debian/copyright b/debian/copyright
index 880ae194cf89f12604578a105b5712b11eddb961..5def4f690806117d58d2a4ab4d51d036372589d5 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ example package.
 
 Copyright (C) 1994-1999 Ian Jackson <ian@chiark.chu.cam.ac.uk>
 Copyright (C) 1999 Richard Kettlewell <rjk@sfere.greenend.org.uk>
-Copyright (C) 1999 Wichert Akkerman <wakkerma@debian.org>
+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>

diff --git a/doc/deb-control.5 b/doc/deb-control.5
index ba0ff3b3b68f339567f4fdffcccdb5cc8447917a..d3e7ab11c803585a6d1f8717f31944a897a23027 100644 (file)
--- a/doc/deb-control.5
+++ b/doc/deb-control.5
@@ -1,9 +1,9 @@
 .\" Hey, Emacs!  This is an -*- nroff -*- source file.
 .\" Author: Raul Miller
 .\" Includes text from the debian Guidelines by Ian Jackson, Ian Murdock
-.TH DEB-CONTROL 5 "January 2000" "Debian Project" "Debian GNU/Linux"
+.TH DEB-CONTROL 5 "January 2000" "Debian Project" "dpkg"
 .SH NAME
-deb\-control \- Debian GNU/Linux packages' master control file format
+deb\-control \- Debian packages' master control file format
 .SH SYNOPSIS
 control
 .SH DESCRIPTION

diff --git a/doc/deb-old.5 b/doc/deb-old.5
index 00542695671167829a6dedbd4a6fb6b00eaac473..02b3309b5f29034af8d4fa5f74a51d1568586da6 100644 (file)
--- a/doc/deb-old.5
+++ b/doc/deb-old.5
@@ -1,8 +1,8 @@
 .\" Hey, Emacs!  This is an -*- nroff -*- source file.
 .\" Author: Raul Miller, Ian Jackson
-.TH DEB-OLD 5 "January 2000" "Debian Project" "Debian GNU/Linux"
+.TH DEB-OLD 5 "January 2000" "Debian Project" "dpkg"
 .SH NAME 
-deb-old \- old style Debian GNU/Linux binary package format
+deb-old \- old style Debian binary package format
 .SH SYNOPSIS
 .IB filename .deb
 .SH DESCRIPTION

diff --git a/doc/deb.5 b/doc/deb.5
index a933b09c731397c907a0be499ea7f02d3763ed02..a612c9f28ee9eae93d72798e05b07eb6ffb014e7 100644 (file)
--- a/doc/deb.5
+++ b/doc/deb.5
@@ -1,8 +1,8 @@
 .\" Hey, Emacs!  This is an -*- nroff -*- source file.
 .\" Authors: Raul Miller, Ian Jackson
-.TH DEB 5 "January 2000" "Debian Project" "Debian GNU/Linux"
+.TH DEB 5 "January 2000" "Debian Project" "dpkg"
 .SH NAME 
-deb \- Debian GNU/Linux binary package format
+deb \- Debian binary package format
 .SH SYNOPSIS
 .IB filename .deb
 .SH DESCRIPTION

diff --git a/doc/internals.sgml b/doc/internals.sgml
index c51f3b8af6e4a02dea351d5eee3471de9742de8d..53c99a6c254e3574f6c79e013268f47586035f83 100644 (file)
--- a/doc/internals.sgml
+++ b/doc/internals.sgml
@@ -32,7 +32,7 @@ merchantability or fitness for a particular purpose.  See the GNU
 General Public License for more details.
 <p>
 You should have received a copy of the GNU General Public License with
-your Debian GNU/Linux system, in <file>/usr/share/common-licenses/GPL</file>, or
+your Debian system, in <file>/usr/share/common-licenses/GPL</file>, or
 with the <prgn>dpkg</prgn> source package as the file <file>COPYING</file>.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 2a0dae7be7295d660e02a046501b95db27819925..56be42c62324f777fae00a90e6f84887c215967f 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -11,6 +11,7 @@ my $fn;
 $diff_ignore_default_regexp = '^.*~$|DEAD_JOE|(?:/CVS|/RCS|/.deps)(?:$|/.*$)';
 
 $sourcestyle = 'X';
+$dscformat = "1.0";
 
 use POSIX;
 use POSIX qw (:errno_h :signal_h);
@@ -58,8 +59,9 @@ General options: -h                  print this message
 
 $i = 100;
 grep ($fieldimps {$_} = $i--,
-      qw (Source Version Binary Maintainer Architecture Standards-Version
-          Build-Depends Build-Depends-Indep Build-Conflicts Build-Conflicts-Indep));
+      qw (Format Source Version Binary Maintainer Architecture
+      Standards-Version Build-Depends Build-Depends-Indep Build-Conflicts
+      Build-Conflicts-Indep));
 
 while (@ARGV && $ARGV[0] =~ m/^-/) {
     $_=shift(@ARGV);
@@ -114,6 +116,7 @@ if ($opmode eq 'build') {
     
     &parsechangelog;
     &parsecontrolfile;
+    $f{"Format"}=$dscformat;
 
     $archspecific=0;
     for $_ (keys %fi) {
@@ -486,6 +489,14 @@ if ($opmode eq 'build') {
             &error("missing critical source control field $f");
     }
 
+    if (defined $fi{'S Format'}) {
+        $dscformat=$fi{'S format'};
+       $dscformat != "1.0" &&
+           &error("Unsupported format of .dsc file");
+    }
+    $sourcepackage =~ m/[^.0-9]/ &&
+        &error("dsc format contains illegal character \`$&'");
+
     $sourcepackage= $fi{'S Source'};
     $sourcepackage =~ m/[^-+.0-9a-z]/ &&
         &error("source package name contains illegal character \`$&'");