[Pkg-cli-apps-commits] [SCM] smuxi branch, lucid-backports, updated. debian/0.8-1-9-gf4aff82

[Mirco Bauer]

The following commit has been merged in the lucid-backports branch:
commit bd3592fde3e1b6846b89167e31a1eb7b7644b683
Merge: 99cdee52598439dc15b2ccebb42dd863cf83cf0d 7533a5bb8261e2028eb2ab0e78cb58e906077ee5
Author: Mirco Bauer <meebey at meebey.net>
Date:   Mon Sep 6 01:56:22 2010 +0200

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

diff --combined debian/changelog
index bf09b34,379fa58..e7c051d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,24 +1,30 @@@
- smuxi (0.7.2.2-1~lucid+1) lucid; urgency=low
++smuxi (0.8~lucid+1) lucid; urgency=low
 +
 +  * Rebuild for lucid-ppa.
 +
-  -- Mirco Bauer <meebey at debian.org>  Wed, 28 Jul 2010 04:37:39 +0200
++ -- Mirco Bauer <meebey at debian.org>  Mon, 06 Sep 2010 01:56:02 +0200
++
+ smuxi (0.8-1) experimental; urgency=low
+ 
+   * [32e8727] Added missing translation files
+   * [91e97c6] Added git-buildpackage settings for master/upstream-
+     experimental branches
+   * [fec647a] Imported Upstream version 0.8
+   * [f88a2d5] Dropped libsmartirc4net-cil-dev from build-deps and added
+     libnotify-cil-dev and libindicate0.1-cil-dev
+   * [ea6c02c] Enabled notifications and messaging menu support
+   * [d18aa8e] Updated ubuntu_default_settings.patch for Smuxi 0.8
+   * [54163bb] Bumped Mono build-dep to >= 2.6 as it is needed for the
+     Twitter support
+   * [970d7c0] Added Twitterizer2 and Newtonsoft.Json library to smuxi-
+     engine-twitter package
+   * [bb755ba] Updated Twitterizer and added Newtonsoft.Json copyright
+     information
+   * [0e9b3ef] Added Meebey.SmartIrc4net library to smuxi-engine-irc
+     package
+   * [9910304] Disabled stripping debug symbols
+ 
+  -- Mirco Bauer <meebey at debian.org>  Fri, 03 Sep 2010 00:15:31 +0200
  
  smuxi (0.7.2.2-1) unstable; urgency=low
  
diff --combined debian/gbp.conf
index bf7bf9c,231149e..1762d90
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,7 -1,8 +1,10 @@@
 +[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
+ [DEFAULT]
+ debian-branch = master-experimental
+ upstream-branch = upstream-experimental

-- 
smuxi