Release 1.10.22

Patches applied:

 * scott@netsplit.com--2004/dpkg--devo--1.10--base-0
   tag of scott@netsplit.com--2004/dpkg--cvs--1.10--patch-222

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-1
   make start-stop-daemon work on hurd

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-2
   merge changes from svn

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-3
   use colouring to break dep cycles

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-4
   fix some *really* bad missing brace errors

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-5
   add archtable support for GNU/kNetBSD and fix GNU/kFreeBSD.

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-6
   add missing debian/changelog entries

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-7
   more changelog fixing

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-8
   fix some compiler warnings

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-9
   change amd64 to x86-64

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-10
   update italian translation

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-11
   reformatted debian/changelog

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-12
   updated spanish dpkg-divert.8 manpage

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-13
   new german start-stop-daemon manpage

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-14
   updated russian manpage

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-15
   update japanese manpages

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-16
   fix wrong bug#

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-17
   quote LDFLAGS in debian/rules

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-18
   document dpkg:Version and dpkg:UpstreamVersion substvars.

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-19
   allow dpkg-shlibdeps to run as root by guarding chown

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-20
   move dpkg-scanpackages(8) and dpkg-scansources(8) into (1)

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-21
   Release 1.10.22

 * scott@netsplit.com--2004/dpkg--svn--1.10--patch-95
   (merge patch logs from dpkg--cvs--1.10)

 * scott@netsplit.com--2004/dpkg--svn--1.10--patch-97
   main/packages.c: Apply patch from Daniel Kobras to disappear empty pac...

 * scott@netsplit.com--2004/dpkg--svn--1.10--patch-98
   spelling error fix


* scripts/Makefile.in: Move dpkg-scanpackages and dpkg-scansources
manpages to section 1.
* scripts/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted
reference to dpkg-scansources.
* scripts/dpkg-scansources.pl: Adjusted reference to dpkg-scanpackages.
* dselect/dselect.8: Adjusted reference to dpkg-scanpackages.

* man/es/Makefile.in: Move dpkg-scanpackages and dpkg-scansources
manpages to section 1.
* man/es/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted
reference to dpkg-scansources.
* man/es/dpkg-scansources.8: Renamed to dpkg-scansources.1,

* man/fr/Makefile.in: Move dpkg-scanpackages and dpkg-scansources
manpages to section 1.
* man/fr/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted
reference to dpkg-scansources.
* man/fr/dpkg-scansources.8: Renamed to dpkg-scansources.1

* man/ja/Makefile.in: Move dpkg-scanpackages and dpkg-scansources
manpages to section 1.
* man/ja/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted
refence to dpkg-scansources.
* man/ja/dpkg-scansources.8: Renamed to dpkg-scansources.1, adjusted
reference to dpkg-scanpackages.
* man/ja/dselect.8: Adjusted references to dpkg-scanpackages.

* man/pt_BR/dselect.8: Adjusted reference to dpkg-scanpackages.
* man/sv/.check.pl: Adjusted reference to dpkg-scanpackages.
* man/sv/dselect.8: Adjusted reference to dpkg-scanpackages.

* scripts/dpkg-shlibdeps.pl: Guard chown call with a check that we're
running as root, if we're not, it's not necessary.

* script/dpkg-source.1: Documented dpkg:Version and dpkg:UpstreamVersion
substvars.

* man/ja/dpkg-checkbuilddeps.1: Updated.
* man/ja/dpkg-divert.8: Updated.

* po/ru.po: Updated.

* man/de/start-stop-daemon.8: New translation.
* man/de/Makefile.in: Added new manpage.

* man/es/dpkg-divert.8: Updated.

* po/it.po: Updated.

* archtable: Change amd64 to x86-64 or x86_64 to match the GNU strings
until someone better than me makes a real decision about this.
* scripts/dpkg-architecture.pl: Likewise.

* dpkg-deb/extract.c: Swap %zi and %ld in printf expression.
* split/info.c: Correct %zi and %lu in printf expression.
* split/main.c: Include missing sys/types.h and sys/stat.h headers.

