[Pkg-telepathy-commits] [SCM] farsight2 packaging branch, debian, updated. 303063d5bb8b716f0ec91c1d37bd8de5f9ce33b5

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 303063d5bb8b716f0ec91c1d37bd8de5f9ce33b5
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Dec 26 20:13:52 2008 +0000

    Add README.source

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..66d457d
--- /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/farsight2.git
+    cd farsight2
+    git checkout debian
+    git-buildpackage -us -uc
+
+or for testing/stable branches like debian-lenny:
+
+    git clone git://git.debian.org/git/pkg-telepathy/farsight2.git
+    cd farsight2
+    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 ~/farsight2-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/farsight2.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 688b173..f666d1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ farsight2 (0.0.4-1.0.1) UNRELEASED; urgency=low
   [ Simon McVittie ]
   * Move packaging to git
   * Add `debian/rules update-patches` and gbp.conf for maintainers
+  * Add README.source
 
  -- Sjoerd Simons <sjoerd at debian.org>  Thu, 27 Nov 2008 15:03:14 +0100
 

-- 
farsight2 packaging