[Pkg-telepathy-commits] [SCM] pymsn packaging branch, debian, updated. 1ab2717a3aa856baad99778903c25b1e2c5b94c3

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 1ab2717a3aa856baad99778903c25b1e2c5b94c3
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jan 8 02:05:52 2009 +0000

    Add misc bits of git packaging
    
    * Add debian/README.source
    * Add debian/gbp.conf for convenient git-buildpackage use
    * Add `debian/rules update-patches` target

diff --git a/debian/changelog b/debian/changelog
index e855906..09ff272 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,9 @@ pymsn (0.3.3-2) UNRELEASED; urgency=low
 
   [ Simon McVittie ]
   * Move packaging to git
-  * Add README.source
+  * Add debian/README.source
+  * Add debian/gbp.conf for convenient git-buildpackage use
+  * Add `debian/rules update-patches` target
 
  -- Laurent Bigonville <bigon at bigon.be>  Wed, 03 Sep 2008 21:18:19 +0200
 
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 2aa3022..df5034d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,3 +15,5 @@ include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/utils.mk
 common-binary-post-install-indep:: list-missing
 	rm -f debian/python-msn/usr/share/pycentral/python-msn/site-packages/pymsn/msnp2p/test.py
+
+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

-- 
pymsn packaging