[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 31d92eb1d24506b4b43ea7bc281dd1ec946c09e1
Merge: 966a84a764753fa50a58ff0c0fa12d6d80663002 23e7a74c610d72952f72b0683a4ad68c764d6640
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Jul 24 01:58:47 2010 +0200

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

diff --combined debian/changelog
index 2c7e081,0fc98d1..3ef7eaf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,23 +1,34 @@@
 +smuxi (0.7.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>  Wed, 03 Feb 2010 03:12:19 +0100
 +
+ smuxi (0.7.2.1-1) unstable; urgency=low
+ 
+   * New upstream (bugfix) release
+ 
+  -- Mirco Bauer <meebey at debian.org>  Sat, 24 Jul 2010 01:09:27 +0200
+ 
+ smuxi (0.7.2-1) unstable; urgency=low
+ 
+   * New upstream release:
+     + Portuguese translation (closes: #569907)
+     + Czech translation (closes: #589628, #589144, #589627)
+     + Danish translation (closes: #589286)
+   * debian/control:
+     + Updated Vcs-* fields for the new git repository.
+   * debian/rules:
+     + Fixed debian/series file patcher.
+     + Disabled "make check" as gettext fails on sources in .pc/ from quilt.
+ 
+  -- Mirco Bauer <meebey at debian.org>  Fri, 23 Jul 2010 00:55:32 +0200
+ 
  smuxi (0.7.1-1) unstable; urgency=medium
  
    * New upstream (bugfix) release.
diff --combined debian/control
index 93734ae,8c9999d..1ea8794
--- a/debian/control
+++ b/debian/control
@@@ -4,19 -4,17 +4,19 @@@ 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-devel (>= 2.4.3),
 - mono-xbuild (>= 2.4.3),
 - libsmartirc4net-cil-dev (>= 0.4.5.1),
 - 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),
 + mono-devel (>= 2.4.2.3),
 + mono-xbuild (>= 2.4.2.3),
 + libmono-dev (>= 2.0),
 + libmono2.0-cil,
 + libmono-cairo2.0-cil,
 + libmono-system-runtime2.0-cil,
 + libsmartirc4net0.4-cil (>= 0.4.5.1),
 + libnini1.1-cil (>= 1.1),
 + liblog4net1.2-cil,
 + libgtk2.0-cil (>= 2.8),
 + libgnome2.24-cil (>= 2.24),
 + libglade2.0-cil (>= 2.8),
 + libglib2.0-cil (>= 2.8),
   lsb-release,
   pkg-config,
   gettext,
@@@ -27,8 -25,8 +27,8 @@@
   autotools-dev
  Standards-Version: 3.8.3
  Homepage: http://www.smuxi.org/
- Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/smuxi/trunk
- Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/smuxi/trunk/
+ Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/smuxi.git
+ Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/smuxi.git
  
  Package: smuxi
  Architecture: all

-- 
smuxi