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

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit dc04d3abf4280aaa7c62174abe6a98600c3f3d44
Author: Ken VanDine <ken.vandine at canonical.com>
Date:   Wed Apr 4 16:53:59 2012 +0100

    New upstream release.
    
    * New upstream release.
      - Correctly convert between Telepathy and Jingle candidate types
      - Start sending automatically on accepting bidirectional calls.
    * debian/control
      - bump build depends for libtelepathy-glib-dev to >= 0.18.0
    * debian/rules
      - no longer strip -Bsymbolic-function from LDFLAGS, bug has been fixed
        upstream
    * Merge with Debian experimental. Remaining Ubuntu changes:
      - debian/telepathy-gabble.install: Install telepathy-gabble-xmpp-console.
    * debian/rules
      - strip -Bsymbolic-function from LDFLAGS, causes a crash on
        start https://bugs.freedesktop.org/show_bug.cgi?id=46417
    * Merge with Debian experimental. Remaining Ubuntu changes:
      - debian/telepathy-gabble.install: Install telepathy-gabble-xmpp-console.

diff --git a/debian/changelog b/debian/changelog
index 4a2ba65..31bedd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+telepathy-gabble (0.16.0-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+    - Correctly convert between Telepathy and Jingle candidate types
+    - Start sending automatically on accepting bidirectional calls.
+  * debian/control
+    - bump build depends for libtelepathy-glib-dev to >= 0.18.0
+  * debian/rules
+    - no longer strip -Bsymbolic-function from LDFLAGS, bug has been fixed 
+      upstream
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Tue, 03 Apr 2012 11:54:00 -0400
+
+telepathy-gabble (0.15.4-1ubuntu1) precise; urgency=low
+
+  * Merge with Debian experimental. Remaining Ubuntu changes:
+    - debian/telepathy-gabble.install: Install telepathy-gabble-xmpp-console.
+  * debian/rules
+    - strip -Bsymbolic-function from LDFLAGS, causes a crash on 
+      start https://bugs.freedesktop.org/show_bug.cgi?id=46417
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Mon, 05 Mar 2012 16:51:45 -0500
+
 telepathy-gabble (0.15.4-1) experimental; urgency=low
 
   * New upstream release
@@ -8,6 +31,13 @@ telepathy-gabble (0.15.4-1) experimental; urgency=low
 
  -- Simon McVittie <smcv at debian.org>  Tue, 21 Feb 2012 21:38:52 +0000
 
+telepathy-gabble (0.15.3-1ubuntu1) precise; urgency=low
+
+  * Merge with Debian experimental. Remaining Ubuntu changes:
+    - debian/telepathy-gabble.install: Install telepathy-gabble-xmpp-console.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Wed, 08 Feb 2012 09:32:43 +0100
+
 telepathy-gabble (0.15.3-1) experimental; urgency=low
 
   * Merge from unstable
diff --git a/debian/control b/debian/control
index 549a0f6..5667a4c 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: autotools-dev (>= 20100122.1~),
                libgnutls-dev (>= 2.8.2),
                libsasl2-dev,
                libsoup2.4-dev,
-               libtelepathy-glib-dev (>= 0.17.5),
+               libtelepathy-glib-dev (>= 0.18.0),
                python,
                xsltproc,
                libsqlite3-dev,
diff --git a/debian/telepathy-gabble.install b/debian/telepathy-gabble.install
index 8fd91e2..58a535e 100644
--- a/debian/telepathy-gabble.install
+++ b/debian/telepathy-gabble.install
@@ -1,6 +1,6 @@
 debian/tmp/usr/lib/telepathy/telepathy-gabble
-debian/tmp/usr/lib/telepathy/gabble-0/*.so
-debian/tmp/usr/lib/libgabble-plugins.so
+debian/tmp/usr/lib/telepathy/gabble-0/lib/*.so
+debian/tmp/usr/lib/telepathy/gabble-0/plugins/*.so
 debian/tmp/usr/share/man
 debian/tmp/usr/share/dbus-1
 debian/tmp/usr/share/telepathy

-- 
telepathy-gabble packaging