[Pkg-telepathy-commits] [SCM] UNNAMED PROJECT branch, debian, updated. 1bdb4c89c31f856f1c77615d6cbb78e52dda50f0

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 73e35e92ae3f8426c4a5947f729fbbcf69b88b15
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Jan 2 21:38:44 2009 +0000

    Add gbp.conf (for git-buildpackage) and `debian/rules update-patches` target

diff --git a/debian/changelog b/debian/changelog
index 46d048e..4680d00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 empathy (2.25.3-2) UNRELEASED; urgency=low
 
   * Switch packaging to git
+  * Add gbp.conf (for git-buildpackage) and `debian/rules update-patches`
+    target
 
  -- Simon McVittie <smcv at debian.org>  Fri, 02 Jan 2009 21:33:26 +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 0d2f6c5..822a392 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,3 +22,5 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \
 
 binary-install/python-empathy::
 	dh_pysupport -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

-- 
UNNAMED PROJECT