[Pkg-cli-apps-commits] [SCM] smuxi branch, lucid-backports, updated. debian/0.8.11-1-44-gd9255d9

[Mirco Bauer]

The following commit has been merged in the lucid-backports branch:
commit 337ff5954cc0c71baeca97feba16b6b197483a89
Merge: a9bf8b4397f8e974d3cb80e9c80efabf93031b20 d806bea5f11df616e694a1b099a0db33dcdc8a38
Author: Mirco Bauer <meebey at meebey.net>
Date:   Thu Aug 23 00:11:09 2012 +0200

    Merge branch 'master-experimental' into lucid-backports
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/gbp.conf

diff --combined debian/changelog
index d754ac6,2b62f8e..c59976e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,31 +1,40 @@@
- smuxi (0.8.9.2-1~lucid+1) lucid; urgency=low
++smuxi (0.8.10.1-1~lucid+1) lucid; urgency=low
 +
 +  * debian/control:
 +    + Ensure libindicate4 it pulled in from the PPA
 +    + Added manual libindicate4 dependency as libindicate0.1-cil fails to
 +      depend on it.
 +
-  -- Mirco Bauer <meebey at debian.org>  Thu, 09 Feb 2012 22:34:25 +0100
++ -- Mirco Bauer <meebey at meebey.net>  Wed, 23 Aug 2012 00:08:39 +0200
++
+ smuxi (0.8.10.1-1) experimental; urgency=low
+ 
+   * [36aa88c] Imported Upstream version 0.8.10.1
+ 
+  -- Mirco Bauer <meebey at meebey.net>  Wed, 22 Aug 2012 22:06:00 +0200
+ 
+ smuxi (0.8.10-2) experimental; urgency=low
+ 
+   * [1062503] Bumped Standards-Version to 3.9.3 (no changes needed)
+   * [b263954] Added libgtkspell-dev to build-deps and enabled GTK+ spell
+               checking
+ 
+  -- Mirco Bauer <meebey at debian.org>  Wed, 22 Aug 2012 21:21:15 +0200
+ 
+ smuxi (0.8.10-1) unstable; urgency=low
+ 
+   * [7c31cd4] Imported Upstream version 0.8.10
+   * [99fe788] Dropped fix_messaging_menu_detection.patch, as already applied
+               upstream
+   * [e5c1027] Refreshed patches
+ 
+  -- Mirco Bauer <meebey at debian.org>  Sat, 30 Jun 2012 17:00:17 +0200
+ 
+ smuxi (0.8.9.2-2) unstable; urgency=high
+ 
+   * [7a6ba6b] Fixed messaging menu detection
+ 
+  -- Mirco Bauer <meebey at debian.org>  Thu, 22 Mar 2012 22:37:30 +0100
  
  smuxi (0.8.9.2-1) unstable; urgency=low
  
diff --combined debian/control
index c088351,8af0bdb..e1e7e31
--- a/debian/control
+++ b/debian/control
@@@ -16,8 -16,9 +16,9 @@@ Build-Depends-Indep: cli-common-dev (>
   libart2.0-cil-dev (>= 2.8),
   libnotify-cil-dev,
   libindicate0.1-cil-dev,
+  libgtkspell-dev (>= 2.0.9),
 - libdbus1.0-cil-dev,
 - libdbus-glib1.0-cil-dev,
 + libdbus1.0-cil-dev | libndesk-dbus1.0-cil-dev,
 + libdbus-glib1.0-cil-dev | libndesk-dbus-glib1.0-cil-dev,
   libstfl-dev (>= 0.21),
   lsb-release,
   pkg-config,
@@@ -27,7 -28,7 +28,7 @@@
   autoconf,
   automake,
   autotools-dev
- Standards-Version: 3.8.3
+ Standards-Version: 3.9.3
  Homepage: http://www.smuxi.org/
  Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/smuxi.git
  Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/smuxi.git
@@@ -210,8 -211,7 +211,7 @@@ Depends: ${shlibs:Depends}
           ${cli:Depends},
           smuxi-engine (= ${source:Version}),
           smuxi-frontend (= ${source:Version}),
-          librsvg2-common,
-          libindicate4 (>= 0.4.1)
+          librsvg2-common
  Description: GNOME frontend for Smuxi
   Smuxi is an irssi-inspired, flexible, user-friendly and cross-platform IRC
   client for sophisticated users, targeting the GNOME desktop.
diff --combined debian/gbp.conf
index 7ee8763,231149e..67da58c
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,10 -1,8 +1,8 @@@
- [DEFAULT]
- debian-branch = lucid-backports
  [git-dch]
  id-length = 7
  meta = True
  [git-import-orig]
  postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH
  [DEFAULT]
 -debian-branch = master-experimental
 +debian-branch = lucid-backports
- upstream-branch = upstream
+ upstream-branch = upstream-experimental

-- 
smuxi