* archtable: Change i386-kfreebsd-gnu to kfreebsd-i386 and add
i386-knetbsd-gnu.
* scripts/dpkg-archtable.pl: Return i386-freebsd for freebsd-i386 and
i386-kfreebsd-gnu for kfreebsd-i386 instead.  Add knetbsd-i386.
* configure.in: Identify knetbsd-gnu.

* main/depcon.c: Colour packages as we check them for break cycles to
reduce the amount of recursion required to break a cycle.
* include/dpkg-deb.h, lib/database.c: Add colour to the package structure.
* main/main.h, main/configure.c, main/remove.c: Remove second
argument from findbreakcycle() function.

* utils/start-stop-daemon.c: On hurd, proc_stat_set_flags may return
NULL as Hurd can have processes with no uid, replace ihash_iterate
with HURD_IHASH_ITERATE.

* utils/md5sum.1: s/asterix/asterisk/.  Thanks to Matt Zimmermann for
noticing this.

* main/packages.c: Apply patch from Daniel Kobras to disappear empty
packages that are replaced in the same run.

11 files changed, 38 insertions, 24 deletions

diff --git a/man/de/Makefile.in b/man/de/Makefile.in
index a5f626808..3b55b35b2 100644
--- a/man/de/Makefile.in
+++ b/man/de/Makefile.in
@@ -10,7 +10,7 @@ deman5dir	= $(subst $(mandir),$(mandir)/de,$(man5dir))
 deman8dir	= $(subst $(mandir),$(mandir)/de,$(man8dir))
 
 MAN1PAGES	= md5sum.1 
-MAN8PAGES	= update-alternatives.8
+MAN8PAGES	= start-stop-daemon.8 update-alternatives.8
 
 all: 
 
diff --git a/man/es/Makefile.in b/man/es/Makefile.in
index 91be149d0..02b96fcb5 100644
--- a/man/es/Makefile.in
+++ b/man/es/Makefile.in
@@ -10,12 +10,12 @@ esman5dir	= $(subst $(mandir),$(mandir)/es,$(man5dir))
 esman8dir	= $(subst $(mandir),$(mandir)/es,$(man8dir))
 
 MAN1PAGES	= dpkg-deb.1 dpkg-name.1 md5sum.1 dpkg-checkbuilddeps.1 \
-		  822-date.1 dpkg-source.1
+		  822-date.1 dpkg-source.1 dpkg-scanpackages.1 \
+		  dpkg-scansources.1
 MAN5PAGES	= deb-control.5 deb.5
-MAN8PAGES	= cleanup-info.8 dpkg.8 dpkg-divert.8 dpkg-scanpackages.8 \
-			start-stop-daemon.8 dselect.8 \
-			update-alternatives.8 dpkg-statoverride.8 dpkg-split.8 \
-			dpkg-scansources.8
+MAN8PAGES	= cleanup-info.8 dpkg.8 dpkg-divert.8 start-stop-daemon.8 \
+		  dselect.8 update-alternatives.8 dpkg-statoverride.8 \
+		  dpkg-split.8
 
 all: 
 
diff --git a/man/es/dpkg-divert.8 b/man/es/dpkg-divert.8
index 26a75becd..ec8565758 100644
--- a/man/es/dpkg-divert.8
+++ b/man/es/dpkg-divert.8
@@ -1,5 +1,5 @@
 .\" Esta traducción ha sido realizada Rudy Godoy 
-.\" Basado en la versión 1.1 del CVS de
+.\" Basado en la versión 1.2 del CVS de
 .\" /cvs/debian-doc/manpages/english/dpkg/dpkg-divert.8
 
 .TH DPKG-DIVERT 8 "Diciembre de 1999" "Proyecto Debian" "herramientas dpkg"
@@ -71,8 +71,15 @@ Imprime el nombre del programa y su versión, y finaliza correctamente.
 Cuando se añade, por omisión se usa --local y --divert <original>.distrib.
 Cuando se elimina, --package o --local y --divert deben coincidir si se
 especifican.
-.br
+
 Los directorios no pueden ser redirigidos con dpkg-divert.
