[Pkg-cli-apps-commits] [SCM] bansheelyricsplugin branch, ppa/jaunty, updated. debian/0.7-1-23-g154940d

[Chow Loong Jin]

The following commit has been merged in the ppa/jaunty branch:
commit fe913f46e31abbc8bc3800155415a7e307d9e0f2
Merge: 623c1ae990861f9b777c42bfb77a571d83a6a584 752f36679cb97152b22ade0850624772e5907764
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Tue Jan 12 02:09:44 2010 +0800

    Merge branch 'ppa/karmic' into ppa/jaunty
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index 852af26,e8f50fa..734f379
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,28 +1,36 @@@
- bansheelyricsplugin (0.7-0ubuntu1~hyper1~jaunty1) jaunty; urgency=low
++bansheelyricsplugin (0.8-1~hyper1+jaunty) 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
++ -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 12 Jan 2010 02:08:19 +0800
 +
- bansheelyricsplugin (0.7-0ubuntu1~hyper1) karmic; urgency=low
+ bansheelyricsplugin (0.8-1~hyper1+karmic) karmic; urgency=low
+ 
+   * debian/control:
+     + Revert -cil-dev transition
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 12 Jan 2010 01:53:17 +0800
+ 
+ bansheelyricsplugin (0.8-1) UNRELEASED; urgency=low
+ 
+   [ Chow Loong Jin ]
+   * New upstream release
+   * debian/control:
+     + Replace libgtkhtml3.14-cil-dev with libwebkit1.0-cil-dev as per upstream
+       change
+     + Update my e-mail address
+   * debian/rules:
+     + Use mono-csc instead of csc for MCS (Closes: #562266)
+ 
+   [ Iain Lane ]
+   * debian/control: Update build-deps to use new gnome# and gnome-desktop#
+     -dev packages.
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 12 Jan 2010 01:30:38 +0800
+ 
+ bansheelyricsplugin (0.7-1) unstable; urgency=low
  
    * New Upstream Version
    * debian/control:
@@@ -17,7 -33,8 +41,8 @@@
        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
+     + Drop automake, autoconf, and libtool build-depends, relax pkg-config
+       build-depends
    * debian/rules:
      + Use debhelper minimal rule style
      + Fix get-orig-source
@@@ -26,13 -43,6 +51,13 @@@
  
   -- Chow Loong Jin <hyperair at gmail.com>  Thu, 04 Jun 2009 21:10:40 +0800
  
 +bansheelyricsplugin (0.6-2~hyper1+jaunty1) jaunty; urgency=low
 +
 +  * Upload to PPA
 +  * GNOME# 2.24 change
 +
 + -- Chow Loong Jin <hyperair at gmail.com>  Thu, 19 Mar 2009 07:43:21 +0800
 +
  bansheelyricsplugin (0.6-2) unstable; urgency=low
  
    * Upload to unstable.
diff --combined debian/control
index 521d2b0,d01ac6b..68422af
--- a/debian/control
+++ b/debian/control
@@@ -2,15 -2,15 +2,15 @@@ Source: bansheelyricsplugi
  Section: sound
  Priority: optional
  Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
- Uploaders: Chow Loong Jin <hyperair at gmail.com>, Sebastian Dröge <slomo at debian.org>
+ Uploaders: Chow Loong Jin <hyperair at ubuntu.com>, Sebastian Dröge <slomo at debian.org>
  Build-Depends: debhelper (>= 7.0.50),
                 cli-common-dev (>= 0.5.7),
                 pkg-config (>= 0.9.0),
                 mono-devel (>= 2.0.1),
                 banshee (>= 0.98),
-                libgtkhtml3.16-cil,
+                libwebkit1.0-cil,
 -               libgconf2.0-cil
 +               libgconf2.24-cil
- Standards-Version: 3.8.1
+ Standards-Version: 3.8.3
  Homepage: http://bansheelyricsplugin.googlecode.com
  Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/bansheelyricsplugin.git
  Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/bansheelyricsplugin.git
@@@ -30,4 -30,3 +30,3 @@@ Description: Lyrics extension for Bansh
   .
   Banshee is a media management and playback application for the GNOME
   desktop
- 
diff --combined debian/gbp.conf
index 0000000,90e4498..c40cb48
mode 000000,100644..100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,0 -1,2 +1,2 @@@
+ [DEFAULT]
 -debian-branch = ppa/karmic
++debian-branch = ppa/jaunty

-- 
bansheelyricsplugin