[Pkg-telepathy-commits] [SCM] telepathy-mission-control packaging branch, debian, updated. 48526ae34ec82d2f423fdb76c37dd436d17ad4e2

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 54ef41f7b67e8e4cb2569197fb12b13f850b7966
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Dec 26 19:22:36 2008 +0000

    Add `debian/rules update-patches` and gbp.conf for Debian maintainers

diff --git a/debian/changelog b/debian/changelog
index 2103cb7..2c5290e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 telepathy-mission-control (4.67-2) UNRELEASED; urgency=low
 
   * Move packaging to git
+  * Add `debian/rules update-patches` and gbp.conf for Debian maintainers
 
  -- Simon McVittie <smcv at debian.org>  Fri, 26 Dec 2008 19:16:14 +0000
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..2923ad3
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,9 @@
+[DEFAULT]
+debian-branch = debian
+upstream-branch = upstream
+pristine-tar = True
+
+[git-buildpackage]
+tarball-dir = ../tarballs/
+export-dir = ../build-area/
+no-create-orig = True
diff --git a/debian/rules b/debian/rules
index 38532e4..1e4a7fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,3 +31,5 @@ common-post-build-arch::
 
 clean::
 	-rm debian/mission-control.8
+
+include $(CURDIR)/debian/update-patches.mk
diff --git a/debian/update-patches.mk b/debian/update-patches.mk
new file mode 100644
index 0000000..298c5b3
--- /dev/null
+++ b/debian/update-patches.mk
@@ -0,0 +1,10 @@
+update-patches:
+	mkdir -p $(CURDIR)/debian/patches
+	rm -f $(CURDIR)/debian/patches/*.patch
+	git-format-patch -o $(CURDIR)/debian/patches debian-patches ^upstream
+	for patch in $$(ls $(CURDIR)/debian/patches/*.patch) ; \
+	do \
+		lines=$$(cat $$patch | wc -l) ; \
+		head -n $$(($$lines - 3)) $$patch > $${patch}.chomped ; \
+			mv $${patch}.chomped $$patch ; \
+	done

-- 
telepathy-mission-control packaging