Updated to dpkg 1.4.1.9, and added spanish translation

debian/changelog

@@ -1,3 +1,19 @@
+dpkg (1.4.1.9) unstable; urgency=low
+
+  * Non-maintainer release.
+  * Updated dpkg-scansources to current version from Roderick Schertler
+  * Update location of GPL in internals-manual
+  * Update location of GPL and dpkg copyright in all manpages
+  * Include patch from Roman Hodek for dpkg-source to handle diffs of files
+    with lines that begin with two dashes.
+  * Move dpkg-scansources to dpkg-dev package
+  * Move dpkg-scansources manpage to section 8
+  * Fix error that moved a lot of manpages to the dpkg package.
+  * It looks like not reading the available-file for listfiles was not greeted
+    with much enthiousiasm, so reverse the change.
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Wed, 15 Sep 1999 03:45:07 +0200
+
 dpkg (1.4.1.8) unstable; urgency=low
 
   * Non-maintainer release.

debian/dev-README

@@ -1,2 +1,2 @@
-All dpkg documentation in /usr/doc, including the developers'
-information which comes in the dpkg-dev package, is in /usr/doc/dpkg.
+All dpkg documentation in /usr/share/doc, including the developers'
+information which comes in the dpkg-dev package, is in /usr/share/doc/dpkg.

debian/rules

@@ -107,13 +107,14 @@ binary-trees: build
 	set -e; for f in \
  usr/share/doc/dpkg/{internals.html,changelog.manuals.gz} \
  usr/bin/dpkg-{source,genchanges,gencontrol,shlibdeps,buildpackage,parsechangelog} \
- usr/bin/{dpkg-distaddfile,822-date,dpkg-scanpackages,dpkg-name,dpkg-architecture} \
- usr/share/man{/ja,}/man1/dpkg-{source,genchanges,gencontrol,shlibdeps,buildpackage,architecture}.1.gz \
- usr/share/man{/ja,}/man1/{dpkg-parsechangelog,dpkg-distaddfile,822-date,dpkg-name}.1.gz \
- usr/share/man{/ja,}/man5 usr/share/man{/ja,}/man8/dpkg-scanpackages.8.gz \
+ usr/bin/{dpkg-distaddfile,822-date,dpkg-scanpackages,dpkg-scansources,dpkg-name,dpkg-architecture} \
+ usr/share/man/{ja,.}/man1/dpkg-{source,genchanges,gencontrol,shlibdeps,buildpackage,architecture}.1.gz \
+ usr/share/man/{ja,.}/man1/{dpkg-parsechangelog,dpkg-distaddfile,822-date,dpkg-name}.1.gz \
+ usr/share/man/{ja,.}/man5 usr/share/man/{ja,.}/man8/dpkg-{scanpackages,scansources}.8.gz \
  usr/lib/dpkg/parsechangelog usr/lib/dpkg/controllib.pl \
-		; do if [ -e debian/tmp-main/$$f ]; then mv debian/tmp-main/$$f debian/tmp-dev/$$f; fi \
-			done
+		; do if [ -e debian/tmp-main/$$f -o -L debian/tmp-main/$$f ] ; \
+			then mv -v debian/tmp-main/$$f debian/tmp-dev/$$f; \
+		fi done
 
 binary-indep: binary-trees
 	$(checkdir)

doc/internals.sgml

@@ -35,7 +35,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 <file>/usr/doc/copyright/GPL</>, or
+your Debian GNU/Linux system, in <file>/usr/share/common-licenses/GPL</>, or
 with the <code/dpkg/ source package as the file <file>COPYING</>.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.

doc/manuals-version

@@ -1,2 +1,2 @@
-<!entity manuals-version "1.4.1.8">
-<!entity dpkg-version "1.4.1.8">
+<!entity manuals-version "1.4.1.9">
+<!entity dpkg-version "1.4.1.9">

dpkg-deb/dpkg-deb.1

