[Pkg-telepathy-commits] [SCM] libtelepathy packaging branch, debian, updated. 7e783b0d9f411ac9d3b349b7718117b8eabc3e56

[Simon McVittie]

The following commit has been merged in the debian branch:
commit d4cb0f342c5a6740c861fa6c7e7e33d36187c7f5
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Dec 26 16:22:09 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..a53da5f
--- /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/libtelepathy.git
+    cd libtelepathy
+    git checkout debian
+    git-buildpackage -us -uc
+
+or for testing/stable branches like debian-lenny:
+
+    git clone git://git.debian.org/git/pkg-telepathy/libtelepathy.git
+    cd libtelepathy
+    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 ~/libtelepathy-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/old/libtelepathy.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 2006a9c..2c74a5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libtelepathy (0.3.2-2) UNRELEASED; urgency=low
   * Use my and Laurent's debian.org addresses in Uploaders
   * Move packaging to git
   * Add gbp.conf and `debian/rules update-patches` target for maintainers
+  * Standards-Version: 3.8.0 (add README.source)
 
  -- Simon McVittie <smcv at debian.org>  Sun, 27 Apr 2008 13:24:31 +0100
 
diff --git a/debian/control b/debian/control
index 5385600..6287a52 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: cdbs,
                libdbus-1-dev (>= 0.93),
                python,
                xsltproc
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-telepathy/libtelepathy.git
 Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/libtelepathy.git
 Homepage: http://telepathy.freedesktop.org/wiki/

-- 
libtelepathy packaging