[Pkg-cli-apps-commits] [SCM] bansheelyricsplugin branch, ppa/jaunty, updated. ppa/0.8-1.hyper1+jaunty-5-gf785f15

[Chow Loong Jin]

The following commit has been merged in the ppa/jaunty branch:
commit f785f15f3649fe2a8e5e842a913f615327caaa6b
Merge: 154940de5417b1dc2cc48b7cf72eb5f22446de86 4e0e73bd9b7e5bb5a7e743ad987272ca1d16abdd
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Sun Jan 17 01:12:41 2010 +0800

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

diff --combined debian/changelog
index d72f28c,a06bfe9..0d6842a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,11 +1,22 @@@
- bansheelyricsplugin (0.8-1~hyper1+jaunty) jaunty; urgency=low
++bansheelyricsplugin (0.8.1-1~hyper1+jaunty) jaunty; urgency=low
 +
 +  * Merge from Karmic, remaining changes:
 +    + debian/control:
 +      - GConf# 2.24 bad ABI bump
 +    + debian/rules:
 +      - Use csc rather than mono-csc (mono-devel 2.4.2.3 required for this)
 +      - Lower mono-devel version requirement to 2.0.1
 +
-  -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 12 Jan 2010 02:16:28 +0800
++ -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 17 Jan 2010 01:12:35 +0800
 +
- bansheelyricsplugin (0.8-1~hyper1+karmic) karmic; urgency=low
+ bansheelyricsplugin (0.8.1-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
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 17 Jan 2010 00:51:23 +0800
  
- bansheelyricsplugin (0.8-1) UNRELEASED; urgency=low
+ bansheelyricsplugin (0.8.1-1) UNRELEASED; urgency=low
  
    [ Chow Loong Jin ]
    * New upstream release
@@@ -32,7 -21,7 +32,7 @@@
    * 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 02:22:06 +0800
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 17 Jan 2010 00:46:59 +0800
  
  bansheelyricsplugin (0.7-1) unstable; urgency=low
  
@@@ -55,13 -44,6 +55,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.

-- 
bansheelyricsplugin