[Pkg-cli-apps-commits] [SCM] smuxi branch, lucid-backports, updated. debian/0.7.2.1-2.lucid+1-5-g99cdee5

[Mirco Bauer]

The following commit has been merged in the lucid-backports branch:
commit ef3e5a488ca795981c8912f5b49a2c4001b58163
Merge: 238874da0c62bf2a0f2872b2b87648ae59059638 a8b64d60beea7659df211666dcfc2120f1e454f7
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Jul 24 11:41:15 2010 +0200

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

diff --combined debian/changelog
index 2aa95f0,80cae1a..56be5d0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
 +smuxi (0.7.2.1-1~lucid+1) lucid; urgency=low
 +
 +  * Rebuild for lucid-ppa.
 +
 + -- Mirco Bauer <meebey at debian.org>  Sat, 24 Jul 2010 02:37:47 +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 e1bb2ee,106e572..bf7bf9c
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,2 -1,5 +1,7 @@@
 +[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

-- 
smuxi