@@ -241,7 +241,7 @@ and this manpage were written by Ian Jackson.  They are
 Copyright (C)1995-1996
 by him and released under the GNU General Public Licence; there is NO
 WARRANTY.  See
-.B /usr/doc/copyright/dpkg
+.B /usr/share/doc/dpkg/copyright
 and
-.B /usr/doc/copyright/GPL
+.B /usr/share/common-licenses/GPL
 for details.

main/enquiry.c

@@ -389,9 +389,6 @@ void enqperpackage(const char *const *argv) {
     badusage(_("--%s needs at least one package name argument"), cipaction->olong);
 
   failures= 0;
-  if (cipaction->arg==act_listfiles)
-    modstatdb_init(admindir,msdbrw_readonly|msdbrw_noavail);
-  else
   modstatdb_init(admindir,msdbrw_readonly);
   
   while ((thisarg= *argv++) != 0) {

po/dpkg.pot

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-09-10 04:26+0200\n"
+"POT-Creation-Date: 1999-09-15 03:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1345,129 +1345,129 @@ msgstr ""
 msgid "--%s needs at least one package name argument"
 msgstr ""
 
-#: main/enquiry.c:409
+#: main/enquiry.c:406
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 
-#: main/enquiry.c:418
+#: main/enquiry.c:415
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr ""
 
-#: main/enquiry.c:428
+#: main/enquiry.c:425
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr ""
 
-#: main/enquiry.c:437
+#: main/enquiry.c:434
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr ""
 
-#: main/enquiry.c:443
+#: main/enquiry.c:440
 msgid "locally diverted"
 msgstr ""
 
-#: main/enquiry.c:444
+#: main/enquiry.c:441
 msgid "package diverts others"
 msgstr ""
 
-#: main/enquiry.c:445
+#: main/enquiry.c:442
 #, c-format
 msgid "diverted by %s"
 msgstr ""
 
-#: main/enquiry.c:464
+#: main/enquiry.c:461
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents."
 msgstr ""
 
-#: main/enquiry.c:527
+#: main/enquiry.c:524
 msgid "--predep-package does not take any argument"
 msgstr ""
 
-#: main/enquiry.c:579
+#: main/enquiry.c:576
 #, c-format
 msgid ""
 "dpkg: cannot see how to satisfy pre-dependency:\n"
 " %s\n"
 msgstr ""
 
-#: main/enquiry.c:580
+#: main/enquiry.c:577
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr ""
 
-#: main/enquiry.c:600
+#: main/enquiry.c:597
 #, c-format
 msgid ""
 "dpkg: unexpected output from `%s --print-libgcc-file-name':\n"
 " `%s'\n"
 msgstr ""
 
-#: main/enquiry.c:603
+#: main/enquiry.c:600
 #, c-format
 msgid "compiler libgcc filename not understood: %.250s"
 msgstr ""
 
-#: main/enquiry.c:607
+#: main/enquiry.c:604
 msgid "--print-installation-architecture does not take any argument"
 msgstr ""
 
-#: main/enquiry.c:627
+#: main/enquiry.c:624
 msgid "--print-architecture does not take any argument"
 msgstr ""
 
-#: main/enquiry.c:633
+#: main/enquiry.c:630
 msgid "failed to fdopen CC pipe"
 msgstr ""
 
-#: main/enquiry.c:637
+#: main/enquiry.c:634
 #, c-format
 msgid "failed to exec C compiler `%.250s'"
 msgstr ""
 
-#: main/enquiry.c:641
+#: main/enquiry.c:638
 msgid "error reading from CC pipe"
 msgstr ""
 
-#: main/enquiry.c:643
+#: main/enquiry.c:640
 msgid "empty output"
 msgstr ""
 
-#: main/enquiry.c:645
+#: main/enquiry.c:642
 msgid "no newline"
 msgstr ""
 
-#: main/enquiry.c:648
+#: main/enquiry.c:645
 msgid "no gcc-lib component"
 msgstr ""
 
-#: main/enquiry.c:650
+#: main/enquiry.c:647
 msgid "no hyphen after gcc-lib"
 msgstr ""
 
-#: main/enquiry.c:662
+#: main/enquiry.c:659
 #, c-format
 msgid "dpkg: warning, architecture `%s' not in remapping table\n"
 msgstr ""
 
-#: main/enquiry.c:704
+#: main/enquiry.c:701
 msgid "--cmpversions takes three arguments: <version> <relation> <version>"
 msgstr ""
 
-#: main/enquiry.c:709
+#: main/enquiry.c:706
 msgid "--cmpversions bad relation"
 msgstr ""
 
-#: main/enquiry.c:714
+#: main/enquiry.c:711
 #, c-format
 msgid "version a has bad syntax: %s\n"
 msgstr ""
 
-#: main/enquiry.c:724
+#: main/enquiry.c:721
 #, c-format
 msgid "version b has bad syntax: %s\n"
 msgstr ""

po/fr.po

@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.4.0.14\n"
-"POT-Creation-Date: 1999-09-10 04:26+0200\n"
+"POT-Creation-Date: 1999-09-15 03:36+0200\n"
 "PO-Revision-Date: 1997-05-13 22:07 EDT\n"
 "Last-Translator: Christophe Le Bars <clebars@debian.org>\n"
 "Language-Team: French\n"
@@ -1548,41 +1548,41 @@ msgstr "dpkg: %s non trouv
 msgid "--%s needs at least one package name argument"
 msgstr "--%s a besoin au moins d'un nom de paquet comme argument"
 
-#: main/enquiry.c:409
+#: main/enquiry.c:406
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 "Le paquet `%s' n'est pas installé et aucune information n'est disponible.\n"
 
-#: main/enquiry.c:418
+#: main/enquiry.c:415
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Le paquet `%s' n'est pas disponible.\n"
 
-#: main/enquiry.c:428
+#: main/enquiry.c:425
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Le paquet `%s' n'est pas installé.\n"
 
-#: main/enquiry.c:437
+#: main/enquiry.c:434
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Le paquet `%s' ne contient aucun fichier (!)\n"
 
-#: main/enquiry.c:443
+#: main/enquiry.c:440
 msgid "locally diverted"
 msgstr "détournement local"
 
-#: main/enquiry.c:444
+#: main/enquiry.c:441
 msgid "package diverts others"
 msgstr "paquet détournant d'autres"
 
-#: main/enquiry.c:445
+#: main/enquiry.c:442
 #, c-format
 msgid "diverted by %s"
 msgstr "détourné par %s"
 
-#: main/enquiry.c:464
+#: main/enquiry.c:461
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents."
@@ -1591,11 +1591,11 @@ msgstr ""
 "archives,\n"
 "et dpkg --contents (= dpkg-deb --contents) pour afficher leurs contenus."
 
-#: main/enquiry.c:527
+#: main/enquiry.c:524
 msgid "--predep-package does not take any argument"
 msgstr "--predep-package ne prend aucun argument"
 
-#: main/enquiry.c:579
+#: main/enquiry.c:576
 #, c-format
 msgid ""
 "dpkg: cannot see how to satisfy pre-dependency:\n"
@@ -1604,13 +1604,13 @@ msgstr ""
 "dpkg: ne peut pas voir comment satisfaire les pré-dépendances:\n"
 " %s\n"
 
-#: main/enquiry.c:580
+#: main/enquiry.c:577
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr ""
 "ne peut satisfaire les pré-dépendances pour %.250s (réclamé par %.250s)"
 
-#: main/enquiry.c:600
+#: main/enquiry.c:597
 #, c-format
 msgid ""
 "dpkg: unexpected output from `%s --print-libgcc-file-name':\n"
@@ -1619,69 +1619,69 @@ msgstr ""
 "dpkg: sortie inattendu de `%s --print-libgcc-file-name':\n"
 " `%s'\n"
 
-#: main/enquiry.c:603
+#: main/enquiry.c:600
 #, c-format
 msgid "compiler libgcc filename not understood: %.250s"
 msgstr "fichier libgcc du compilateur non compris: %.250s"
 
-#: main/enquiry.c:607
+#: main/enquiry.c:604
 msgid "--print-installation-architecture does not take any argument"
 msgstr "--print-installation-architecture ne prend aucun argument"
 
-#: main/enquiry.c:627
+#: main/enquiry.c:624
 msgid "--print-architecture does not take any argument"
 msgstr "--print-architecture ne prend aucun argument"
 
-#: main/enquiry.c:633
+#: main/enquiry.c:630
 msgid "failed to fdopen CC pipe"
 msgstr "échec pour \"fdopen\" le tube de CC"
 
-#: main/enquiry.c:637
+#: main/enquiry.c:634
 #, c-format
 msgid "failed to exec C compiler `%.250s'"
 msgstr "échec pour exécuter le compilateur C `%.250s'"
 
-#: main/enquiry.c:641
+#: main/enquiry.c:638
 msgid "error reading from CC pipe"
 msgstr "erreur en lisant le tube de CC"
 
-#: main/enquiry.c:643
+#: main/enquiry.c:640
 msgid "empty output"
 msgstr "sortie vide"
 
-#: main/enquiry.c:645
+#: main/enquiry.c:642
 msgid "no newline"
 msgstr "pas de saut de ligne"
 
-#: main/enquiry.c:648
+#: main/enquiry.c:645
 msgid "no gcc-lib component"
 msgstr "pas de composant gcc-lib"
 
-#: main/enquiry.c:650
+#: main/enquiry.c:647
 msgid "no hyphen after gcc-lib"
 msgstr "pas de trait d'union pas gcc-lib"
 
-#: main/enquiry.c:662
+#: main/enquiry.c:659
 #, c-format
 msgid "dpkg: warning, architecture `%s' not in remapping table\n"
 msgstr ""
 "dpkg: avertissement, architecture `%s' inexistante dans la tale des "
 "correspondances\n"
 
-#: main/enquiry.c:704
+#: main/enquiry.c:701
 msgid "--cmpversions takes three arguments: <version> <relation> <version>"
 msgstr "--cmpversions prend trois arguments: <version> <relation> <version>"
 
-#: main/enquiry.c:709
+#: main/enquiry.c:706
 msgid "--cmpversions bad relation"
 msgstr "--cmpversions mauvaise relation"
 
-#: main/enquiry.c:714
+#: main/enquiry.c:711
 #, c-format
 msgid "version a has bad syntax: %s\n"
 msgstr "mauvaise syntaxe de la version a:  %s\n"
 
-#: main/enquiry.c:724
+#: main/enquiry.c:721
 #, c-format
 msgid "version b has bad syntax: %s\n"
 msgstr "mauvaise syntaxe de la version b:  %s\n"

po/ja_JP.ujis.po

@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.4.0.22\n"
-"POT-Creation-Date: 1999-09-10 04:26+0200\n"
+"POT-Creation-Date: 1999-09-15 03:36+0200\n"
 "PO-Revision-Date: 1999-03-06 16:25+09:00\n"
 "Last-Translator: Masato Taruishi <taru@debian.or.jp>\n"
 "Language-Team: Japanease <taru@debian.or.jp>\n"
@@ -1482,40 +1482,40 @@ msgstr "dpkg: %s
 msgid "--%s needs at least one package name argument"
 msgstr "--%s は引数に少なくとも1つのパッケージ名が必要です。"
 
-#: main/enquiry.c:409
+#: main/enquiry.c:406
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr "パッケージ`%s'はまだインストールされておらず情報が利用不可能です。\n"
 
-#: main/enquiry.c:418
+#: main/enquiry.c:415
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "パッケージ`%s'はまだ利用可能でありません。\n"
 
-#: main/enquiry.c:428
+#: main/enquiry.c:425
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "パッケージ`%s'はまだインストールされていません。\n"
 
-#: main/enquiry.c:437
+#: main/enquiry.c:434
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "パッケージ`%s'はファイルを含んでいません。(!)\n"
 
-#: main/enquiry.c:443
+#: main/enquiry.c:440
 msgid "locally diverted"
 msgstr "ローカルに退避(divert)された"
 
-#: main/enquiry.c:444
+#: main/enquiry.c:441
 msgid "package diverts others"
 msgstr "他パッケージの同名ファイルは次の名に退避した"
 
-#: main/enquiry.c:445
+#: main/enquiry.c:442
 #, c-format
 msgid "diverted by %s"
 msgstr "%s により退避(divert)された"
 
-#: main/enquiry.c:464
+#: main/enquiry.c:461
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents."
@@ -1524,11 +1524,11 @@ msgstr ""
 "ファイルの一覧を表示するには dpkg --contents (= dpkg-deb "
 "--contents)を使います。"
 
-#: main/enquiry.c:527
+#: main/enquiry.c:524
 msgid "--predep-package does not take any argument"
 msgstr "--predep-package に引数は必要ありません。"
 
-#: main/enquiry.c:579
+#: main/enquiry.c:576
 #, c-format
 msgid ""
 "dpkg: cannot see how to satisfy pre-dependency:\n"
@@ -1537,13 +1537,13 @@ msgstr ""
 "dpkg: 先行依存を解決する方法がわかりません:\n"
 " %s\n"
 
-#: main/enquiry.c:580
+#: main/enquiry.c:577
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr ""
 "(%2$.250s が要求する) %1$.250s の先行依存(pre-dependencies)を解決できません。"
 
-#: main/enquiry.c:600
+#: main/enquiry.c:597
 #, c-format
 msgid ""
 "dpkg: unexpected output from `%s --print-libgcc-file-name':\n"
@@ -1552,68 +1552,68 @@ msgstr ""
 "dpkg: `%s --print-libgcc-file-name'からの予期しない出力です:\n"
 " `%s'\n"
 
-#: main/enquiry.c:603
+#: main/enquiry.c:600
 #, c-format
 msgid "compiler libgcc filename not understood: %.250s"
 msgstr "コンパイラlibgccファイル名が理解できません: %.250s"
 
-#: main/enquiry.c:607
+#: main/enquiry.c:604
 msgid "--print-installation-architecture does not take any argument"
 msgstr "--print-installation-architecture に引数は必要ありません。"
 
-#: main/enquiry.c:627
+#: main/enquiry.c:624
 msgid "--print-architecture does not take any argument"
 msgstr "--print-architecture に引数は必要ありません。"
 
-#: main/enquiry.c:633
+#: main/enquiry.c:630
 msgid "failed to fdopen CC pipe"
 msgstr "CCパイプのオープン(fdopen)に失敗しました。"
 
-#: main/enquiry.c:637
+#: main/enquiry.c:634
 #, c-format
 msgid "failed to exec C compiler `%.250s'"
 msgstr "Cコンパイラ`%.250s'の実行に失敗しました。"
 
-#: main/enquiry.c:641
+#: main/enquiry.c:638
 msgid "error reading from CC pipe"
 msgstr "CCパイプからの読み込みエラーです"
 
-#: main/enquiry.c:643
+#: main/enquiry.c:640
 msgid "empty output"
 msgstr "空の出力"
 
-#: main/enquiry.c:645
+#: main/enquiry.c:642
 msgid "no newline"
 msgstr "改行がありません"
 
-#: main/enquiry.c:648
+#: main/enquiry.c:645
 msgid "no gcc-lib component"
 msgstr "gcc-lib コンポーネントがありません"
 
-#: main/enquiry.c:650
+#: main/enquiry.c:647
 msgid "no hyphen after gcc-lib"
 msgstr "gcc-lib の後にハイフンがありません"
 
-#: main/enquiry.c:662
+#: main/enquiry.c:659
 #, c-format
 msgid "dpkg: warning, architecture `%s' not in remapping table\n"
 msgstr "dpkg: 警告, リマッピング表にアーキテクチャ`%s'がありません。\n"
 
-#: main/enquiry.c:704
+#: main/enquiry.c:701
 msgid "--cmpversions takes three arguments: <version> <relation> <version>"
 msgstr ""
 "--cmpversions は3つの引数(<バージョン> <関係> <バージョン>)を取ります。"
 
-#: main/enquiry.c:709
+#: main/enquiry.c:706
 msgid "--cmpversions bad relation"
 msgstr "--cmpversions 不正な比較"
 
-#: main/enquiry.c:714
+#: main/enquiry.c:711
 #, c-format
 msgid "version a has bad syntax: %s\n"
 msgstr "バージョン a は不正な構文です: %s\n"
 
-#: main/enquiry.c:724
+#: main/enquiry.c:721
 #, c-format
 msgid "version b has bad syntax: %s\n"
 msgstr "バージョン b は不正な構文です: %s\n"

scripts/Makefile.am

@@ -36,7 +36,7 @@ ELCFILES		= debian-changelog-mode.elc
 man_MANS		= dpkg-name.1 dpkg-source.1 822-date.1 update-rc.d.8 \
 			  start-stop-daemon.8 update-alternatives.8 \
 			  install-info.8 dpkg-scanpackages.8 \
-			  dpkg-scansources.1 dpkg-architecture.1
+			  dpkg-scansources.8 dpkg-architecture.1
 
 EXTRA_DIST		= update-rc.d.pl \
 			  dpkg-name.sh dpkg-source.pl dpkg-genchanges.pl \

scripts/dpkg-architecture.1

@@ -2,8 +2,8 @@
 ''' $RCSfile$$Revision$$Date$
 '''
 ''' $Log$
-''' Revision 1.1  1999-09-27 01:00:50  wakkerma
-''' Added some missing files
+''' Revision 1.2  1999-09-27 01:17:04  wakkerma
+''' Updated to dpkg 1.4.1.9, and added spanish translation
 '''
 '''
 .de Sh

scripts/dpkg-scansources.pl

@@ -232,7 +232,7 @@ sub load_src_override {
 
 sub de_pgp {
     my ($file, $s) = @_;
-    if ($s =~ s/^-----BEGIN PGP SIGNED MESSAGE-----\n(?:[^:]+: [^\n]+\n)*\n//) {
+    if ($s =~ s/^-----BEGIN PGP SIGNED MESSAGE-----.*?\n\n//s) {
 	unless ($s =~ s/\n
 			-----BEGIN\040PGP\040SIGNATURE-----\n
 			.*?\n

scripts/dpkg-source.1

@@ -731,7 +731,7 @@ and initial arguments for
 The utilities and this manpage were written by Ian Jackson.  They are
 Copyright (C)1995-1996 by him and released under the GNU General
 Public Licence; there is NO WARRANTY.  See
-.B /usr/doc/copyright/dpkg
+.B /usr/share/doc/dpkg/copyright
 and
-.B /usr/doc/copyright/GPL
+.B /usr/share/common-licenses/GPL
 for details.

scripts/dpkg-source.pl

@@ -453,7 +453,7 @@ if ($opmode eq 'build') {
 
     $sourcestyle =~ y/X/p/;
     $sourcestyle =~ m/[pun]/ ||
-        &usageerr("source handling style -s$sourcestyle not allowed with -b");
+        &usageerr("source handling style -s$sourcestyle not allowed with -x");
 
     @ARGV==1 || &usageerr("-x needs exactly one argument, the .dsc");
     $dsc= shift(@ARGV);
@@ -509,9 +509,11 @@ if ($opmode eq 'build') {
             
         &forkgzipread("$dscdir/$difffile");
         $/="\n";
-        while (<GZIP>) {
-            s/\n$// || &error("diff is missing trailing newline");
-            if (/^--- /) {
+	$_ = <GZIP>;
+	do {
+	    # read file header (---/+++ pair)
+	    s/\n$// or &error("diff is missing trailing newline");
+	    /^--- / or &error("expected ^--- in line $. of diff");
                 $fn= $';
                 substr($fn,0,length($expectprefix)+1) eq "$expectprefix/" ||
                     &error("diff patches file ($fn) not in expected subdirectory");
@@ -528,12 +530,27 @@ if ($opmode eq 'build') {
                 $_ eq '+++ '.$newdirectory.substr($fn,length($expectprefix)) ||
                     &error("line after --- for file $fn isn't as expected");
                 $filepatched{$fn}++ && &error("diff patches file $fn twice");
-            } elsif (/^\\ No newline at end of file$/) {
-            } elsif (/^[-+ \@]/) {
-	    } else {
-                &error ("diff contains unknown line \`$_'");
+	    # read hunks
+	    my $hunk = 0;
+	    while (($_ = <GZIP>) && !/^--- /) {
+		# read hunk header (@@)
+		s/\n$// or &error("diff is missing trailing newline");
+		/^@@ -\d+(,(\d+))? \+\d+(,(\d+))? @\@$/ or
+		    &error("Expected ^@@ in line $. of diff");
+		my ($olines, $nlines) = ($1 ? $2 : 1, $3 ? $4 : 1);
+		++$hunk;
+		# read hunk
+		while ($olines || $nlines) {
+		    $_ = <GZIP> or &error("unexpected end of diff");
+		    s/\n$// or &error("diff is missing trailing newline");
+		    if (/^ /) { --$olines; --$nlines; }
+		    elsif (/^-/) { --$olines; }
+		    elsif (/^\+/) { --$nlines; }
+		    else { &error("expected [ +-] at start of line $. of diff"); }
             }
         }
+	    $hunk or &error("expected ^\@\@ at line $. of diff");
+        } while ($_ || !eof(GZIP));
         close(GZIP);
         
         &reapgzip;
@@ -610,7 +627,7 @@ if ($opmode eq 'build') {
             open(STDIN,"<&GZIP") || &syserr("reopen gzip for patch");
             chdir($newdirectory) || &syserr("chdir to $newdirectory for patch");
             exec('patch','-s','-t','-F','0','-N','-p1','-u',
-                 '-V','never','-b','-z','.dpkg-orig');
+                 '-V','never','-g0','-b','-z','.dpkg-orig');
             &syserr("exec patch");
         }
         close(GZIP);

scripts/update-alternatives.8

@@ -4,7 +4,7 @@
 .\" it under the terms of the GNU General Public License as published
 .\" by the Free Software Foundation; either version 2 of the License, or
 .\" (at your option) any later version.  There is NO WARRANTY.  You can
-.\" find the GNU GPL in /usr/doc/copyright/GPL on any Debian system.
+.\" find the GNU GPL in /usr/share/common-licenses/GPL on any Debian system.
 .TH UPDATE-ALTERNATIVES 8 "19 January 1998" "DEBIAN" "Debian GNU/Linux"
 .SH NAME
 update-alternatives \- maintain symbolic links determining default commands
@@ -337,7 +337,7 @@ This manual page is copyright 1997/98 Charles Briscoe-Smith.
 This is free documentation; see the GNU General Public Licence
 version 2 or later for copying conditions.  There is NO WARRANTY.
 .PP
-You can find the GNU GPL in /usr/doc/copyright/GPL on any Debian system.
+You can find the GNU GPL in /usr/share/common-licenses/GPL on any Debian system.
 .\" .SH ACKNOWLEDGEMENTS
 .SH "SEE ALSO"
 .BR ln (1),

split/dpkg-split.8

@@ -254,7 +254,7 @@ and this manpage were written by Ian Jackson.  They are
 Copyright (C) 1995-1996
 by him and released under the GNU General Public Licence; there is NO
 WARRANTY.  See
-.B /usr/doc/copyright/dpkg
+.B /usr/share/dpkg/copyright
 and
-.B /usr/doc/copyright/GPL
+.B /usr/share/common-licenses/GPL
 for details.