[Pkg-cli-apps-commits] [SCM] smuxi branch, precise-backports, updated. debian/0.8.11-1-25-g899025f

[Mirco Bauer]

The following commit has been merged in the precise-backports branch:
commit 06268b8e5efcb13346e22c0d5efa9e27e62d4175
Merge: 40f9d66f80ce9c5c9ff98b4f3934d83845446126 d806bea5f11df616e694a1b099a0db33dcdc8a38
Author: Mirco Bauer <meebey at meebey.net>
Date:   Wed Aug 22 23:21:04 2012 +0200

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

diff --combined debian/changelog
index eabe7a7,2b62f8e..d684c2f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,31 +1,37 @@@
- smuxi (0.8.9.2-1~precise+1) precise; urgency=low
++smuxi (0.8.10.1-1~precise+1) precise; urgency=low
 +
 +  * Rebuild for precise-ppa.
 +
-  -- Mirco Bauer <meebey at debian.org>  Wed, 08 Feb 2012 21:00:52 +0100
++ -- Mirco Bauer <meebey at meebey.net>  Wed, 22 Aug 2012 23:19:00 +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/gbp.conf
index dab5925,231149e..d4f3285
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -4,5 -4,5 +4,5 @@@ meta = Tru
  [git-import-orig]
  postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH
  [DEFAULT]
 -debian-branch = master-experimental
 +debian-branch = precise-backports
- upstream-branch = upstream
+ upstream-branch = upstream-experimental

-- 
smuxi