+
+Debe de tenerse cuidado cuando se redireccionen bibliotecas compartidas,
+ldconfig (8) crea un enlace simbólico basado en el campo DT_SONAME empotrado en
+la biblioteca. Ya que ldconfig no hace caso de las redirecciones (sólo dpkg lo
+hace), si una biblioteca redirigida tiene el mismo SONAME que la que no está
+redirigida, es posible que el enlace simbólico acabe apuntando a la biblioteca
+redirigida.
 .SH ARCHIVOS
 .TP
 .I /var/lib/dpkg/diversions
diff --git a/man/fr/Makefile.in b/man/fr/Makefile.in
index d3b30f04a..c185fe970 100644
--- a/man/fr/Makefile.in
+++ b/man/fr/Makefile.in
@@ -9,12 +9,12 @@ frman1dir	= $(subst $(mandir),$(mandir)/fr,$(man1dir))
 frman5dir	= $(subst $(mandir),$(mandir)/fr,$(man5dir))
 frman8dir	= $(subst $(mandir),$(mandir)/fr,$(man8dir))
 
-MAN1PAGES	= dpkg-deb.1 dpkg-name.1 dpkg-source.1
+MAN1PAGES	= dpkg-deb.1 dpkg-name.1 dpkg-source.1 dpkg-scanpackages.1 \
+		  dpkg-scansources.1
 MAN5PAGES	= deb-control.5 deb.5
-MAN8PAGES	= cleanup-info.8 dpkg.8 dpkg-divert.8 dpkg-scanpackages.8 \
-			dpkg-scansources.8 install-info.8 start-stop-daemon.8 \
-			update-alternatives.8 dpkg-statoverride.8 dpkg-split.8 \
-			dpkg-query.8
+MAN8PAGES	= cleanup-info.8 dpkg.8 dpkg-divert.8 install-info.8 \
+		  start-stop-daemon.8 update-alternatives.8 \
+		  dpkg-statoverride.8 dpkg-split.8 dpkg-query.8
 
 all: 
 
diff --git a/man/ja/Makefile.in b/man/ja/Makefile.in
index 2b4a839da..c3cf4aa5b 100644
--- a/man/ja/Makefile.in
+++ b/man/ja/Makefile.in
@@ -10,11 +10,12 @@ jaman5dir	= $(subst $(mandir),$(mandir)/ja,$(man5dir))
 jaman8dir	= $(subst $(mandir),$(mandir)/ja,$(man8dir))
 
 MAN1PAGES	= dpkg-deb.1 md5sum.1 822-date.1 dpkg-name.1 \
-		  dpkg-checkbuilddeps.1 dpkg-architecture.1 dpkg-source.1
+		  dpkg-checkbuilddeps.1 dpkg-architecture.1 dpkg-source.1 \
+		  dpkg-scanpackages.1 dpkg-scansources.1
 MAN5PAGES	= deb-old.5 deb.5 deb-control.5
 MAN8PAGES	= dpkg.8 dselect.8 install-info.8 start-stop-daemon.8 \
 		  update-alternatives.8 cleanup-info.8 dpkg-divert.8 \
-		  dpkg-scanpackages.8 dpkg-scansources.8 dpkg-query.8
+		  dpkg-query.8
 
 all: 
 
diff --git a/man/ja/dpkg-checkbuilddeps.1 b/man/ja/dpkg-checkbuilddeps.1
index f9ec0c9dc..7583bf6f2 100644
--- a/man/ja/dpkg-checkbuilddeps.1
+++ b/man/ja/dpkg-checkbuilddeps.1
@@ -1,4 +1,4 @@
-.\" Original manpage cvs revision: 1.3
+.\" Original manpage cvs revision: 1.3.2.1
 .TH DPKG-CHECKBUILDDEPS 1 "February 2001" "Debian project" "dpkg utililties"
 .SH ̾Á°
 dpkg-checkbuilddeps -- ¥Ó¥ë¥É°Í¸¤È¾×ÆͤΥÁ¥§¥Ã¥¯
@@ -8,7 +8,6 @@ dpkg-checkbuilddeps -- ¥Ó¥ë¥É°Í¸¤È¾×ÆͤΥÁ¥§¥Ã¥¯
 ¤³¤Î¥×¥í¥°¥é¥à¤Ï¥³¥ó¥È¥í¡¼¥ë¥Õ¥¡¥¤¥ëÃæ¤Ë¥ê¥¹¥È¤µ¤ì¤Æ¤¤¤ë¥Ó¥ë¥É°Í¸¤È
 ¥Ó¥ë¥É¾×Æͤ˴ؤ·¤Æ¡¢¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò
 ¥Á¥§¥Ã¥¯¤¹¤ë¡£
