From: Raphael Hertzog <hertzog@debian.org>
Date: Thu, 27 Dec 2007 14:22:38 +0000 (+0100)
Subject: Makefile.am: Add missing files to EXTRA_DIST
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd3aae5215cae427bbd3cdd05bf4b7e988cd7447;p=dpkg

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 98145b8d..2ea48b52 100644
--- 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 94148da1..6efc557b 100644
--- 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 0820f095..5ad59650 100644
--- 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).