Updated to dpkg 1.4.1.8

ChangeLog

@@ -1,3 +1,12 @@
+dpkg (1.4.1.8) unstable; urgency=low
+
+  * Non-maintainer release.
+  * Merge dpkg-doc-ja
+  * Add patch from Raphael Hertzog <rhertzog@hrnet.fr> for dpkg-scansources
+    to skip comments in signatures. This allows packages to also use GnuPG.
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Mon, 13 Sep 1999 04:16:33 +0200
+
 dpkg (1.4.1.7) unstable; urgency=low
 
   * Non-maintainer release.

configure.in

@@ -90,7 +90,7 @@ AC_ARG_WITH(olddeb,
 
 dnl gettext
 
-ALL_LINGUAS="en fr es"
+ALL_LINGUAS="en fr es ja_JP.ujis"
 AM_GNU_GETTEXT
 
 dnl Other stuff
@@ -207,5 +207,5 @@ cmp -s version.h.new version.h || mv version.h.new version.h
 
 AC_OUTPUT([Makefile intl/Makefile dpkg-deb/Makefile lib/Makefile
           include/Makefile dselect/Makefile split/Makefile methods/Makefile
-          md5sum/Makefile main/Makefile doc/Makefile scripts/Makefile
+          md5sum/Makefile main/Makefile doc/Makefile doc/ja/Makefile scripts/Makefile
           po/Makefile.in])

debian/changelog

@@ -1,3 +1,12 @@
+dpkg (1.4.1.8) unstable; urgency=low
+
+  * Non-maintainer release.
+  * Merge dpkg-doc-ja
+  * Add patch from Raphael Hertzog <rhertzog@hrnet.fr> for dpkg-scansources
+    to skip comments in signatures. This allows packages to also use GnuPG.
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Mon, 13 Sep 1999 04:16:33 +0200
+
 dpkg (1.4.1.7) unstable; urgency=low
 
   * Non-maintainer release.

debian/control

@@ -8,6 +8,7 @@ Package: dpkg
 Architecture: any
 Essential: yes
 Pre-Depends: ${shlibs:Pre-Depends}
+Replaces: dpkg-doc-ja
 Description: Package maintenance system for Debian
  This package contains the programs which handle the installation and
  removal of packages on your system.
@@ -27,7 +28,7 @@ Depends: perl5
 Recommends: cpio (>= 2.4.2-2), patch (>= 2.2-1), gcc, make
 Suggests: gnupg, debian-keyring
 Conflicts: dpkgname
-Replaces: dpkgname, dpkg (<< 1.4.0)
+Replaces: dpkgname, dpkg (<< 1.4.0), dpkg-doc-ja
 Description: Package building tools for Debian
  This package contains the tools (including dpkg-source) required to
  unpack, build and upload Debian source packages.

debian/rules

@@ -55,7 +55,8 @@ binary-trees: build
 	$(checkdir)
 	-$(RM) -r debian/tmp-{main,dev}
 	install -d debian/tmp-{main,dev}/{DEBIAN,etc/dpkg,usr/share/doc/dpkg}
-	install -d debian/tmp-dev/usr/{lib/dpkg,share/doc/dpkg-dev,share/man/man1,share/man/man8,sbin,bin}
+	install -d debian/tmp-dev/usr/{lib/dpkg,share/doc/dpkg-dev,sbin,bin}
+	install -d debian/tmp-dev/usr/share/man/{ja/man1,man1,ja/man8,man8}
 	install -d debian/tmp-dev/usr/share/emacs/site-lisp/dpkg-dev
 	install -d debian/tmp-main/sbin
 	set -e; if [ $(arch) = i386 ]; then \
@@ -107,11 +108,12 @@ binary-trees: build
  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/man1/dpkg-{source,genchanges,gencontrol,shlibdeps,buildpackage,architecture}.1.gz \
- usr/share/man/man1/{dpkg-parsechangelog,dpkg-distaddfile,822-date,dpkg-name}.1.gz \
- usr/share/man/man5 usr/share/man/man8/dpkg-scanpackages.8.gz \
+ 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/lib/dpkg/parsechangelog usr/lib/dpkg/controllib.pl \
-		; do mv debian/tmp-main/$$f debian/tmp-dev/$$f; done
+		; do if [ -e debian/tmp-main/$$f ]; then mv debian/tmp-main/$$f debian/tmp-dev/$$f; fi \
+			done
 
 binary-indep: binary-trees
 	$(checkdir)

doc/Makefile.am

@@ -7,6 +7,10 @@ AUTOMAKE_OPTIONS	= 1.1 foreign
 docdir			= $(prefix)/doc
 pkgdocdir		= $(docdir)/@PACKAGE@
 
+## Subdirectories with translations
+
+SUBDIRS			= ja
+
 ## Automake variables
 
 man_MANS		= deb.5 deb-old.5 deb-control.5

doc/manuals-version

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

po/en.po

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

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 03:34+0200\n"
+"POT-Creation-Date: 1999-09-10 04:26+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:406
+#: main/enquiry.c:409
 #, 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:415
+#: main/enquiry.c:418
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Le paquet `%s' n'est pas disponible.\n"
 
-#: main/enquiry.c:425
+#: main/enquiry.c:428
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Le paquet `%s' n'est pas installé.\n"
 
-#: main/enquiry.c:434
+#: main/enquiry.c:437
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Le paquet `%s' ne contient aucun fichier (!)\n"
 
-#: main/enquiry.c:440
+#: main/enquiry.c:443
 msgid "locally diverted"
 msgstr "détournement local"
 
-#: main/enquiry.c:441
+#: main/enquiry.c:444
 msgid "package diverts others"
 msgstr "paquet détournant d'autres"
 
-#: main/enquiry.c:442
+#: main/enquiry.c:445
 #, c-format
 msgid "diverted by %s"
 msgstr "détourné par %s"
 
-#: main/enquiry.c:461
+#: main/enquiry.c:464
 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:524
+#: main/enquiry.c:527
 msgid "--predep-package does not take any argument"
 msgstr "--predep-package ne prend aucun argument"
 
-#: main/enquiry.c:576
+#: main/enquiry.c:579
 #, 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:577
+#: main/enquiry.c:580
 #, 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:597
+#: main/enquiry.c:600
 #, 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:600
+#: main/enquiry.c:603
 #, c-format
 msgid "compiler libgcc filename not understood: %.250s"
 msgstr "fichier libgcc du compilateur non compris: %.250s"
 
-#: main/enquiry.c:604
+#: main/enquiry.c:607
 msgid "--print-installation-architecture does not take any argument"
 msgstr "--print-installation-architecture ne prend aucun argument"
 
-#: main/enquiry.c:624
+#: main/enquiry.c:627
 msgid "--print-architecture does not take any argument"
 msgstr "--print-architecture ne prend aucun argument"
 
-#: main/enquiry.c:630
+#: main/enquiry.c:633
 msgid "failed to fdopen CC pipe"
 msgstr "échec pour \"fdopen\" le tube de CC"
 
-#: main/enquiry.c:634
+#: main/enquiry.c:637
 #, c-format
 msgid "failed to exec C compiler `%.250s'"
 msgstr "échec pour exécuter le compilateur C `%.250s'"
 
-#: main/enquiry.c:638
+#: main/enquiry.c:641
 msgid "error reading from CC pipe"
 msgstr "erreur en lisant le tube de CC"
 
-#: main/enquiry.c:640
+#: main/enquiry.c:643
 msgid "empty output"
 msgstr "sortie vide"
 
-#: main/enquiry.c:642
+#: main/enquiry.c:645
 msgid "no newline"
 msgstr "pas de saut de ligne"
 
-#: main/enquiry.c:645
+#: main/enquiry.c:648
 msgid "no gcc-lib component"
 msgstr "pas de composant gcc-lib"
 
-#: main/enquiry.c:647
+#: main/enquiry.c:650
 msgid "no hyphen after gcc-lib"
 msgstr "pas de trait d'union pas gcc-lib"
 
-#: main/enquiry.c:659
+#: main/enquiry.c:662
 #, 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:701
+#: main/enquiry.c:704
 msgid "--cmpversions takes three arguments: <version> <relation> <version>"
 msgstr "--cmpversions prend trois arguments: <version> <relation> <version>"
 
-#: main/enquiry.c:706
+#: main/enquiry.c:709
 msgid "--cmpversions bad relation"
 msgstr "--cmpversions mauvaise relation"
 
-#: main/enquiry.c:711
+#: main/enquiry.c:714
 #, c-format
 msgid "version a has bad syntax: %s\n"
 msgstr "mauvaise syntaxe de la version a:  %s\n"
 
-#: main/enquiry.c:721
+#: main/enquiry.c:724
 #, c-format
 msgid "version b has bad syntax: %s\n"
 msgstr "mauvaise syntaxe de la version b:  %s\n"