Update Japanese manpages

scripts/dpkg-genchanges.pl: also upload full source if version is *-0.1

diff --git a/ChangeLog b/ChangeLog
index 00fbb0875d85def70bc051f8a93d0a8554a51254..ac0f8534b90bfea383b55e443d4feab6aeaba2de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Jan 15 03:48:47 CET 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * doc/ja/dpkg-deb.5: updated with patch from Hiroshi KISE <fuyuneko@ryukyu.ne.jp>
+  * THANKS: Add Hiroshi KISE
+
+Tue Jan 11 03:34:22 CET 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/dpkg-genchanges.pl: also upload full source if version is *-0.1
+  * doc/ja/dpkg.8: updated with patch from Hiroshi KISE <fuyuneko@ryukyu.ne.jp>
+
 Tue Jan 11 18:32:52 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * configure.in: Fix include in test for alphasort 
@@ -131,7 +141,7 @@ Wed Dec 22 12:07:40 CET 1999 Wichert Akkerman <wakkerma@debian.org>
   * dselect patches from Dan Gohman <gohmandj@mrs.umn.edu>:
     + dselect/pkgtop.cc: use ACS_HLINE instead of `-'
     + dselect/baselist.cc: change colour of column headings
-    + dselect: add a new --export mode which suppresses the display of the
+    + dselect: add a new --expert mode which suppresses the display of the
       helpscreen
 
 Tue Dec 21 15:59:35 CET 1999 Wichert Akkerman <wakkerma@debian.org>

diff --git a/THANKS b/THANKS
index 3de3a821755d3d97da9280e35e32904141c2321b..54dedad90a05d1f43b9bbbf6d0bffdc48bd248ec 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -15,6 +15,7 @@ Erick Branderhorst <branderhorst@heel.fgg.eur.nl>
 Galen Hazelwood <galenh@debian.org>
 Guy Maor <maor@debian.org>
 Heiko Schlittermann <heiko@lotte.sax.de>
+Hiroshi KISE <fuyuneko@ryukyu.ne.jp>
 Ian Jackson <ian@chiark.chu.cam.ac.uk>
 Ian Murdock <imurdock@debian.org>
 J.H.M. Dassen <jdassen@cistron.nl>

diff --git a/debian/changelog b/debian/changelog
index 26cf51d4859836811124bf70377857c4ff2bf1d3..ddb4d55cbf7578d329a324dfdc548cf1f1c61852 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 dpkg (1.6.7) unstable; urgency=low
 
+  * dpkg compiles on HP-UX, Solaris and IRIX now
   * start-stop-daemon can chroot now, Closes: Bug#54513
   * Allow space between # and the bugnumber in the changelog
   * Display package description with waddnstr, Closes: Bug#54313
+  * Updated Japanese manpages, Closes: Bug#54690, #55080
+  * Upload full source for packages with version *-0.1, Closes: Bug#54651
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/doc/ja/dpkg-deb.1 b/doc/ja/dpkg-deb.1
index e2c1513a4c673b5cddc59fe2f0ed2a409f6324b0..863522a8a0eb5ce46978158225c8e4a5decff49a 100644 (file)
--- a/doc/ja/dpkg-deb.1
+++ b/doc/ja/dpkg-deb.1
@@ -1,10 +1,10 @@
 .\" Hey, Emacs!  This is an -*- nroff -*- source file.
 .\" Authors: Ian Jackson
-.\" Original manpage is provided by dpkg_1.4.0.23.2.
-.\" Translated by Hiroshi KISE <kise@imicom.or.jp>
-.\" Last modify: Mon Aug 17 12:19:02 JST 1998
-.\"WORD:       pack                    ºîÀ®
-.\"WORD:       unpack                  Ÿ³«
+.\" Original manpage is provided by dpkg_1.6.6
+.\" Translated by Hiroshi KISE <fuyuneko@ryukyu.ne.jp>
+.\" Last modify: Fri Jan 14 15:44:07 JST 2000
+.\"WORD:       pack                    (¥¢¡¼¥«¥¤¥Ö¤Î)ºîÀ®
+.\"WORD:       unpack                  (¥¢¡¼¥«¥¤¥Ö¤Î)Ÿ³«
 .\"WORD:       filesystem tree         ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥àÌÚ
 .\"WORD:       control information files       À©¸æ¾ðÊó¥Õ¥¡¥¤¥ë
 .\"WORD:       syntax error            ʸˡ¥¨¥é¡¼
@@ -17,29 +17,29 @@ dpkg\-deb \- Debian 
 .SH ½ñ¼°
 .B dpkg-deb
 .BR -b | --build
-.IR ¥Ç¥£¥ì¥¯¥È¥ê " [" ¥¢¡¼¥«¥¤¥Ö | ¥Ç¥£¥ì¥¯¥È¥ê ]
+.IR directory " [" archive | directory ]
 .br
 .B dpkg-deb
 .BR -I | --info
-.IR ¥¢¡¼¥«¥¤¥Ö " [" À©¸æ¥Õ¥¡¥¤¥ë̾ " ..]"
+.IR archive " [" control\-file\-name " ..]"
 .br
 .B dpkg-deb
 .BR -f | --field
-.IR ¥¢¡¼¥«¥¤¥Ö " [" À©¸æ¥Õ¥¡¥¤¥ë̾ " ...]"
+.IR archive " [" control\-field\-name " ...]"
 .br
 .B dpkg-deb
 .BR -c | --contents
-.I ¥¢¡¼¥«¥¤¥Ö
+.I archive
 .br
 .B dpkg-deb
 .BR -x | --extract | -X | --vextract
-.I ¥¢¡¼¥«¥¤¥Ö ¥Ç¥£¥ì¥¯¥È¥ê
+.I archive directory
 .br
 .B dpkg-deb --fsys-tarfile
-.I ¥¢¡¼¥«¥¤¥Ö
+.I archive
 .br
 .B dpkg-deb --control
-.I ¥¢¡¼¥«¥¤¥Ö ¥Ç¥£¥ì¥¯¥È¥ê
+.I archive directory
 .SH ÀâÌÀ
 .B dpkg-deb
 ¤Ï¡¢Debian ¥¢¡¼¥«¥¤¥Ö¤ÎºîÀ®¡¢Å¸³«¡¢¾ðÊó¤Îɽ¼¨¤ò¤¹¤ë¡£
@@ -67,10 +67,10 @@ dpkg\-deb \- Debian 
 .SH ¥¢¥¯¥·¥ç¥ó¡¦¥ª¥×¥·¥ç¥ó
 .TP
 .BR --build ", " -b
-.IR ¥Ç¥£¥ì¥¯¥È¥ê
+.IR directory
 ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥àÌÚ¤«¤é
 debian ¥¢¡¼¥«¥¤¥Ö¤òºîÀ®¤¹¤ë¡£
-.IR ¥Ç¥£¥ì¥¯¥È¥ê
+.IR directory
 ¤Ë¤Ï¡¢control ¥Õ¥¡¥¤¥ë¤Ê¤É¤ÎÀ©¸æ¾ðÊó¥Õ¥¡¥¤¥ë¤Î¤¢¤ë
 .B DEBIAN
 ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤¬É¬¤ºÂ¸ºß¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£
@@ -80,7 +80,13 @@ DEBIAN 
 ¡£¤½¤Î¤«¤ï¤ê¡¢DEBIAN ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Ë¤¢¤Ã¤¿¥Õ¥¡¥¤¥ë¤Ï
 ¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸À©¸æ¾ðÊ󥨥ꥢ¤ËÃÖ¤«¤ì¤ë¡£
 
-.BR \-\-no\-check
+°µ½Ì¥ì¥Ù¥ë¤ò»ØÄꤹ¤ë¾ì¹ç¤Ï¡¢
+.B \-z#
+¥ª¥×¥·¥ç¥ó¤òÄɲ乤롣
+.B dpkg-deb
+¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ò gzip ¤ËÅϤ¹¡£
+
+.BR \-\-nocheck
 ¤ò»ØÄꤷ¤Ê¤¤¤«¤®¤ê¡¢
 .BR dpkg\-deb
 ¤Ï
@@ -95,11 +101,11 @@ dpkg-deb
 ¥Õ¥¡¥¤¥ë¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡£
 
 ¤â¤·¡¢
-.I ¥¢¡¼¥«¥¤¥Ö
+.I archive
 ¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢
 .B dpkg\-deb
 ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤ò
-.IR ¥Ç¥£¥ì¥¯¥È¥ê \fB.deb\fR
+.IR directory \fB.deb\fR
 ¤È¤¤¤¦Ì¾Á°¤ÇºîÀ®¤¹¤ë¡£
 
 ¤â¤·¡¢¤¹¤Ç¤Ë¥¢¡¼¥«¥¤¥Ö¤¬ºîÀ®¤µ¤ì¤Æ¸ºß¤·¤Æ¤¤¤ë¾ì¹ç¡¢¾å½ñ¤­¤¹¤ë¡£
@@ -107,14 +113,14 @@ dpkg-deb
 2ÈÖÌܤΰú¤­¿ô¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Î¾ì¹ç¡¢
 .B dpkg\-deb
 ¤Ï
-.IB ¥Ñ¥Ã¥±¡¼¥¸ _ ¥Ð¡¼¥¸¥ç¥ó _ ¥¢¡¼¥­¥Æ¥¯¥Á¥ã .deb\fR
+.IB package _ version _ arch .deb\fR
 ¤Þ¤¿¤Ï
-.IB ¥Ñ¥Ã¥±¡¼¥¸ _ ¥Ð¡¼¥¸¥ç¥ó .deb
+.IB package _ version .deb
 (¥Ñ¥Ã¥±¡¼¥¸À©¸æ¥Õ¥¡¥¤¥ë¤Ë
 .B Architecture
 ¥Õ¥£¡¼¥ë¥É¤¬¤Ê¤¤¾ì¹ç)¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¡£
 ¥¢¡¼¥«¥¤¥Ö¤ÎÂå¤ï¤ê¤Ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤹ¤ë¤È¤­¤Ë¤Ï¡¢
-.B \-\-no\-check
+.B \-\-nocheck
 ¥ª¥×¥·¥ç¥ó¤Ï»ÈÍѤ·¤Æ¤Ï¤¤¤±¤Ê¤¤(
 .B dpkg\-deb
 ¤Ï¡¢»ÈÍѤ¹¤ë¥Õ¥¡¥¤¥ë̾¤òÄ´¤Ù¤ë¤¿¤á¤Ë¡¢¥Ñ¥Ã¥±¡¼¥¸À©¸æ¥Õ¥¡¥¤¥ë¤òÆɤó¤Ç²òÀÏ
@@ -124,12 +130,12 @@ dpkg-deb
 ¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¥¢¡¼¥«¥¤¥Ö¤Î¾ðÊó¤òɽ¼¨¤¹¤ë¡£
 
 ¤â¤·
-.IR À©¸æ¥Õ¥¡¥¤¥ë̾
+.IR control\-file\-name
 ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢À©¸æ¥Õ¥¡¥¤¥ë°ìÍ÷¤È¡¢¥Ñ¥Ã¥±¡¼¥¸¤ÎÃæ¿È¤ÎÍ×Ìó¤ò
 ɽ¼¨¤¹¤ë¡£
 
 ¤â¤·
-.IR À©¸æ¥Õ¥¡¥¤¥ë̾
+.IR control\-file\-name
 ¤ò»ØÄꤷ¤¿¾ì¹ç¡¢
 .B dpkg\-deb
 ¤Ï»ØÄꤷ¤¿½ç¤Ç¥Õ¥¡¥¤¥ë̾¤òɽ¼¨¤¹¤ë¡£¤â¤·»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤Î¤É¤ì¤«¤¬
@@ -139,13 +145,13 @@ dpkg-deb
 .BR \-\-field ", " -f
 ¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¥¢¡¼¥«¥¤¥Ö¤«¤éÀ©¸æ¥Õ¥¡¥¤¥ë¾ðÊó¤ò¼è¤ê½Ð¤¹¡£
 
-.BR À©¸æ¥Õ¥¡¥¤¥ë¥Õ¥£¡¼¥ë¥É
+.BR control\-file\-field
 ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢À©¸æ¥Õ¥¡¥¤¥ë¤¹¤Ù¤Æ¤òɽ¼¨¤¹¤ë¡£
 
 ¤â¤·²¿¤«»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢
 .B dpkg\-deb
 ¤Ï¤½¤ÎÆâÍƤòÀ©¸æ¥Õ¥¡¥¤¥ë¤Ë¸½¤ï¤ì¤ë½ç½ø¤Çɽ¼¨¤¹¤ë¡£¤â¤·¡¢Ê£¿ô¤Î
-.BR À©¸æ¥Õ¥¡¥¤¥ë¥Õ¥£¡¼¥ë¥É
+.BR control\-file\-field
 ¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢
 .B dpkg\-deb
 ¤Ï¡¢¤½¤ì¤¾¤ì¤Î¾ðÊó¤ÎÁ°¤Ë¥Õ¥£¡¼¥ë¥É̾(¤½¤·¤Æ¥³¥í¥ó¤È¶õÇò)¤òɽ¼¨¤¹¤ë¡£
@@ -173,7 +179,7 @@ dpkg-deb
 .B dpkg
 ¤ò»È¤¦¤Ù¤­¤Ç¤¢¤ë¡£
 
-.I ¥Ç¥£¥ì¥¯¥È¥ê
+.I directory
 (¿Æ¤ä¤½¤ì¤è¤ê¾å¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï´Þ¤Þ¤Ê¤¤)¤ÏɬÍפ¬¤¢¤ì¤ÐºîÀ®¤µ¤ì¤ë¡£
 
 .TP
@@ -223,7 +229,7 @@ dpkg-deb
 ¥Ð¡¼¥¸¥ç¥ó 0.93.76(1995ǯ9·î)°ÊÁ°¤Î dpkg ¤Ç½èÍý¤¹¤ë¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò
 ¹½ÃÛ¤¹¤ë¤È¤­¤À¤±¤Ë»ÈÍѤµ¤ì¤ë¡£
 .TP
-.BR --no-check
+.BR --nocheck
 .BR "dpkg\-deb \-\-build"
 ¤Î¤È¤­¤Ë¥¢¡¼¥«¥¤¥Ö¤ÎÃæ¿È¤ò³Îǧ¤¹¤ë¤³¤È¤ò¤ä¤á¤µ¤»¤ë¡£¤³¤ì¤Ë¤è¤Ã¤Æ¡¢
 ¥¢¡¼¥«¥¤¥Ö¤ÎÃæ¿È¤Ë¤É¤Î¤è¤¦¤ËÌäÂ꤬¤¢¤Ã¤Æ¤â¡¢Ë¾¤à¥¢¡¼¥«¥¤¥Ö¤ò¹½ÃÛ¤¹¤ë
@@ -253,6 +259,16 @@ dpkg-deb
 .BR dselect (8).
 .SH Ãø¼Ô
 .B dpkg\-deb
+¤È¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï Ian Jackson ¤¬ºîÀ®¤·¤¿¡£¤³¤ì¤é¤ÎÃøºî¸¢¤ÏÈà¤Ë
+¤¢¤ê(Copyright (C)1995-1996)¡¢GNU °ìÈ̸øÍ­»ÈÍѵöÂú¤Ë¤è¤êÈÒÉÛ¤µ¤ì¤ë¡£
+¤³¤ì¤é¤Ï̵ÊݾڤǤ¢¤ë¡£¾ÜºÙ¤Ï
+.B /usr/share/doc/dpkg/copyright
+¤È
+.B /usr/share/common-licenses/GPL
+¤ò»²¾È¤¹¤ë¤³¤È¡£
+
+(
+.B dpkg\-deb
 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
@@ -261,3 +277,11 @@ WARRANTY.  See
 and
 .B /usr/share/common-licenses/GPL
 for details.
+)
+.SH ÆüËܸìÈÇËÝÌõ
+´îÀ¥¹À <fuyuneko@ryukyu.ne.jp>
+.SH ÆüËܸìÈǹ»Àµ
+Debian JP Documentation ML <debian-doc@debian.or.jp>
+.SH ËÝÌõ¼ÔÃí
+¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï dpkg ¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó1.6.6¤ËÉÕ°¤Î
+dpkg-deb(1)¤ÎÆüËܸìÌõ¤Ç¤¢¤ë¡£

diff --git a/doc/ja/dpkg.8 b/doc/ja/dpkg.8
index 61fa354a406e5a8061a352dc3eabfaa36813c937..32cdd8f768dac00d4a093f74ead8ec7956320860 100644 (file)
--- a/doc/ja/dpkg.8
+++ b/doc/ja/dpkg.8
@@ -1,7 +1,7 @@
 .\" Hey Emacs! This file is -*- nroff -*- source.
-.\" Original manpage is provided by dpkg_1.4.0.34
+.\" Original manpage is provided by dpkg_1.6.6
 .\" Translated by Hiroshi KISE <fuyuneko@ryuku.ne.jp>
-.\" Last modify: Tue Mar 16 15:35:00 JST 1999
+.\" Last modify: Mon Jan 10 22:42:17 JST 2000
 .\"WORD:       package maintainers     ¥Ñ¥Ã¥±¡¼¥¸´ÉÍý¼Ô
 .\"WORD:       command line options    ¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó
 .\"WORD:       command line parameter  ¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¤­¿ô
@@ -10,7 +10,7 @@
 .\"WORD:       install                 ¥¤¥ó¥¹¥È¡¼¥ë
 .\"WORD:       remove                  ºï½ü
 .\"WORD:       purge                   ´°Á´ºï½ü
-.\"WORD:       medium-level tool       Ãæ¥ì¥Ù¥ë¥Ä¡¼¥ë
+.\"WORD:       medium-level tool       Ãæ´Ö¥ì¥Ù¥ë¥Ä¡¼¥ë
 .\"WORD:       user-friendly           ¥æ¡¼¥¶¥Õ¥ì¥ó¥É¥ê
 .\"WORD:       front-end               ¥Õ¥í¥ó¥È¥¨¥ó¥É
 .\"WORD:       action                  ¥¢¥¯¥·¥ç¥ó
@@ -27,7 +27,7 @@
 .\"WORD:       avail                   ÍøÍѲÄǽ
 .TH DPKG 8 "April 12, 1998" "Debian Project" "Debian GNU/Linux"
 .SH ̾Á°
-dpkg - Debian GNU/Linux Ãæ¥ì¥Ù¥ë¥Ñ¥Ã¥±¡¼¥¸¥Þ¥Í¡¼¥¸¥ã
+dpkg - Debian GNU/Linux Ãæ´Ö¥ì¥Ù¥ë¥Ñ¥Ã¥±¡¼¥¸¥Þ¥Í¡¼¥¸¥ã
 
 .SH ½ñ¼°
 .B dpkg
@@ -182,9 +182,9 @@ Debian 
 \fB2.\fP
 ¤â¤·¥Ñ¥Ã¥±¡¼¥¸¤¬ \fIpostinst\fP ¥¹¥¯¥ê¥×¥È¤òÄ󶡤·¤Æ¤¤¤ë¾ì¹ç¡¢¤½¤ì¤ò¼Â¹Ô¤¹¤ë¡£
 .TP
-\fBdpkg -r\fP | \fB--remove\fP | \fB--purge \fP\fIpackage\fP ... | \fB-a\fP | \fB--pending\fP
+\fBdpkg -r\fP | \fB--remove\fP | \fB-P\fP | \fB--purge \fP\fIpackage\fP ... | \fB-a\fP | \fB--pending\fP
 ¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¡£
-\fB--purge\fP ¤Ï¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤ò´Þ¤à¤¹¤Ù¤Æ¤òºï½ü¤¹¤ë¡£
+\fB-P\fP ¤Þ¤¿¤Ï \fB--purge\fP ¤Ï¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤ò´Þ¤à¤¹¤Ù¤Æ¤òºï½ü¤¹¤ë¡£
 \fB--remove\fP ¤Ï¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤ò½ü¤¤¤¿¤¹¤Ù¤Æ¤òºï½ü¤¹¤ë(ÀßÄê¥Õ¥¡¥¤¥ë¤Î°ìÍ÷¤Ï¡¢
 \fIconffiles\fP ¥³¥ó¥È¥í¡¼¥ë¥Õ¥¡¥¤¥ë¤Ë¤¢¤ë)¡£
 °ú¤­¿ô¤È¤·¤Æ¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ÎÂå¤ï¤ê¤Ë \fB-a\fP ¤Þ¤¿¤Ï \fB--pending\fP ¤¬
@@ -203,7 +203,7 @@ purge 
 \fB3.\fP \fIpostrm\fP ¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤¹¤ë¡£
 .br
 .TP
-.BI "dpkg --print-avail " package
+.BI "dpkg -p|--print-avail " package
 \fI/var/lib/dpkg/available\fP ¤Ë¤¢¤ë \fIpackage\fP ¤Ë´Ø¤¹¤ë¾ðÊó¤ò
 ɽ¼¨¤¹¤ë¡£
 .TP
@@ -400,6 +400,20 @@ essential 
 ¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤È¶¥¹ç¤·¤Æ¤â¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¡£¤¿¤¤¤Æ¤¤¤Ï¤¤¤¯¤Ä¤«¥Õ¥¡¥¤¥ë¤ò
 ¾å½ñ¤­¤¹¤ë¤³¤È¤Ë¤Ê¤ë¤¿¤á¡¢´í¸±¤Ç¤¢¤ë¡£
 
+\fBconfnew\fP:
+ÀßÄê¥Õ¥¡¥¤¥ë¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤¿¾ì¹ç¡¢Ì䤤¹ç¤ï¤»¤Ê¤·¤Ë¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î
+ÀßÄê¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¡£
+
+\fBconfold\fP:
+ÀßÄê¥Õ¥¡¥¤¥ë¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤¿¾ì¹ç¡¢Ì䤤¹ç¤ï¤»¤Ê¤·¤Ë¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î
+ÀßÄê¥Õ¥¡¥¤¥ë¤òÊÝ»ý¤¹¤ë¡£
+
+\fBconfdef\fP:
+ÀßÄê¥Õ¥¡¥¤¥ë¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤¿¾ì¹ç¡¢¾ï¤Ë¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤ò¤¹¤ë¡£
+\fB--force-confnew\fP ¤ä \fB--force-confold\fP ¤¬¤¢¤ë¾ì¹ç¤Ç¤â¡¢¾ï¤Ë
+¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤ò¤¹¤ë¡£¥Ç¥Õ¥©¥ë¥È¤¬¤Ê¤¤¾ì¹ç¤Ï¡¢¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Î
+Í¿¤¨Êý¤Ë¤è¤Ã¤Æ¿·¤·¤¤¡¢¤Þ¤¿¤Ï¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ¹¤ë¡£
+
 \fBoverwrite\fP(*):
 ¤¢¤ë¥Ñ¥Ã¥±¡¼¥¸¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤ò¡¢¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î
 ¥Õ¥¡¥¤¥ë¤Ç¾å½ñ¤­¤¹¤ë¡£
@@ -575,24 +589,32 @@ CDROM
 \fB--no-act\fP ¤ÎÄ󶡤¹¤ë¾ðÊó¤Ï¤¿¤¤¤Æ¤¤¤Î¾ì¹ç¡¢ÉÔ½¼Ê¬¤Ç¤¢¤ë¡£
 .SH Ãø¼Ô
 .nf
-\fBdpkg\fP ¤Ï°Ê²¼¤Î¿Í¡¹¤Ë¤è¤Ã¤Æ³«È¯¤µ¤ì¤¿¡£
-    Ian Jackson <ian@chiark.chu.cam.ac.uk>
-    Klee Dienes <klee@debian.org>
-    Erick Branderhorst <branderhorst@heel.fgg.eur.nl>
-    Miquel van Smoorenburg <miquels@cistron.nl>
-    Kim-Minh Kaplan <kkaplan@cdfhp3.in2p3.fr>
-    Michael Shields <shields@crosslink.net>
-    Bruce Perens <bruce@pixar.com>
-    Streeter <streeter@cae.wisc.edu>
-    Matt Welsh <mdw@sunsite.unc.edu>
-    Ian Murdock <imurdock@debian.org>
-    Colin Plumb
-    Branko Lankester
+\fBdpkg\fP ¤Ë¹×¸¥¤·¤¿¿Í¡¹¤ò°Ê²¼¤Ë¼¨¤¹¡£
+Ian Jackson <ian@davenant.greenend.org.uk>
+Wichert Akkerman <wakkerma@debian.org>
+Ben Collins <bcollins@debian.org>
+Nils Rennebarth <nils@debian.org>
+Miquel van Smoorenburg <miquels@cistron.nl>
+Juan Cespedes <cespedes@debian.org>
+Juho Vuori <javuori@cc.helsinki.fi>
+Charles Briscoe-Smith <cpbs@debian.org>
+Erick Branderhorst <branderhorst@heel.fgg.eur.nl>
+Miquel van Smoorenburg <miquels@cistron.nl>
+Kim-Minh Kaplan <kkaplan@cdfhp3.in2p3.fr>
+Michael Shields <shields@crosslink.net>
+Bruce Perens <bruce@pixar.com>
+Carl Streeter <streeter@cae.wisc.edu>
+Matt Welsh <mdw@sunsite.unc.edu>
+Ian Murdock <imurdock@debian.org>
+Colin Plumb
+Branko Lankester
 .fi
 ¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï Juho Vuori <javuori@cc.helsinki.fi> ¤¬
 µ­½Ò¤·¡¢Jim Van Zandt <jrv@vanzandt.mv.com> ¤¬¹¹¿·¤·¤¿¡£
-.SH ËÝÌõ¼Ô
+.SH ÆüËܸìÈÇËÝÌõ
 ´îÀ¥¹À <fuyuneko@ryukyu.ne.jp>
+.SH ÆüËܸìÈǹ»Àµ
+Debian JP Documentation ML <debian-doc@debian.or.jp>
 .SH ËÝÌõ¼ÔÃí
-¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï dpkg ¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó1.4.0.34¤ËÉÕ°¤Î
+¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï dpkg ¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó1.6.6¤ËÉÕ°¤Î
 dpkg(8)¤ÎÆüËܸìÌõ¤Ç¤¢¤ë¡£

diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 2eaf7b6b6e5d9f1df288efadb241987fafcc811c..33cd55c4da3c2ff862a3970510c8351cdbb01572 100755 (executable)
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -238,7 +238,7 @@ if (!$binaryonly) {
     }
     for $f (@sourcefiles) { $f2sec{$f}= $sec; $f2pri{$f}= $pri; }
     
-    if (($sourcestyle =~ m/i/ && $version !~ m/-[01]$/ ||
+    if (($sourcestyle =~ m/i/ && $version !~ m/-(0|1|0\.1)$/ ||
          $sourcestyle =~ m/d/) &&
         grep(m/\.diff\.gz$/,@sourcefiles)) {
         $origsrcmsg= "not including original source code in upload";