[Pkg-cli-apps-commits] [SCM] smuxi branch, oneiric-backports, updated. debian/0.8.9.2-1_oneiric+1

[Mirco Bauer]

The following commit has been merged in the oneiric-backports branch:
commit 58f45bfaf814545a2ec5bc41e0857910c7664439
Merge: 3dd237996e4a8e1ce64d4b71f50dfbc4c3383f2a 40f87f447827020a11390fc9ddb2071e9f0bff99
Author: Mirco Bauer <meebey at meebey.net>
Date:   Thu Feb 9 22:18:14 2012 +0100

    Merge branch 'master' into oneiric-backports
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 029f5ca,a3646c0..4e9287e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,19 +1,27 @@@
 +smuxi (0.8.9.1-3~oneiric+3) oneiric; urgency=low
 +
 +  * Rebuild for oneiric-ppa.
 +  * Added libstfl0 to build-deps as libstfl-dev does not depend on it while it
 +    should
 +
 + -- Mirco Bauer <meebey at debian.org>  Sat, 07 Jan 2012 11:23:54 +0100
 +
+ smuxi (0.8.9.2-1) unstable; urgency=low
+ 
+   * [5e91a5f] Imported Upstream version 0.8.9.2
+               + Includes updated Portuguese translations
+                 (closes: #596024, #655629, #655631, #655633, #655634, #655638)
+   * [0536705] Dropped debian/patches/fix_smuxi-frontend-stfl_dllmap.patch as
+               already applied upstream
+ 
+  -- Mirco Bauer <meebey at debian.org>  Mon, 06 Feb 2012 20:57:35 +0100
+ 
+ smuxi (0.8.9.1-4) unstable; urgency=low
+ 
+   * [e0c61ee] Removed deprecated cli.make include to be DH8 forward compatible
+ 
+  -- Mirco Bauer <meebey at debian.org>  Sun, 22 Jan 2012 00:41:27 +0100
+ 
  smuxi (0.8.9.1-3) unstable; urgency=low
  
    * [7cd3a08] Ignore secur32(.dll) ModuleRef for dh_clideps

-- 
smuxi