[Pkg-cli-apps-commits] [SCM] smuxi branch, lenny-backports, updated. debian/0.8-1-24-g5a7164e

[Mirco Bauer]

The following commit has been merged in the lenny-backports branch:
commit 1f251ee7f3a36bf229032b702571867bdbf01176
Merge: 8e08df9ab6ecbedeceb8a8c59e00a45db4ec3d5e 7533a5bb8261e2028eb2ab0e78cb58e906077ee5
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Sep 12 23:40:02 2010 +0200

    Merge branch 'master-experimental' into lenny-backports
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/gbp.conf
    	debian/rules

diff --combined debian/changelog
index 43dbc20,379fa58..3e00bf1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,25 +1,37 @@@
 +smuxi (0.7.2.2-1~bpo50+1) lenny-backports; urgency=low
 +
 +  * Rebuild for lenny-backports.
 +  * debian/control:
 +    + Lowered versioned mono build-deps to >= 2.4.2.3, replaced mono-devel
 +      with mono-gmcs and removed compiler override.
 +    + Replaced all -cil-dev build-deps with -cil.
 +    + Added libmono-dev, libmono2.0-cil, libmono-cairo2.0-cil, and
 +      libmono-system-runtime2.0-cil to build-deps.
 +
 + -- Mirco Bauer <meebey at debian.org>  Wed, 28 Jul 2010 23:48: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
  
    * [37b22cb] Imported Upstream version 0.7.2.2
diff --combined debian/control
index 91c2fe4,fb12d40..3538fbf
--- a/debian/control
+++ b/debian/control
@@@ -4,19 -4,18 +4,15 @@@ Priority: optiona
  Maintainer: Mirco Bauer <meebey at debian.org>
  Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~)
  Build-Depends-Indep: cli-common-dev (>= 0.5.7),
-  mono-gmcs (>= 2.4.2.3),
-  mono-xbuild (>= 2.4.2.3),
-  libmono-dev (>= 2.4.2.3),
-  libmono2.0-cil,
-  libmono-cairo2.0-cil,
-  libmono-system-runtime2.0-cil,
-  libsmartirc4net0.4-cil (>= 0.4.5.1),
+  mono-devel (>= 2.6),
+  mono-xbuild (>= 2.6),
 - libnini-cil-dev (>= 1.1),
 - liblog4net-cil-dev,
 - libgtk2.0-cil-dev (>= 2.8),
 - libgnome2.0-cil-dev (>= 2.24),
 - libglade2.0-cil-dev (>= 2.8),
 - libglib2.0-cil-dev (>= 2.8),
 - libgnome-vfs2.0-cil-dev (>= 2.8),
 - libart2.0-cil-dev (>= 2.8),
 - libnotify-cil-dev,
 - libindicate0.1-cil-dev,
 + libnini1.1-cil (>= 1.1),
 + liblog4net1.2-cil,
 + libgtk2.0-cil (>= 2.8),
 + libgnome2.0-cil (>= 2.8),
 + libglade2.0-cil (>= 2.8),
 + libglib2.0-cil (>= 2.8),
++ libnotify0.4-cil,
   lsb-release,
   pkg-config,
   gettext,
diff --combined debian/gbp.conf
index 0332aae,231149e..16aa930
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -4,4 -4,5 +4,5 @@@ meta = Tru
  [git-import-orig]
  postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH
  [DEFAULT]
 -debian-branch = master-experimental
 +debian-branch = lenny-backports
+ upstream-branch = upstream-experimental
diff --combined debian/rules
index c7502a6,afd8267..41287a1
--- a/debian/rules
+++ b/debian/rules
@@@ -17,11 -17,14 +17,14 @@@ $(PATCH_LIST_FILE)
  	mv $(PATCH_LIST_FILE).new $(PATCH_LIST_FILE)
  
  override_dh_auto_configure: $(PATCH_LIST_FILE) patch
- 	dh_auto_configure -- --enable-engine-irc --enable-frontend-gnome
 -	dh_auto_configure -- --enable-engine-irc --enable-frontend-gnome --with-notify --with-indicate GMCS=/usr/bin/mono-csc MCS=/usr/bin/mono-csc
++	dh_auto_configure -- --enable-engine-irc --enable-frontend-gnome --with-notify
  
  # disable "make check"
  override_dh_auto_test:
  
+ # disable stripping debugging symbols
+ override_dh_clistrip:
+ 
  .DEFAULT:
  	dh --with-quilt $@
  

-- 
smuxi