[Pkg-telepathy-commits] [SCM] telepathy-mission-control packaging branch, debian, updated. 48526ae34ec82d2f423fdb76c37dd436d17ad4e2

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 5dfcf12e62a87c306102e7f3253f1f58a30f1fff
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Dec 26 19:24:02 2008 +0000

    Add README.source

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..ef56ade
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,59 @@
+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-mission-control.git
+    cd telepathy-mission-control
+    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-mission-control.git
+    cd telepathy-mission-control
+    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-mission-control-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-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/changelog b/debian/changelog
index 2c5290e..58a658d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ telepathy-mission-control (4.67-2) UNRELEASED; urgency=low
 
   * Move packaging to git
   * Add `debian/rules update-patches` and gbp.conf for Debian maintainers
+  * Add README.source
 
  -- Simon McVittie <smcv at debian.org>  Fri, 26 Dec 2008 19:16:14 +0000
 

-- 
telepathy-mission-control packaging