[Pkg-telepathy-commits] [SCM] farsight packaging branch, debian, updated. 21fa90b4d2c716188e04ad852b80b6641332aafc

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 8bedb7fbdeed770af36bb24a0add9292e5b34563
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Dec 26 19:53:31 2008 +0000

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

diff --git a/debian/changelog b/debian/changelog
index 93e5c29..a31a76b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 farsight (0.1.28-3) 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:52:01 +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 fcc9d1e..ec4555f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,3 +11,5 @@ DEB_CONFIGURE_EXTRA_FLAGS = --disable-sequence-diagrams --enable-static --enable
 # List any files which are not installed
 include /usr/share/cdbs/1/rules/utils.mk
 common-binary-post-install-arch:: list-missing
+
+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

-- 
farsight packaging