[Pkg-telepathy-commits] [SCM] farsight packaging branch, debian, updated. 21fa90b4d2c716188e04ad852b80b6641332aafc

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 21fa90b4d2c716188e04ad852b80b6641332aafc
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Dec 26 19:54:07 2008 +0000

    Standards-Version: 3.8.0 (add README.source)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..373671b
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,52 @@
+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/farsight.git
+    cd farsight
+    git checkout debian
+    git-buildpackage -us -uc
+
+The branch 'upstream' is a copy of the contents of upstream tarballs. To import
+upstream tarballs use:
+
+    git checkout debian
+    git-import-orig ~/farsight-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/farsight.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 a31a76b..57c25fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ farsight (0.1.28-3) UNRELEASED; urgency=low
 
   * Move packaging to git
   * Add `debian/rules update-patches` and gbp.conf for Debian maintainers
+  * Standards-Version: 3.8.0 (add README.source)
 
  -- Simon McVittie <smcv at debian.org>  Fri, 26 Dec 2008 19:52:01 +0000
 
diff --git a/debian/control b/debian/control
index 8d18987..3cd42d8 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 5.0.0),
                libsofia-sip-ua-dev,
                libjinglep2p0.3-dev (>= 0.3.11),
                gtk-doc-tools
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-telepathy/farsight.git
 Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/farsight.git
 Homepage: http://farsight.sourceforge.net/

-- 
farsight packaging