[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian-experimental, updated. debian/0.11.14-1-8-g81d53fd

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit 48b828df185050e5cb6fa7f5e6a4e70aa3313814
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Sep 13 13:38:31 2010 +0100

    Use the 3.0 (quilt) source format

diff --git a/debian/README.source b/debian/README.source
index 8c78691..4d4db8f 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -10,21 +10,6 @@ When packaging new upstream releases, you can update the version
 that's actually used to build the package by copying it from
 telepathy-glib/_gen/ into the debian/ directory.
 
-Patches
-=======
-
-This package occasionally uses cdbs simple-patch-system to store
-modifications to the upstream source, although in most uploads no patches
-are needed.
-
-To get the fully patched source: make -f debian/rules patch
-
-To revert to what's in git: make -f debian/rules unpatch
-
-To add a patch: obtain a diff and put it in debian/patches, or see below
-
-To remove an existing patch: delete it from debian/patches
-
 Packaging using git
 ===================
 
@@ -53,19 +38,5 @@ upstream tarballs use:
     git checkout debian
     git-import-orig ~/telepathy-glib-0.7.x.tar.gz
 
-The branch 'debian-patches' is 'upstream' plus any patches needed for Debian.
-It should be rebased on 'upstream' after each upstream release:
-
-    git checkout debian-patches
-    git rebase upstream
-
-The preferred way of adding patches is to cherry pick from an upstream
-repository:
-
-    git remote add collabora \
-        git+ssh://git.collabora.co.uk/git/telepathy-glib.git
-    git fetch
-    git checkout debian-patches
-    git cherry-pick xxxxxxxxxxxxxx
-    git checkout debian
-    fakeroot debian/rules update-patches
+Patches can be added in the usual 3.0 (quilt) ways, for instance by using
+gbp-pq(1) from the git-buildpackage package.
diff --git a/debian/changelog b/debian/changelog
index 2042589..a66f2b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 telepathy-glib (0.11.14-3) UNRELEASED; urgency=low
 
   * Advance debhelper compat mode to 8
+  * Use the 3.0 (quilt) source format
 
  -- Simon McVittie <smcv at debian.org>  Mon, 13 Sep 2010 13:35:00 +0100
 
diff --git a/debian/rules b/debian/rules
index 31992be..0069d20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@ DEB_DH_MAKESHLIBS_ARGS_libtelepathy-glib0 := -V"libtelepathy-glib0 (>= 0.11.14)"
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 # We don't want the .la files, but complain if anything else is missing
 binary-post-install/libtelepathy-glib-dev::
@@ -41,5 +40,3 @@ insist-on-symlinks:
 		install -d debian/$$p/usr/share/doc || exit $$?; \
 		ln -s libtelepathy-glib0 debian/$$p/usr/share/doc/$$p || exit $$?; \
 	done
-
-include $(CURDIR)/debian/update-patches.mk
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff --git a/debian/update-patches.mk b/debian/update-patches.mk
deleted file mode 100644
index 298c5b3..0000000
--- a/debian/update-patches.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-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