[Pkg-telepathy-commits] [SCM] Idle packaging branch, debian, updated. debian/0.1.16-1-7-g79c74e2

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 7b83f07586566cf75a4a390d623af9f35810eb7a
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jun 16 12:52:24 2013 +0100

    Remove update-patches.mk and README.source: this is now a perfectly ordinary git-buildpackage + quilt package (and gbp-pq can be used to manipulate patches)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 8663a0f..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,59 +0,0 @@
-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
-===================
-
-The repository contains an appropriate debian/gbp.conf to build this package
-using git-buildpackage. The debian branch contains the latest upstream versions
-(for unstable, or experimental while a freeze is in progress). The debian-lenny
-branch contains versions targeted for lenny, etc.
-
-Here's how to build it:
-
-    git clone git://git.debian.org/git/pkg-telepathy/telepathy-idle
-    cd telepathy-idle
-    git checkout debian
-    git-buildpackage -us -uc
-
-or for testing/stable branches like debian-lenny:
-
-    git clone git://git.debian.org/git/pkg-telepathy/telepathy-idle
-    cd telepathy-idle
-    git checkout debian-lenny
-    git-buildpackage -us -uc --git-debian-branch=debian-lenny
-
-The branch 'upstream' is a copy of the contents of upstream tarballs. To import
-upstream tarballs use:
-
-    git checkout debian
-    git-import-orig ~/telepathy-idle-0.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-idle.git
-    git fetch
-    git checkout debian-patches
-    git cherry-pick xxxxxxxxxxxxxx
-    git checkout debian
-    fakeroot debian/rules update-patches
diff --git a/debian/changelog b/debian/changelog
index 0cef55b..40f56d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 telepathy-idle (0.1.16-2) UNRELEASED; urgency=low
 
   * Remove obsolete Debian-specific man page, superseded upstream
+  * Remove update-patches.mk and README.source: this is now a perfectly
+    ordinary git-buildpackage + quilt package (and gbp-pq can be used to
+    manipulate patches)
 
  -- Simon McVittie <smcv at debian.org>  Sun, 16 Jun 2013 12:48:48 +0100
 
diff --git a/debian/rules b/debian/rules
index c15789f..4ff4c6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,5 +11,3 @@ common-binary-post-install-arch:: list-missing
 DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/telepathy"
 # but haven't done so yet, so let's give Debian a head start
 DEB_CONFIGURE_EXTRA_FLAGS := --bindir=$(DEB_CONFIGURE_LIBEXECDIR) --disable-silent-rules
-
-include $(CURDIR)/debian/update-patches.mk
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

-- 
Idle packaging