[Pkg-telepathy-commits] [SCM] UNNAMED PROJECT branch, debian, updated. 1bdb4c89c31f856f1c77615d6cbb78e52dda50f0

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 1bdb4c89c31f856f1c77615d6cbb78e52dda50f0
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Jan 2 21:42:05 2009 +0000

    Add README.source

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..1cb4654
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,58 @@
+Patches
+=======
+
+This package uses cdbs simple-patch-system to store modifications to the
+upstream source.
+
+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/empathy.git
+    cd empathy
+    git checkout debian
+    git-buildpackage -us -uc
+
+or for testing/stable branches like debian-lenny:
+
+    git clone git://git.debian.org/git/pkg-telepathy/empathy.git
+    cd empathy
+    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 ~/empathy-2.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/empathy.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 4680d00..fb3887f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ empathy (2.25.3-2) UNRELEASED; urgency=low
   * Switch packaging to git
   * Add gbp.conf (for git-buildpackage) and `debian/rules update-patches`
     target
+  * Add README.source
 
  -- Simon McVittie <smcv at debian.org>  Fri, 02 Jan 2009 21:33:26 +0000
 

-- 
UNNAMED PROJECT