[Pkg-cli-apps-commits] [SCM] bansheelyricsplugin branch, ppa/intrepid, updated. upstream/0.6-24-g182d44e

[Chow Loong Jin]

The following commit has been merged in the ppa/intrepid branch:
commit 182d44ef78a30ad289badd849d4eed3f87dafa49
Merge: 46d4c35b867c9c5853581ae4e6415c2206ff114b 623c1ae990861f9b777c42bfb77a571d83a6a584
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Thu Jun 4 21:14:41 2009 +0800

    Merge branch 'ppa/jaunty' into ppa/intrepid
    
    Conflicts:
    	debian/control

diff --combined debian/changelog
index 0b658a9,852af26..4a6d3a7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -17,78 -17,15 +17,79 @@@ bansheelyricsplugin (0.7-0ubuntu1~hyper
        anyway.
      + Use DH7.0.50
      + Use banshee >= 0.98, as per configure.ac
+     + Drop automake, autoconf, and libtool build-depends, relax pkg-config build-depends
    * debian/rules:
      + Use debhelper minimal rule style
      + Fix get-orig-source
    * debian/watch:
      + Updated to track new url as well
  
-  -- Chow Loong Jin <hyperair at gmail.com>  Thu, 04 Jun 2009 20:45:16 +0800
+  -- Chow Loong Jin <hyperair at gmail.com>  Thu, 04 Jun 2009 21:10:40 +0800
  
 +bansheelyricsplugin (0.7-0ubuntu1~hyper1~intrepid1) intrepid; urgency=low
 +
 +  * Merge from Jaunty, remaining changes:
 +    + debian/control, debian/rules:
 +      - Revert GNOME# 2.24 transition
 +      - Revert Mono 2.0 transition
 +
 + -- Chow Loong Jin <hyperair at gmail.com>  Thu, 04 Jun 2009 20:59:38 +0800
 +
 +bansheelyricsplugin (0.7-0ubuntu1~hyper1~jaunty1) jaunty; urgency=low
 +
 +  * Merge from Karmic, remaining changes:
 +    + debian/control:
 +      - GConf# 2.24 bad ABI bump
 +
 + -- Chow Loong Jin <hyperair at gmail.com>  Thu, 04 Jun 2009 20:49:28 +0800
 +
 +bansheelyricsplugin (0.7-0ubuntu1~hyper1) karmic; urgency=low
 +
 +  * New Upstream Version
 +  * debian/control:
 +    + Changed Vcs-* fields to git addresses
 +    + Bump Standards-Version
 +    + Fix grammatical error "an media" to "a media"
 +    + Combined Build-Depends-Indep into Build-Depends; there is only one package
 +      anyway.
 +    + Use DH7.0.50
 +    + Use banshee >= 0.98, as per configure.ac
 +  * debian/rules:
 +    + Use debhelper minimal rule style
 +    + Fix get-orig-source
 +  * debian/watch:
 +    + Updated to track new url as well
 +
 + -- Chow Loong Jin <hyperair at gmail.com>  Thu, 04 Jun 2009 20:45:16 +0800
 +
 +bansheelyricsplugin (0.6-2~hyper1+intrepid2) intrepid; urgency=low
 +
 +  * debian/rules:
 +    + Remove MCS=/usr/bin/csc line
 +
 + -- Chow Loong Jin <hyperair at gmail.com>  Tue, 24 Mar 2009 01:25:31 +0800
 +
 +bansheelyricsplugin (0.6-2~hyper1+intrepid1) intrepid; urgency=low
 +
 +  * Revert GNOME# 2.24 change
 +  * Revert Mono 2.0 transition
 +
 + -- Chow Loong Jin <hyperair at gmail.com>  Thu, 19 Mar 2009 17:38:52 +0800
 +
 +bansheelyricsplugin (0.6-2~hyper1+intrepid2) intrepid; urgency=low
 +
 +  * debian/rules:
 +    + Remove MCS=/usr/bin/csc line
 +
 + -- Chow Loong Jin <hyperair at gmail.com>  Tue, 24 Mar 2009 01:25:31 +0800
 +
 +bansheelyricsplugin (0.6-2~hyper1+intrepid1) intrepid; urgency=low
 +
 +  * Revert GNOME# 2.24 change
 +  * Revert Mono 2.0 transition
 +
 + -- Chow Loong Jin <hyperair at gmail.com>  Thu, 19 Mar 2009 17:38:52 +0800
 +
  bansheelyricsplugin (0.6-2~hyper1+jaunty1) jaunty; urgency=low
  
    * Upload to PPA
diff --combined debian/control
index 0a20c56,521d2b0..14bb381
--- a/debian/control
+++ b/debian/control
@@@ -5,14 -5,11 +5,11 @@@ Maintainer: Debian CLI Applications Tea
  Uploaders: Chow Loong Jin <hyperair at gmail.com>, Sebastian Dröge <slomo at debian.org>
  Build-Depends: debhelper (>= 7.0.50),
                 cli-common-dev (>= 0.5.7),
-                automake (>= 1.9),
-                autoconf (>= 2.53),
-                libtool,
-                pkg-config (>= 0.14.0),
+                pkg-config (>= 0.9.0),
 -               mono-devel (>= 2.0.1),
 +               mono-gmcs | c-sharp-2.0-compiler,
                 banshee (>= 0.98),
                 libgtkhtml3.16-cil,
 -               libgconf2.24-cil
 +               libgconf2.0-cil
  Standards-Version: 3.8.1
  Homepage: http://bansheelyricsplugin.googlecode.com
  Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/bansheelyricsplugin.git

-- 
bansheelyricsplugin