[Pkg-telepathy-commits] [SCM] libtelepathy packaging branch, debian, updated. 7e783b0d9f411ac9d3b349b7718117b8eabc3e56

[Simon McVittie]

The following commit has been merged in the debian branch:
commit da8ca47a442603ea2c762b152e315b177e44c11f
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Dec 26 16:21:27 2008 +0000

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

diff --git a/debian/changelog b/debian/changelog
index 67fc96d..2006a9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libtelepathy (0.3.2-2) UNRELEASED; urgency=low
 
   * Use my and Laurent's debian.org addresses in Uploaders
   * Move packaging to git
+  * Add gbp.conf and `debian/rules update-patches` target for maintainers
 
  -- Simon McVittie <smcv at debian.org>  Sun, 27 Apr 2008 13:24:31 +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 511e495..c606777 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,3 +12,5 @@ LIB_PKG := $(shell sed -n 's/^Package: //p' debian/control | head -n 1)
 DEB_DH_MAKESHLIBS_ARGS_$(LIB_PKG) += -V '$(LIB_PKG) (>= 0.3.2)'
 
 DEB_DBG_PACKAGE_ALL := libtelepathy-dbg
+
+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

-- 
libtelepathy packaging