move dpkg.cfg.5 and dselect.cfg.5 into dpkg package

diff --git a/ChangeLog b/ChangeLog
index 8f9e5cd3e51db62fb93e795b69404deb35393178..5d36a2495930085b22cbd032d185069aa3ab5088 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul  2 09:52:41 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
+
+  * debian/rules: move dpkg.cfg.5 and dselect.cfg.5 into dpkg package
+
 Tue Jul  2 09:46:01 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
 
   * Merge from HEAD:

diff --git a/debian/changelog b/debian/changelog
index 42f3e0bdb1afd75e7abc216fb556370022b58bd4..334ab067e683774424c5ecffc9d699a2fcf0e66b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ dpkg (1.10.1) unstable; urgency=low
     not hardcode Debian policy.
   * Make dpkg-genchanges accept ~ as part of a package filename.
     Closes: Bug#150739
+  * Move dpkg.cfg and dselect.cfg manpages into dpkg package. Closes: Bug#132901
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/debian/rules b/debian/rules
index 18cbb6e5faeffe0f47ddb7c33b295abe92d0d14f..67ac1932ef463528b754fd408e1f074fd90ed618 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -123,6 +123,12 @@ binary-dpkg-most binary-dpkg-static-most: binary-dpkg%-most: stamp-binary%
                                cp -a $(INSTALL_TMP)/usr/share/man/$$i/man1/$$m $(TMP_DPKG)/usr/share/man/$$i/man1/$$m ; \
                        fi ; \
                done ; \
+               install -d -m 755 -o root -g root $(TMP_DPKG)/usr/share/man/$$i/man5 ; \
+               for m in dpkg.cfg.5  dselect.cfg.5 ; do \
+                       if [ -f $(INSTALL_TMP)/usr/share/man/$$i/man5/$$m ] ; then \
+                               cp -a $(INSTALL_TMP)/usr/share/man/$$i/man5/$$m $(TMP_DPKG)/usr/share/man/$$i/man1/$$m ; \
+                       fi ; \
+               done ; \
                install -d -m 755 -o root -g root $(TMP_DPKG)/usr/share/man/$$i/man8 ; \
                for m in dpkg.8 dpkg-query.8 dpkg-split.8 start-stop-daemon.8 \
                        cleanup-info.8 dpkg-divert.8 dpkg-statoverride.8 \