[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian, updated. upstream/0.7.20-78-g10032e3

[Simon McVittie]

The following commit has been merged in the debian branch:
commit acbed4e07778569a2180731e7bec5e46991e6a3a
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Dec 17 23:57:47 2008 +0000

    Move packaging to git; the setup is basically the same as telepathy-farsight, but with pristine-tar enabled
    
    Also wrap Uploaders line in debian/control.

diff --git a/debian/changelog b/debian/changelog
index 7b0289a..79f744d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+telepathy-glib (0.7.19-2) UNRELEASED; urgency=low
+
+  * Move packaging to git; the setup is basically the same as
+    telepathy-farsight, but with pristine-tar enabled
+  * debian/control: wrap Uploaders line
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 17 Dec 2008 23:47:06 +0000
+
 telepathy-glib (0.7.19-1) experimental; urgency=low
 
   * New upstream release (ABI, API added)
diff --git a/debian/control b/debian/control
index e50450e..6623907 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,10 @@ Source: telepathy-glib
 Section: libs
 Priority: optional
 Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers at lists.alioth.debian.org>
-Uploaders: Dafydd Harries <daf at debian.org>, Simon McVittie <smcv at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Laurent Bigonville <bigon at debian.org>
+Uploaders: Dafydd Harries <daf at debian.org>,
+           Simon McVittie <smcv at debian.org>,
+           Sjoerd Simons <sjoerd at debian.org>,
+           Laurent Bigonville <bigon at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 5),
                libglib2.0-dev (>= 2.16),
@@ -13,7 +16,8 @@ Build-Depends: cdbs,
                gtk-doc-tools (>= 1.10),
                pkg-config (>= 0.21)
 Standards-Version: 3.8.0
-Vcs-Bzr: http://bzr.debian.org/pkg-telepathy/packages/unstable/telepathy-glib/
+Vcs-Git: git://git.debian.org/git/pkg-telepathy/telepathy-glib.git
+Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-glib.git
 Homepage: http://telepathy.freedesktop.org/wiki/
 XS-Dm-Upload-Allowed: yes
 
diff --git a/debian/rules b/debian/rules
index 7616ec1..4dfd2e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,3 +26,5 @@ DEB_INSTALL_DOCS_libtelepathy-glib0-dbg := --no-act
 DEB_INSTALL_CHANGELOGS_libtelepathy-glib0-dbg := --no-act
 DEB_INSTALL_DOCS_libtelepathy-glib-dev := --no-act
 DEB_INSTALL_CHANGELOGS_libtelepathy-glib-dev := --no-act
+
+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

-- 
telepathy-glib packaging