Makefile.am: Add missing files to EXTRA_DIST

Also add a new dist-hook rule with a check of the distdir to make sure
that all files contained in the git repository also end up in the
distribution tarball (except .gitignore files).

diff --git a/ChangeLog b/ChangeLog
index 98145b8d5280e798e7ded4dfa5a23890afd00f77..2ea48b524fe05d16f51e0f579028832d83ef3b15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-27  Raphael Hertzog  <hertzog@debian.org>
+
+       * Makefile.am: Add some missing files in EXTRA_DIST. And add a
+       dist-hook rule to check that all files contained in the git
+       repository (except .gitignore) are included in the dist tarball.
+
 2007-12-27  Raphael Hertzog  <hertzog@debian.org>
 
        * configure.ac: Bump version to 1.14.15~.

diff --git a/Makefile.am b/Makefile.am
index 94148da139a09c2b8a983cdad0a3e05cadb5eb7b..6efc557b0b32d59d87bb2995788b05262ae39ee0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,12 +24,15 @@ ACLOCAL_AMFLAGS = -I m4
 dist_pkgdata_DATA = cputable ostable triplettable
 
 EXTRA_DIST = \
+       README.translators \
        debian/archtable \
        debian/changelog \
        debian/compat \
        debian/control \
        debian/copyright \
+       debian/dpkg-dev.docs \
        debian/dpkg-dev.install \
+       debian/dpkg-dev.preinst \
        debian/dpkg-dev.lintian-overrides \
        debian/dpkg.cfg \
        debian/dpkg.docs \
@@ -41,10 +44,25 @@ EXTRA_DIST = \
        debian/dpkg.logrotate \
        debian/dpkg.lintian-overrides \
        debian/dselect.cfg \
+       debian/dselect.docs \
        debian/dselect.install \
+       debian/dselect.preinst \
        debian/dselect.lintian-overrides \
        debian/source.lintian-overrides \
        debian/usertags \
        debian/rules \
        debian/shlibs.default \
        debian/shlibs.override
+
+# If we create the dist tarball from the git repository, make sure
+# that we're not forgetting some files...
+dist-hook:
+       if [ -e .git ]; then \
+               for file in `git ls-files | grep -v .gitignore`; do \
+                       if [ ! -e "$(distdir)/$$file" ]; then \
+                               echo "$$file is missing in $(distdir)" >&2 ; \
+                               exit 1 ; \
+                       fi ; \
+               done ; \
+       fi
+

diff --git a/debian/changelog b/debian/changelog
index 0820f095040f0353c3a51a66d290b6a42b0887b9..5ad59650349a77b3bb2c9c2d1c51adbb401129a7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 dpkg (1.14.15) UNRELEASED; urgency=low
 
-  *
+  [ Raphael Hertzog ]
+  * Make sure {dpkg-dev,dselect}.preinst are included in the source tarball.
+    Closes: #452730
 
   [ Updated man pages translations ]
   * Swedish (Peter Karlsson).