stop installing duplicate docs; tweak installed files; Add info manual to doc-base

diff --git a/debian/changelog b/debian/changelog
index e11c841..d085d39 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,11 @@ gnulib (20140202+stable-2) unstable; urgency=low
     + Bump debhelper compat level to 9 for hardening flags.
   * Man page for git-merge-changelog adapted
     from comments at the top of git-merge-changelog.c
+  * Remove duplicate copies of documentation (Closes: #728933).
+  * Tweak list of top-level files installed.
+  * doc-base: add Format: Info version of manual.
 
- -- Ian Beckwith <ianb@debian.org>  Sun, 02 Mar 2014 19:39:23 +0000
+ -- Ian Beckwith <ianb@debian.org>  Sun, 02 Mar 2014 23:04:10 +0000
 
 gnulib (20140202+stable-1) unstable; urgency=low
 

diff --git a/debian/gnulib.doc-base b/debian/gnulib.doc-base
index 2da2ca0..92dcf3d 100644 (file)
--- a/debian/gnulib.doc-base
+++ b/debian/gnulib.doc-base
@@ -6,3 +6,6 @@ Format: HTML
 Index: /usr/share/doc/gnulib/gnulib.html
 Files: /usr/share/doc/gnulib/gnulib.html
 
+Format: Info
+Index: /usr/share/info/gnulib.info
+Files: /usr/share/info/gnulib.info

diff --git a/debian/gnulib.docs b/debian/gnulib.docs
index 65c96d7..3e65d36 100644 (file)
--- a/debian/gnulib.docs
+++ b/debian/gnulib.docs
@@ -3,3 +3,4 @@ NEWS
 NEWS.stable
 README
 users.txt
+STATUS-libposix

diff --git a/debian/rules b/debian/rules
index 8cdf024..3e4a0f6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ override_dh_auto_install-indep:
        cp -a check-module debian/gnulib/usr/bin
        mkdir -p debian/gnulib/usr/share/gnulib
        cp -a build-aux posix-modules config doc lib m4 modules top tests \
-             MODULES.html.sh Makefile gnulib-tool \
+             MODULES.html.sh Makefile gnulib-tool cfg.mk check-copyright \
              debian/gnulib/usr/share/gnulib
        ln -s ../share/gnulib/gnulib-tool debian/gnulib/usr/bin
        # Fix permissions
@@ -51,8 +51,12 @@ override_dh_auto_install-indep:
        chmod 0755 debian/gnulib/usr/share/gnulib/tests/test-posix_spawn1.in.sh
        chmod 0755 debian/gnulib/usr/share/gnulib/tests/test-posix_spawn2.in.sh
        # Remove unused files
+       rm -f debian/gnulib/usr/share/gnulib/doc/gnulib.info
+       rm -f debian/gnulib/usr/share/gnulib/doc/gnulib.html
+       rm -f debian/gnulib/usr/share/gnulib/doc/updated-stamp
        rm -f debian/gnulib/usr/share/gnulib/modules/COPYING
-       rm -f debian/gnulib/usr/share/gnulib/*/.cvsignore
-       rm -f debian/gnulib/usr/share/gnulib/*/.gitignore
+       rm -f debian/gnulib/usr/share/gnulib/*/.cvsignore debian/gnulib/usr/share/gnulib/.cvsignore
+       rm -f debian/gnulib/usr/share/gnulib/*/.gitignore debian/gnulib/usr/share/gnulib/.gitignore
+       rm -f debian/gnulib/usr/share/gnulib/*/.gitattributes debian/gnulib/usr/share/gnulib/.gitattributes
 
 override_dh_auto_test: