[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/unstable/karmic, updated. ppa/1.9.5-1ubuntu1_hyper1+karmic-9-gdbedcc0

Chow Loong Jin hyperair at ubuntu.com
Sun Mar 13 12:13:23 UTC 2011


The following commit has been merged in the ppa/unstable/karmic branch:
commit a40ce2fe91e9089f793e52e8da9361eef7abc85b
Merge: 72e8f0b88435f64a43a62314721b73418ea52207 75e6b1c516fedf36ed010300eda3c687b87ac4e7
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sun Mar 13 20:10:13 2011 +0800

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

diff --combined debian/changelog
index 156f7f6,b7b0a36..816c5a4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,27 +1,45 @@@
+ banshee (1.9.5-1ubuntu1~hyper1+lucid1) lucid; urgency=low
+ 
+   * Merge from Maverick, remaining changes
+     + [aed3a69] Disable soundmenu extension from building
+     + [a24ddc3] Drop soundmenu related patches
+     + [9d0f757] Drop libgtk2.0-dev >= 2.22 dependency
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 13 Mar 2011 20:01:55 +0800
+ 
+ banshee (1.9.5-1ubuntu1~hyper1+maverick1) maverick; urgency=low
+ 
+   * Merge from Natty, remaining changes:
+     - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+     - [c31d919] Revert rename of libwebkit-dev
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 13 Mar 2011 19:50:54 +0800
+ 
+ banshee (1.9.5-1ubuntu1~hyper1+natty1) natty; urgency=low
+ 
+   * [a55ea97] Revert "Disable Boo support and remove build dependency"
+   * [7fb44c9] Revert "Temporarily disable Rio Karma support until libkarma is back in shape"
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 13 Mar 2011 19:46:33 +0800
+ 
 +banshee (1.9.5-1ubuntu1~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
 +        gio#, gtk#beans, libgpod and gdata# which were backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +      - Drop UbuntuOne
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +      - Drop UbuntuOne
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 11 Mar 2011 02:30:15 +0800
 +
  banshee (1.9.5-1ubuntu1~hyper1+lucid) lucid; urgency=low
  
    * Merge from Maverick, remaining changes
@@@ -77,24 -83,6 +101,24 @@@ banshee (1.9.4-1ubuntu2) natty; urgency
  
   -- Rodney Dawes <rodney.dawes at ubuntu.com>  Mon, 28 Feb 2011 14:06:16 -0500
  
 +banshee (1.9.4-1ubuntu1~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
 +        gio#, gtk#beans, libgpod and gdata# which were backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +      - Drop UbuntuOne
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +      - Drop UbuntuOne
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 24 Feb 2011 02:09:52 +0800
 +
  banshee (1.9.4-1ubuntu1~hyper1+lucid) lucid; urgency=low
  
    * Merge from Maverick, remaining changes
@@@ -164,25 -152,6 +188,25 @@@ banshee (1.9.3-2) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 13 Feb 2011 18:53:16 +0800
  
 +banshee (1.9.3-1ubuntu1~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
 +        gio#, gtk#beans, and libgpod which were backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +      - Drop UbuntuOne
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +      - Drop UbuntuOne
 +  * [1698d99] Revert use of -cil instead of -cil-dev for gdata
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 03 Feb 2011 23:57:05 +0800
 +
  banshee (1.9.3-1ubuntu1~hyper1+lucid) lucid; urgency=low
  
    * Merge from Maverick, remaining changes:
@@@ -252,24 -221,6 +276,24 @@@ banshee (1.9.2-1ubuntu1) natty; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 24 Jan 2011 22:17:31 +0800
  
 +banshee (1.9.2-1ubuntu1~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
 +        gio#, gtk#beans, and libgpod which were backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +      - Drop UbuntuOne
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +      - Drop UbuntuOne
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 14 Jan 2011 00:55:37 +0800
 +
  banshee (1.9.2-1ubuntu1~hyper1+lucid) lucid; urgency=low
  
    * Merge from Maverick, remaining changes:
@@@ -339,24 -290,6 +363,24 @@@ banshee (1.9.1-1ubuntu3) natty; urgency
  
   -- Robert Ancell <robert.ancell at canonical.com>  Mon, 10 Jan 2011 15:37:55 -0600
  
 +banshee (1.9.1-1ubuntu2~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
 +        gio#, gtk#beans, and libgpod which were backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +      - Drop UbuntuOne
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +      - Drop UbuntuOne
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 27 Dec 2010 11:23:43 +0800
 +
  banshee (1.9.1-1ubuntu2~hyper1+lucid) lucid; urgency=low
  
    * Merge from Maverick, remaining changes:
@@@ -383,24 -316,6 +407,24 @@@ banshee (1.9.1-1ubuntu2~hyper1+natty) n
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 27 Dec 2010 11:07:40 +0800
  
 +banshee (1.9.1-1ubuntu1~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
 +        gio#, gtk#beans, and libgpod which were backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +      - Drop UbuntuOne
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +      - Drop UbuntuOne
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 25 Dec 2010 01:30:16 +0800
 +
  banshee (1.9.1-1ubuntu1~hyper1+lucid) lucid; urgency=low
  
    * Merge from Maverick, remaining changes:
@@@ -529,22 -444,6 +553,22 @@@ banshee (1.9.0+git20101121.r1.b13266e-0
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 21 Nov 2010 12:21:02 +0800
  
 +banshee (1.9.0-1ubuntu1~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
 +        gio#, gtk#beans, and libgpod which were backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Nov 2010 03:12:44 +0800
 +
  banshee (1.9.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
  
    * Backport to Lucid, changes:
@@@ -642,22 -541,6 +666,22 @@@ banshee (1.8.0-1ubuntu1~hyper1+lucid) l
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 01 Oct 2010 03:13:46 +0800
  
 +banshee (1.8.0-1ubuntu1~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
 +        gio#, gtk#beans, and libgpod which were backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 01 Oct 2010 03:28:50 +0800
 +
  banshee (1.8.0-2) experimental; urgency=low
  
    * Fix duplicates on import (BGO #623441)
@@@ -685,22 -568,6 +709,22 @@@ banshee (1.8.0-1) experimental; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 01 Oct 2010 02:41:41 +0800
  
 +banshee (1.7.6-0ubuntu1~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
 +        gio#, gtk#beans, and libgpod which were backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 20 Sep 2010 04:31:04 +0800
 +
  banshee (1.7.6-0ubuntu1~hyper1+lucid) lucid; urgency=low
  
    * No change backport to Lucid
@@@ -783,22 -650,6 +807,22 @@@ banshee (1.7.5-1) UNRELEASED; urgency=l
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 18 Sep 2010 01:47:47 +0800
  
 +banshee (1.7.5-0ubuntu2~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
 +        gio#, gtk#beans, and libgpod which were backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 11 Sep 2010 23:05:00 +0800
 +
  banshee (1.7.5-0ubuntu2~hyper1+lucid) lucid; urgency=low
  
    * No change backport to Lucid
@@@ -874,22 -725,6 +898,22 @@@ banshee (1.7.5-0ubuntu1) maverick; urge
  
   -- Iain Lane <laney at ubuntu.com>  Mon, 06 Sep 2010 20:05:45 +0100
  
 +banshee (1.7.4-1ubuntu1~karmic1) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 13 Aug 2010 18:08:25 +0800
 +
  banshee (1.7.4-1ubuntu1~lucid1) lucid; urgency=low
  
    * No change backport to Lucid
@@@ -960,22 -795,6 +984,22 @@@ banshee (1.7.4-1) experimental; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 13 Aug 2010 00:30:24 +0800
  
 +banshee (1.7.3-2ubuntu1~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 24 Jul 2010 22:19:49 +0800
 +
  banshee (1.7.3-2ubuntu2) maverick; urgency=low
  
    * banshee shipped a generated MIME database (/usr/share/mime/*) breaking the
@@@ -1211,22 -1030,6 +1235,22 @@@ banshee (1.7.1-1ubuntu1) maverick; urge
  
   -- Didier Roche <didrocks at ubuntu.com>  Mon, 05 Jul 2010 15:19:53 +0200
  
 +banshee (1.7.1-1~hyper1~karmic1) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 31 May 2010 21:10:46 +0800
 +
  banshee (1.7.1-1~hyper1~lucid1) lucid; urgency=low
  
    * No change upload to PPA
@@@ -1263,22 -1066,6 +1287,22 @@@ banshee (1.7.1-1) experimental; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 27 May 2010 18:14:20 +0800
  
 +banshee (1.7.1-1~hyper1~karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 28 May 2010 04:22:52 +0800
 +
  banshee (1.7.1-1~hyper1~lucid) lucid; urgency=low
  
    * No change upload to PPA
@@@ -1297,22 -1084,6 +1321,22 @@@ banshee (1.7.1-1~hyper1~maverick) maver
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 28 May 2010 01:41:45 +0800
  
 +banshee (1.7.0-1~hyper1~karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 08 May 2010 07:19:03 +0800
 +
  banshee (1.7.0-1~hyper1~lucid) lucid; urgency=low
  
    * No change upload to lucid
@@@ -1353,22 -1124,6 +1377,22 @@@ banshee (1.7.0-1) experimental; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 07 May 2010 23:27:08 +0800
  
 +banshee (1.6.1-1~hyper1~karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 27 May 2010 18:59:09 +0800
 +
  banshee (1.6.1-1~hyper1~lucid) lucid; urgency=low
  
    * No change backport to Lucid.
@@@ -1411,22 -1166,6 +1435,22 @@@ banshee (1.6.0-1~hyper1~lucid1) lucid; 
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 03 Apr 2010 18:44:59 +0800
  
 +banshee (1.6.0-1~hyper1~karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 02 Apr 2010 00:52:53 +0800
 +
  banshee (1.6.0-1~hyper1~lucid) lucid; urgency=low
  
    * No change backport to Lucid
@@@ -1457,22 -1196,6 +1481,22 @@@ banshee (1.6.0-1) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 02 Apr 2010 03:12:16 +0800
  
 +banshee (1.5.6-1~hyper1~karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 22 Mar 2010 20:33:30 +0800
 +
  banshee (1.5.6-1~hyper1~lucid) lucid; urgency=low
  
    * No change backport to Lucid
@@@ -1514,22 -1237,6 +1538,22 @@@ banshee (1.5.6-1) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 21 Mar 2010 21:22:57 +0800
  
 +banshee (1.5.5-1~hyper1~karmic) karmic; urgency=low
 +
 +  * Merge from unstable, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Mar 2010 03:21:19 +0800
 +
  banshee (1.5.5-1~hyper1~lucid) lucid; urgency=low
  
    * No change backport to Lucid
@@@ -1565,19 -1272,6 +1589,19 @@@ banshee (1.5.5-1) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Mar 2010 03:13:23 +0800
  
 +banshee (1.5.4-1~hyper1~karmic) karmic; urgency=low
 +
 +  * Merge from unstable, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 27 Feb 2010 15:54:13 +0800
 +
  banshee (1.5.4-1) unstable; urgency=low
  
    * New upstream release (Closes: #571734)
@@@ -1624,18 -1318,6 +1648,18 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 28 Feb 2010 01:14:01 +0800
  
 +banshee (1.5.4~really1.5.3-0ubuntu1~hyper1~karmic) karmic; urgency=low
 +
 +  * Merge from unstable, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition
 +      - Use mono-devel 2.4.2.3
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream, and
 +        force-enable LibraryWatcher
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 29 Jan 2010 00:23:27 +0800
 +
  banshee (1.5.3-1) unstable; urgency=low
  
    [ Chow Loong Jin ]
@@@ -1849,14 -1531,6 +1873,14 @@@ banshee (1.5.0-3) experimental; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 19 Jul 2009 00:22:34 +0800
  
 +banshee (1.5.0-3~hyper1~karmic1) karmic; urgency=low
 +
 +  * Upload to PPA
 +  * debian/gbp.conf:
 +    + Add a gbp.conf to ease git buildpackage work
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 15 Aug 2009 02:10:33 +0800
 +
  banshee (1.5.0-2) experimental; urgency=low
  
    * debian/control:
diff --combined debian/control
index e9d2449,7d63206..ed16405
--- a/debian/control
+++ b/debian/control
@@@ -9,21 -9,25 +9,24 @@@ Build-Depends: debhelper (>= 7.0.50)
                 cli-common-dev (>= 0.5.7),
                 intltool (>= 0.35),
                 lsb-release,
 -               mono-devel (>= 2.4.3),
 -               libboo-cil-dev (>= 0.8.1),
 -               libndesk-dbus1.0-cil-dev (>= 0.5),
 -               libndesk-dbus-glib1.0-cil-dev (>= 0.3),
 -               libmono-addins-cil-dev (>= 0.3.1),
 +               mono-devel (>= 2.4.2.3),
++               libboo2.0-cil (>= 0.8.1),
 +               libndesk-dbus1.0-cil (>= 0.5),
 +               libndesk-dbus-glib1.0-cil (>= 0.3),
 +               libmono-addins0.2-cil (>= 0.3.1),
                 libtaglib-cil-dev (>= 2.0.3.7),
 -               libmono-zeroconf-cil-dev (>= 0.7.3),
 -               libnotify-cil-dev,
 -               libglib2.0-cil-dev (>= 2.10),
 -               libgtk2.0-cil-dev (>= 2.12),
 -               libgconf2.0-cil-dev,
 +               libmono-zeroconf1.0-cil (>= 0.7.3),
 +               libnotify0.4-cil,
 +               libglib2.0-cil (>= 2.10),
 +               libgtk2.0-cil (>= 2.12),
 +               libgconf2.0-cil,
                 libgudev1.0-cil-dev (>= 0.1) [linux-any],
                 libgkeyfile-cil-dev (>= 0.1),
                 libgio2.0-cil-dev (>= 2.22),
                 libgtk-sharp-beans2.0-cil-dev (>= 2.8),
                 libgpod-cil-dev (>= 0.7.95),
+                libindicate0.1-cil-dev (>= 0.4.1),
+                libkarma-cil-dev (>= 0.0.5),
 -               libubuntuone1.0-cil-dev,
                 libwebkit-dev (>= 1.2.2),
                 libsoup2.4-dev (>= 2.26),
                 libsoup-gnome2.4-dev (>= 2.26),
@@@ -40,7 -44,7 +43,7 @@@
                 libxrandr-dev (>= 2:1.1.1),
                 libxxf86vm-dev (>= 1:1.0.1),
                 libgstreamer0.10-dev (>= 0.10.23),
 -               libgstreamer-plugins-base0.10-dev (>= 0.10.26),
 +               libgstreamer-plugins-base0.10-dev (>= 0.10.23),
                 gnome-doc-utils (>= 0.17.3),
                 libgnome-desktop-dev
  Standards-Version: 3.9.1
@@@ -59,6 -63,7 +62,6 @@@ Depends: ${shlibs:Depends}
           gnome-icon-theme (>= 2.16)
  Recommends: brasero,
              avahi-daemon,
 -            banshee-extension-ubuntuonemusicstore (=${binary:Version}),
              media-player-info
  Suggests: gstreamer0.10-plugins-bad,
            gstreamer0.10-plugins-ugly,
@@@ -72,6 -77,22 +75,6 @@@ Description: Media Management and Playb
   and other media devices, play and manage video files and burn selections
   to a CD.
  
 -Package: banshee-extension-ubuntuonemusicstore
 -Architecture: any
 -Depends: banshee (>= ${source:Upstream-Version}),
 -         ${cli:Depends},
 -         ${shlibs:Depends},
 -         ${misc:Depends}
 -Enhances: banshee
 -Description: Media Management and Playback application - U1MS extension
 - Banshee is a media management and playback application for the GNOME
 - desktop, allowing users to import audio from CDs, search their library,
 - create playlists of selections of their library, sync music to/from iPods
 - and other media devices, play and manage video files and burn selections
 - to a CD.
 - .
 - This package contains Banshee's support for the Ubuntu One Music Store
 -
  Package: banshee-meego
  Architecture: any
  Depends: banshee (= ${binary:Version}),
diff --combined debian/rules
index b8d4722,9a54f5b..5a89b25
--- a/debian/rules
+++ b/debian/rules
@@@ -26,7 -26,7 +26,7 @@@ CONFFLAGS = 
  	--disable-remote-audio \
  	--disable-torrent \
  	--enable-meego \
 -	--enable-gapless-playback \
 +	--disable-gapless-playback \
  	--enable-podcast \
  	--enable-release \
  	--disable-shave \
@@@ -34,10 -34,10 +34,10 @@@
  
  ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
  CONFFLAGS += \
- 	--disable-boo \
- 	--disable-karma \
+ 	--enable-boo \
+ 	--enable-karma \
  	--disable-soundmenu \
 -	--enable-ubuntuone
 +	--disable-ubuntuone
  else
  CONFFLAGS += \
  	--enable-boo \
@@@ -76,6 -76,8 +76,6 @@@ override_dh_install
  	      debian/banshee/usr/lib/banshee-1/Extensions/Banshee.MeeGo.dll* \
  	      debian/banshee/usr/share/dbus-1/services/com.meego*
  ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
 -	# Remove U1MS and Sound Menu stuff from banshee
 -	rm -r debian/banshee/usr/lib/banshee-1/Extensions/Banshee.UbuntuOneMusicStore.*
  	cd po; intltool-update --pot
  
  	for d in $$(find debian/ -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \

-- 
banshee



More information about the Pkg-cli-apps-commits mailing list