From 205a107ae9214a1c22c416893cb57a89502b53b5 Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Mon, 1 May 2000 01:23:59 +0000 Subject: [PATCH] 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 --- ChangeLog | 7 +++++++ debian/changelog | 14 ++++++++++++++ debian/copyright | 2 +- doc/deb-control.5 | 4 ++-- doc/deb-old.5 | 4 ++-- doc/deb.5 | 4 ++-- doc/internals.sgml | 2 +- scripts/dpkg-source.pl | 15 +++++++++++++-- 8 files changed, 42 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index f66bddb0..97db6542 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Apr 30 14:19:41 CEST 2000 Wichert Akkerman + + * 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 * TODO: updated diff --git a/debian/changelog b/debian/changelog index 4fd75808..7e4b685f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,20 @@ dpkg (1.7.0) unstable; urgency=low -- Wichert Akkerman 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 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 880ae194..5def4f69 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,7 +7,7 @@ example package. Copyright (C) 1994-1999 Ian Jackson Copyright (C) 1999 Richard Kettlewell -Copyright (C) 1999 Wichert Akkerman +Copyright (C) 1999-2000 Wichert Akkerman Copyright (C) 1999 Ben Collins Copyright (C) 1997-1998 Juho Vuori Copyright (C) 1998 Nils Rennebarth diff --git a/doc/deb-control.5 b/doc/deb-control.5 index ba0ff3b3..d3e7ab11 100644 --- 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 00542695..02b3309b 100644 --- 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 a933b09c..a612c9f2 100644 --- 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 c51f3b8a..53c99a6c 100644 --- 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.

You should have received a copy of the GNU General Public License with -your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or +your Debian system, in /usr/share/common-licenses/GPL, or with the dpkg source package as the file COPYING. 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 2a0dae7b..56be42c6 100755 --- 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 \`$&'"); -- 2.39.5