Source: git
Version: 1:1.8.5~rc2-1
Tags: patch
The mw-to-git packaging in 1:1.8.5~rc2-1 (http://bugs.debian.org/718395),
and the subtree packaging in 1:1.9.1-1 (http://bugs.debian.org/704652), do
not clean up after themselves correctly, with the result that building a
binary package and then a source package fails:
$ debuild -b
[…]
Successfully signed changes file
$ debuild -S
[…]
dpkg-source: warning: executable mode 0755 of
'contrib/subtree/git-subtree' will not be represented in diff
dpkg-source: info: local changes detected, the modified files are:
git/GIT-VERSION-FILE
git/contrib/subtree/git-subtree
git/contrib/subtree/git-subtree.1
git/contrib/subtree/git-subtree.html
git/contrib/subtree/git-subtree.xml
dpkg-source: error: aborting due to unexpected upstream changes, see
/tmp/git_2.9.3-1.diff.EhLegS
dpkg-source: info: you can integrate the local changes with dpkg-source --commit
dpkg-buildpackage: error: dpkg-source -b git gave error exit status 2
We need to clean contrib/subtree which was not getting cleaned at all, and
we need to clean contrib/mw-to-git before cleaning the top directory so
that GIT-VERSION-FILE gets removed. I intend to fix this as follows.
---
debian/changelog | 7 +++++++
debian/rules | 3 ++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 0c50160..8774690 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+git (1:2.9.3-2) UNRELEASED; urgency=medium
+
+ * debian/rules: Fix clean target to remove GIT-VERSION-FILE and
+ contrib/subtree build products.
+
+ -- Anders Kaseorg <ande...@mit.edu> Fri, 19 Aug 2016 23:00:23 -0400
+
git (1:2.9.3-1) unstable; urgency=medium
* New upstream release (see RelNotes/2.8.2.txt, RelNotes/2.8.3.txt,
diff --git a/debian/rules b/debian/rules
index 61c735b..4cd0a75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,11 +84,12 @@ build-indep-stamp: patch-stamp build-arch-stamp
touch build-indep-stamp
clean: deb-checkdir
+ $(MAKE) -C contrib/mw-to-git clean $(OPTS)
+ $(MAKE) -C contrib/subtree clean $(OPTS)
$(MAKE) clean $(OPTS)
! test -e patch-stamp || \
{ \
set -e; \
- $(MAKE) -Ccontrib/mw-to-git clean $(OPTS); \
for i in `ls -1r debian/diff/*.diff debian/diff/*.patch \
2>/dev/null || :`; do \
patch -p1 -NR -r- <$$i || test $$? = 1 || exit 1; \
--
2.10.0.rc0
