Source: git
Version: 1:2.9.3-1
Severity: wishlist
Tags: patch
This replaces the custom patching and unpatching code in debian/rules with
the builtin functionality of dpkg-source format 3.0 (quilt), and updates
debian/git.README.source accordingly. I’d like to include this in the
2.10.0 upload when that is released, but please let me know if I should
wait.
---
debian/changelog | 6 ++++++
debian/git.README.source | 11 +++++-----
...hook-capture-documentation-in-a-here-docum.diff | 0
debian/patches/series | 1 +
debian/rules | 25 ++++------------------
5 files changed, 17 insertions(+), 26 deletions(-)
rename debian/{diff =>
patches}/0001-pre-rebase-hook-capture-documentation-in-a-here-docum.diff (100%)
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index 0c50160..8df6b35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git (1:2.9.3-2) UNRELEASED; urgency=medium
+
+ * Migrate patches to 3.0 (quilt) format.
+
+ -- Anders Kaseorg <ande...@mit.edu> Wed, 17 Aug 2016 00:35:17 -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/git.README.source b/debian/git.README.source
index 40a3923..ce13c78 100644
--- a/debian/git.README.source
+++ b/debian/git.README.source
@@ -62,12 +62,13 @@ config --add format.suffix .diff' to make that the default)
$ git format-patch release..release+patches
$ git checkout debian-sid
-Now move the extracted patches into the debian/diff/ directory, add a
-meaningful message to debian/changelog, and commit the changes to the
-debian-sid branch
+Now move the extracted patches into the debian/patches/ directory, add
+their filenames to debian/patches/series, add a meaningful message to
+debian/changelog, and commit the changes to the debian-sid branch:
- $ mv ????-*.diff debian/diff/
- $ git add debian/diff
+ $ ls ????-*.diff >> debian/patches/series
+ $ mv ????-*.diff debian/patches/
+ $ git add debian/patches
$ debchange -pi
$ git add debian/changelog
$ git commit
diff --git
a/debian/diff/0001-pre-rebase-hook-capture-documentation-in-a-here-docum.diff
b/debian/patches/0001-pre-rebase-hook-capture-documentation-in-a-here-docum.diff
similarity index 100%
rename from
debian/diff/0001-pre-rebase-hook-capture-documentation-in-a-here-docum.diff
rename to
debian/patches/0001-pre-rebase-hook-capture-documentation-in-a-here-docum.diff
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2cf5d5b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-pre-rebase-hook-capture-documentation-in-a-here-docum.diff
diff --git a/debian/rules b/debian/rules
index 61c735b..f19c7bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,18 +51,10 @@ PKG_INDEP += git-man
TMP =$(shell pwd)/tmp
GIT =$(shell pwd)/debian/git
-patch: deb-checkdir patch-stamp
-patch-stamp:
- for i in `ls -1 debian/diff/*.diff debian/diff/*.patch \
- 2>/dev/null || :`; do \
- patch -p1 -N -r- <$$i || test $$? = 1 || exit 1; \
- done
- touch patch-stamp
-
build: build-arch build-indep
build-arch: deb-checkdir build-arch-stamp
-build-arch-stamp: patch-stamp
+build-arch-stamp: deb-checkdir
-$(CC) -v
DESTDIR='$(GIT)' $(MAKE) all $(OPTS)
DESTDIR='$(GIT)' $(MAKE) -C contrib/subtree all $(OPTS)
@@ -76,7 +68,7 @@ build-arch-stamp: patch-stamp
touch build-arch-stamp
build-indep: deb-checkdir build-indep-stamp
-build-indep-stamp: patch-stamp build-arch-stamp
+build-indep-stamp: build-arch-stamp
# git-man, git-doc
$(MAKE) -CDocumentation man html $(DOC_OPTS)
# git-mediawiki
@@ -85,17 +77,8 @@ build-indep-stamp: patch-stamp build-arch-stamp
clean: deb-checkdir
$(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; \
- done; \
- }
rm -rf '$(TMP)'
- rm -f patch-stamp build-arch-stamp build-indep-stamp
+ rm -f build-arch-stamp build-indep-stamp
set -e; \
for i in '' $(patsubst git%,%,$(PKG_INDEP)) -core; do \
rm -rf '$(GIT)'$$i; \
@@ -361,7 +344,7 @@ binary-indep: install-indep $(patsubst
%,%.deb,$(PKG_INDEP)) git-core.deb-DEBIAN
dpkg -b '$(GIT)'$$i .. || exit 1; \
done
-.PHONY: patch clean
+.PHONY: clean
.PHONY: build build-arch build-indep
.PHONY: install install-arch install-indep
.PHONY: binary binary-arch binary-indep
--
2.10.0.rc0
