Ensure all translated manual pages actually get included in the binary

packages.

diff --git a/ChangeLog b/ChangeLog
index f764707c80e3c7634de428404c530d088ed98f70..44bf96c467996b6179b17e68324616045e4490a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Apr 26 18:53:15 BST 2004 Scott James Remnant <scott@netsplit.com>
+
+  * configure.in: Put the man page directories in alphabetical order.
+  * man/Makefile.in: Likewise
+  * debian/rules: Extract manual page directories from Makefile.in and
+  use that list instead of hardcoding them.
+
 Sun Apr 25 19:00:20 BST 2004 Scott James Remnant <scott@netsplit.com>
 
   * version-nr, debian/changelog: Bump version to 1.10.22.

diff --git a/configure.in b/configure.in
index 0a2d558052df474e7054401fccb2d3c97482d6f9..a2091b6c283165d18c096d3b32233161bd11043a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -478,9 +478,9 @@ man/en/Makefile
 man/es/Makefile
 man/fr/Makefile
 man/ja/Makefile
+man/pt_BR/Makefile
 man/ru/Makefile
 man/sv/Makefile
-man/pt_BR/Makefile
 scripts/Makefile
 main/Makefile
 dselect/Makefile

diff --git a/debian/changelog b/debian/changelog
index 9a39bb29e69dc9cf51da44ad7b3212d990548eaf..20bbb987e06e4984db8817b5e272d2b756fe301f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dpkg (1.10.22) unstable; urgency=low
 
-  * 
+  * Stop hardcoding the list of manual page languages in debian/rules,
+    so we include Spanish, Russian and Brazilian Portugese.  Closes: #245994.
 
  -- Scott James Remnant <scott@netsplit.com>  UNRELEASED
 

diff --git a/debian/rules b/debian/rules
index 03de9cc19eb90227086819008d76d5fb160f1029..c246e802f7d94505ac52aa37efa4430323527744 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,9 @@ endif
 
 BUILD-DIRS     := $(BUILD) $(BUILD)-static
 
+# Hacky, but effective
+MANDIRS := $(shell sed -n -e '/^SUBDIRS/{s/.*= *//;s/ en / /;p}' $(CURDIR)/man/Makefile.in)
+
 aclocal.m4: $(wildcard automake/*.m4)
        aclocal -I automake
 
@@ -124,7 +127,7 @@ binary-dpkg-most binary-dpkg-static-most: binary-dpkg%-most: stamp-binary%
                cp -a $(INSTALL_TMP)/usr/share/doc/dpkg/$$i $(TMP_DPKG)/usr/share/doc/dpkg$(static)/ ; \
        done
        cp -a debian/pseudo-tags $(TMP_DPKG)/usr/share/doc/dpkg$(static)/
-       set -e ; for i in "" de fr ja sv ; do \
+       set -e ; for i in "" $(MANDIRS) ; do \
                install -d -m 755 -o root -g root $(TMP_DPKG)/usr/share/man/$$i/man1 ; \
                for m in md5sum.1 dpkg-deb.1 ; do \
                        if [ -f $(INSTALL_TMP)/usr/share/man/$$i/man1/$$m ] ; then \
@@ -201,7 +204,7 @@ binary-dpkg-dev: stamp-binary
                dpkg-parsechangelog dpkg-checkbuilddeps ; do \
                mv $(INSTALL_TMP)/usr/bin/$$i $(TMP_DPKG_DEV)/usr/bin/ ; \
        done
-       set -e ; for i in "" de fr ja sv ; do \
+       set -e ; for i in "" $(MANDIRS) ; do \
                install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share/man/$$i/man1 ; \
                for m in dpkg-name.1 dpkg-source.1 822-date.1 dpkg-architecture.1 \
                        dpkg-buildpackage.1 dpkg-distaddfile.1 dpkg-genchanges.1 \
@@ -251,7 +254,7 @@ binary-dselect: stamp-binary
        install -d -m 755 -o root -g root $(TMP_DSELECT)/var/lib/dpkg
        mv $(INSTALL_TMP)/var/lib/dpkg/methods $(TMP_DSELECT)/var/lib/dpkg/
 
-       set -e ; for i in "" de fr ja sv ; do \
+       set -e ; for i in "" $(MANDIRS) ; do \
                install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/share/man/$$i/man5 ; \
                for m in dselect.cfg.5 ; do \
                        if [ -f $(INSTALL_TMP)/usr/share/man/$$i/man5/$$m ] ; then \

diff --git a/man/Makefile.in b/man/Makefile.in
index 87ac584947a6c4f6e8f5a7c15fd66b64a3307fcb..c37efb633b1fada6f93a7976908e1026dc1722e3 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -2,7 +2,7 @@ VPATH           = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
 
-SUBDIRS                = de en fr ja pt_BR ru sv es
+SUBDIRS                = de en es fr ja pt_BR ru sv
 
 default: all
 include ../Makefile.conf