[Pkg-cli-apps-commits] [SCM] smuxi branch, karmic-backports, updated. debian/0.7.2.2-1-7-g02140ed

[Mirco Bauer]

The following commit has been merged in the karmic-backports branch:
commit bb6219440eda416bb8acd176484ebcfab74530d3
Merge: 3c9ff56399d91f6114a862f189b958470965e514 8e6bf6b5e771e87639df24edec2478335ea498df
Author: Mirco Bauer <meebey at meebey.net>
Date:   Wed Jul 28 04:24:59 2010 +0200

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

diff --combined debian/changelog
index 7341572,41a5f09..12d8312
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,17 +1,28 @@@
 +smuxi (0.7.2.1-1~karmic+1) karmic; urgency=low
 +
 +  * Rebuild for karmic-ppa.
 +  * debian/control:
 +    + Lowered versioned mono build-deps to >= 2.4.2.3
 +    + Added libmono-dev, libmono2.0-cil, libmono-cairo2.0-cil, and
 +      libmono-system-runtime2.0-cil to build-deps.
 +    + Replaced all -cil-dev build-deps with -cil.
 +
 + -- Mirco Bauer <meebey at debian.org>  Sat, 24 Jul 2010 01:58:51 +0200
 +
+ smuxi (0.7.2.2-1) unstable; urgency=low
+ 
+   * [37b22cb] Imported Upstream version 0.7.2.2
+ 
+  -- Mirco Bauer <meebey at debian.org>  Wed, 28 Jul 2010 03:44:36 +0200
+ 
+ smuxi (0.7.2.1-2) unstable; urgency=low
+ 
+   * [732a021] Updated ubuntu_default_settings patch to cleanly apply
+     again
+   * [8d26689] Added git-dch settings
+ 
+  -- Mirco Bauer <meebey at debian.org>  Sat, 24 Jul 2010 11:38:01 +0200
+ 
  smuxi (0.7.2.1-1) unstable; urgency=low
  
    * New upstream (bugfix) release
diff --combined debian/gbp.conf
index 4ede529,106e572..04ea88c
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,2 -1,5 +1,7 @@@
+ [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 = karmic-backports

-- 
smuxi