[Pkg-telepathy-commits] [SCM] farsight2 packaging branch, debian, updated. 303063d5bb8b716f0ec91c1d37bd8de5f9ce33b5

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 03df2ad979d58a350b46d55a6b18f3ce790bb48f
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Dec 26 20:12:44 2008 +0000

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

diff --git a/debian/changelog b/debian/changelog
index a0ddcfa..688b173 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ farsight2 (0.0.4-1.0.1) UNRELEASED; urgency=low
 
   [ Simon McVittie ]
   * Move packaging to git
+  * Add `debian/rules update-patches` and gbp.conf for maintainers
 
  -- Sjoerd Simons <sjoerd at debian.org>  Thu, 27 Nov 2008 15:03:14 +0100
 
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 1a2fc22..168cf5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,3 +15,5 @@ common-binary-post-install-arch:: list-missing
 
 binary-install/python-farsight::
 	dh_pycentral -p$(cdbs_curpkg)
+
+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

-- 
farsight2 packaging