[Pkg-telepathy-commits] [SCM] telepathy-gabble packaging branch, debian-experimental, updated. debian/0.10.0-1

Simon McVittie smcv at debian.org
Mon Oct 18 14:05:00 UTC 2010


The following commit has been merged in the debian-experimental branch:
commit 021f46f8438827b7fcbfeb9cc99c9638b13f146b
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Sep 16 14:16:50 2010 +0100

    New upstream stable release

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 06b7ee5..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,59 +0,0 @@
-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-gabble
-    cd telepathy-gabble
-    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-gabble
-    cd telepathy-gabble
-    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 ~/telepathy-gabble-0.7.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/telepathy-gabble.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 cd4768f..903d9df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+telepathy-gabble (0.10.0-1) experimental; urgency=low
+
+  * New upstream stable release
+    - increase build-dependencies on GLib and telepathy-glib
+  * Remove debian/README.source - since moving to 3.0 (quilt) format, there's
+    nothing interesting to say in it
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 16 Sep 2010 14:12:04 +0100
+
 telepathy-gabble (0.9.18-2) experimental; urgency=low
 
   * Add Breaks for Mission Control older than 5.5, since interactive TLS
diff --git a/debian/control b/debian/control
index f5ed2d9..5e14a0d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,11 +12,11 @@ Build-Depends: autotools-dev (>= 20100122.1~),
                gnutls-bin,
                libdbus-1-dev (>= 1.1.0),
                libdbus-glib-1-dev (>= 0.82),
-               libglib2.0-dev (>= 2.21),
+               libglib2.0-dev (>= 2.24),
                libgnutls-dev (>= 2.8.2),
                libsasl2-dev,
                libsoup2.4-dev,
-               libtelepathy-glib-dev (>= 0.11.14),
+               libtelepathy-glib-dev (>= 0.11.16),
                python,
                xsltproc,
                uuid-dev,

-- 
telepathy-gabble packaging



More information about the Pkg-telepathy-commits mailing list