-¥Á¥§¥Ã¥¯¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ï¡¢build-essential ¤â´Þ¤Þ¤ì¤ë¡£
 ¤â¤·¡¢Â­¤ê¤Ê¤¤¤â¤Î¤ä¾×Æͤ·¤Æ¤¤¤ëʪ¤¬¤¢¤ë¤Ê¤é¡¢¤½¤ì¤é¤òɽ¼¨¤·¤Æ 0 °Ê³°¤Î
 ÊÖ¤êÃͤòÊÖ¤·¤Æ½ªÎ»¤¹¤ë¡£
 .P
diff --git a/man/ja/dpkg-divert.8 b/man/ja/dpkg-divert.8
index a5594b73f..001932823 100644
--- a/man/ja/dpkg-divert.8
+++ b/man/ja/dpkg-divert.8
@@ -1,4 +1,4 @@
-.\" original cvs revision: 1.4
+.\" original cvs revision: 1.4.2.1
 .TH DPKG-DIVERT 8 "December 1999" "Debian Project" "dpkg utilities"
 .SH ̾Á°
 dpkg-divert -- ¥Ñ¥Ã¥±¡¼¥¸¤Î¥Õ¥¡¥¤¥ë¤Î¥ª¡¼¥Ð¡¼¥é¥¤¥É
@@ -69,8 +69,15 @@ dpkg ¥Ç¡¼¥¿¥Ç¥£¥ì¥¯¥È¥ê¤ò <directory> ¤ËÀßÄꤹ¤ë¡£(¥Ç¥Õ¥©¥ë¥È: /var/lib/dpkg)
 Äɲ乤ë»þ¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ï --local ¤È --divert <original>.distrib ¤Ç¤¢¤ë¡£
 ºï½ü¤¹¤ëÌä¤Ï¡¢--package ¤â¤·¤¯¤Ï --local ¤È --divert ¤Ï»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð
 Äɲä·¤¿»þ¤È°ìÃפ·¤Æ¤¤¤Ê¤±¤ì¤Ð¤¤¤±¤Ê¤¤¡£
-.br
+
 dpkg-divert ¤Ç¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤ÏÂàÈò¤Ç¤­¤Ê¤¤¡£
+
+¶¦Í­¥é¥¤¥Ö¥é¥ê¤òÂàÈò¤¹¤ë¾ì¹ç¡¢Ãí°Õ¤¹¤Ù¤­¤Ç¤¢¤ë¡£ldconfig(8)¤Ï
+¥é¥¤¥Ö¥é¥ê¤ËËä¤á¹þ¤Þ¤ì¤Æ¤¤¤ë DT_SONAME ¥Õ¥£¡¼¥ë¥É¤Ë´ð¤Å¤¤¤Æ¡¢
+¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤òºîÀ®¤¹¤ë¡£ldconfig ¤ÏÂàÈò¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¤¤¿¤á
+¤Ç¤¢¤ë(dpkg ¤À¤±¤¬¤Ç¤­¤ë)¡£¤â¤·ÂàÈò¤·¤¿¥é¥¤¥Ö¥é¥ê¤ÈÂàÈò¤·¤Æ¤¤¤Ê¤¤
+¥é¥¤¥Ö¥é¥ê¤¬Æ±¤¸ SONAME ¤Ç¤¢¤ì¤Ð¡¢ºÇ½ªÅª¤Ë¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ÏÂàÈò¤·¤¿
+¥é¥¤¥Ö¥é¥ê¤ò»Ø¤¹¡£
 .SH ¥Õ¥¡¥¤¥ë
 .TP
 .I /var/lib/dpkg/diversions
diff --git a/man/ja/dselect.8 b/man/ja/dselect.8
index c550b3612..8527d15b5 100644
--- a/man/ja/dselect.8
+++ b/man/ja/dselect.8
@@ -243,12 +243,12 @@ normal, standout, underline, reverse, blink, bright, dim, bold
 .\" the dpkg database.  The package lists are commonly provided by the 
 .\" repository as files named \fBPackages\fP or \fBPackages.gz\fP.  
 .\" These files can be generated by repository maintainers, using the
