[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian-experimental, updated. debian/5.6.0-1-9-gfbf9f1e

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit aa95863dcd1dad5b541d4b614cef1108d4da55f2
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Nov 17 12:11:48 2010 +0000

    Switch to 3.0 (quilt) source

diff --git a/debian/README.source b/debian/README.source
index a566c75..b96f212 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,18 +1,3 @@
-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
 ===================
 
@@ -40,20 +25,3 @@ upstream tarballs use:
 
     git checkout debian
     git-import-orig ~/telepathy-mission-control-5.1.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-mission-control.git
-    git fetch
-    git checkout debian-patches
-    git cherry-pick xxxxxxxxxxxxxx
-    git checkout debian
-    fakeroot debian/rules update-patches
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)

-- 
MC 5 packaging