The branch, master has been updated
via fd3aae5215cae427bbd3cdd05bf4b7e988cd7447 (commit)
from 47bfece759fc36bd2f4b2eac9162c05858d4ce5d (commit)
- Shortlog ------------------------------------------------------------
fd3aae5 Makefile.am: Add missing files to EXTRA_DIST
Summary of changes:
ChangeLog | 6 ++++++
Makefile.am | 18 ++++++++++++++++++
debian/changelog | 4 +++-
3 files changed, 27 insertions(+), 1 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit fd3aae5215cae427bbd3cdd05bf4b7e988cd7447
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Thu Dec 27 15:22:38 2007 +0100
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 98145b8..2ea48b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-12-27 Raphael Hertzog <[EMAIL PROTECTED]>
+ * 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 <[EMAIL PROTECTED]>
+
* configure.ac: Bump version to 1.14.15~.
2007-12-27 Raphael Hertzog <[EMAIL PROTECTED]>
diff --git a/Makefile.am b/Makefile.am
index 94148da..6efc557 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 0820f09..5ad5965 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).
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