-.\" program \fBdpkg-scanpackages(8)\fP.  
+.\" program \fBdpkg-scanpackages(1)\fP.  
 ÍøÍѲÄǽ¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¥ê¥¹¥È¤ò¡¢¸½ºßÀßÄꤷ¤Æ¤¤¤ë¥¢¥¯¥»¥¹Êý¼°¤Ç¡¢
 ¥Ñ¥Ã¥±¡¼¥¸¥ê¥Ý¥¸¥È¥ê¤«¤é¼èÆÀ¤·¡¢dpkg ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·¤¹¤ë¡£
 ¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤Ï¡¢°ìÈÌŪ¤Ë¤Ï \fBPackages\fP, \fBPackages.gz\fP ¤È¤¤¤¦Ì¾Á°¤Ç¡¢
 ¥ê¥Ý¥¸¥È¥ê¤è¤êÄ󶡤µ¤ì¤Æ¤¤¤ë¡£
-¥ê¥Ý¥¸¥È¥ê´ÉÍý¼Ô¤Ï¡¢\fBdpkg-scanpackages(8)\fP¤È¤¤¤¦¥×¥í¥°¥é¥à¤ò»ÈÍѤ·¤Æ¡¢
+¥ê¥Ý¥¸¥È¥ê´ÉÍý¼Ô¤Ï¡¢\fBdpkg-scanpackages(1)\fP¤È¤¤¤¦¥×¥í¥°¥é¥à¤ò»ÈÍѤ·¤Æ¡¢
 ¤³¤Î¥Õ¥¡¥¤¥ë¤òÀ¸À®¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¡£
 .sp
 .\" Details of the update action depend on the access method's implementation.
diff --git a/man/pt_BR/dselect.8 b/man/pt_BR/dselect.8
index e966d2448..e55cccac1 100644
--- a/man/pt_BR/dselect.8
+++ b/man/pt_BR/dselect.8
@@ -149,7 +149,7 @@ pacotes, configurado para o método de acesso atual, e atualiza a base de
 dados do dpkg. As listas de pacotes são normalmente providas  pelo
 repositório como arquivos nomeados como \fBPackages\fP ou
 \fBPackages.gz\fP. Esses arquivos podem ser gerados pelos mantenedores
-do repositório, usando o programa \fBdpkg-scanpackages(8)\fP.  
+do repositório, usando o programa \fBdpkg-scanpackages(1)\fP.  
 .sp
 Detalhes da ação de atualização dependem da implementação do método  de
 acesso. Normalmente o processo é direto e não requer interação com o
diff --git a/man/sv/.check.pl b/man/sv/.check.pl
index ef5ddce66..9993efc2b 100755
--- a/man/sv/.check.pl
+++ b/man/sv/.check.pl
@@ -19,7 +19,7 @@ my %source = (
 	'dpkg-statoverride.8'	=> 'scripts',
 	'dpkg-divert.8'			=> 'scripts',
 	'dpkg-architecture.1'	=> 'scripts',
-	'dpkg-scanpackages.8'	=> 'scripts',
+	'dpkg-scanpackages.1'	=> 'scripts',
 	'update-alternatives.8'	=> 'scripts',
 	'install-info.8'		=> 'scripts',
 	'dpkg-name.1'			=> 'scripts',
diff --git a/man/sv/dselect.8 b/man/sv/dselect.8
index db21c57d0..10bcefc83 100644
--- a/man/sv/dselect.8
+++ b/man/sv/dselect.8
@@ -153,7 +153,7 @@ dpkgs databas.
 Paketlistor finns normalt på paketsamlingarna i filer vid namn
 \fBPackages\fP eller \fBPackages.gz\fP.
 Dessa filer kan genereras av de som underhåller samlingarna genom
-att använda programmet \fBdpkg-scanpackages(8)\fP.
+att använda programmet \fBdpkg-scanpackages(1)\fP.
 .sp
 Vilka detaljer som ges om uppdateringen beror på hur åtkomstmetoden
 är implementerad.