[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 a3d6461d97b337c9ba63182a282a77af61835f32
Merge: 337ff5954cc0c71baeca97feba16b6b197483a89 4d98087b906585e1ea699d3cfda5b5378007631d
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Jun 1 15:13:52 2013 +0200

    Merge branch 'master' into lucid-backports
    
    Conflicts:
    	Makefile.am
    	Makefile.in
    	configure
    	configure.ac
    	debian/changelog
    	debian/control
    	src/AssemblyVersion.cs
    	src/Common/Defines.cs

diff --combined debian/changelog
index c59976e,bea1c78..21dab15
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,31 +1,40 @@@
- smuxi (0.8.10.1-1~lucid+1) lucid; urgency=low
++smuxi (0.8.11-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 meebey.net>  Wed, 23 Aug 2012 00:08:39 +0200
 +
- smuxi (0.8.10.1-1) experimental; urgency=low
+ smuxi (0.8.11-1) unstable; urgency=low
  
-   * [36aa88c] Imported Upstream version 0.8.10.1
+   * [22d13d5] Imported Upstream version 0.8.11
+   * [6d2b95a] Refreshed patches
+   * [89eb66e] Added ServiceStack libraries to smuxi-engine package
+   * [848ab10] Enable Campfire engine
+   * [c6dbdc7] Always build db4o for predictable build result
+   * [13ec489] Exclude OS X specific libraries from dh_clideps
  
-  -- Mirco Bauer <meebey at meebey.net>  Wed, 22 Aug 2012 22:06:00 +0200
+  -- Mirco Bauer <meebey at debian.org>  Sat, 25 May 2013 22:11:31 +0200
+ 
+ smuxi (0.8.10.2-1) unstable; urgency=low
+ 
+   * [a014cb4] Imported Upstream version 0.8.10.2
+   * [9336733] Merged smuxi-server, smuxi-engine-irc, smuxi-engine-twitter,
+               smuxi-engine-xmpp, and smuxi-frontend-gnome-irc into smuxi-engine
+               and smuxi-frontend-gnome
+   * [61dd9f0] Refreshed patches
+   * [304f2b2] Bumped Standards-Version to 3.9.4 (no changes needed)
+   * [106f749] Merged smuxi-frontend package into smuxi-engine
+ 
+  -- Mirco Bauer <meebey at debian.org>  Wed, 15 May 2013 21:25:27 +0200
+ 
+ smuxi (0.8.10-3) unstable; urgency=low
+ 
+   * [d1b3dd5] Revert "Bumped Standards-Version to 3.9.3 (no changes needed)"
+ 
+  -- Mirco Bauer <meebey at debian.org>  Sun, 23 Sep 2012 22:14:15 +0200
  
  smuxi (0.8.10-2) experimental; urgency=low
  

-- 
smuxi