[Pkg-telepathy-commits] [SCM] telepathy-stream-engine packaging branch, debian, updated. 1b09abcd55532bed86c74e5c04f17ca4fd70aa32

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 0c9d865014dd43b2bee0c078e6c96b9d7e471ed2
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Dec 26 17:39: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..2b7a68b
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,54 @@
+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-stream-engine.git
+    cd telepathy-stream-engine
+    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-stream-engine.git
+    cd telepathy-stream-engine
+    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.
+Current telepathy-stream-engine versions are no longer suitable for
+distribution in Debian (s-e is increasingly Maemo-specific) so new upstream
+versions probably shouldn't be uploaded.
+
+The branch 'debian-patches' is 0.5.3 plus any patches needed for Debian.
+
+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-stream-engine.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 0bc3e8e..4f6a359 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 telepathy-stream-engine (0.5.3-2) UNRELEASED; urgency=low
 
   * Switch packaging to git
+  * Standards-Version: 3.8.0 (add README.source)
 
  -- Simon McVittie <smcv at debian.org>  Fri, 26 Dec 2008 17:33:05 +0000
 
diff --git a/debian/control b/debian/control
index ac9a5dd..b693729 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Section: net
 Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers at lists.alioth.debian.org>
 Uploaders: Dafydd Harries <daf at debian.org>, Riccardo Setti <giskard at debian.org>, Simon McVittie <smcv at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Laurent Bigonville <bigon at bigon.be>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Build-Depends: debhelper (>= 5), cdbs, libtelepathy-glib-dev (>= 0.7.6), libfarsight0.1-dev (>= 0.1.27), libgstreamer-plugins-base0.10-dev, libx11-dev, zlib1g-dev, xsltproc, python
 Vcs-Git: git://git.debian.org/git/pkg-telepathy/telepathy-stream-engine.git
 Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-stream-engine.git

-- 
telepathy-stream-engine packaging