[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/karmic, updated. ppa/1.9.6-1ubuntu1_hyper1+karmic-49-ga31ac8e

Chow Loong Jin hyperair at ubuntu.com
Thu Apr 7 04:06:41 UTC 2011


The following commit has been merged in the ppa/karmic branch:
commit a31ac8ebd4159a8ba69e7a4543f4d1fca6854110
Merge: 631be6d4d3e29d5e354954b51db75b467f99bd4a be6235ad1c255f018ab0bb63c2e6aa92acfbf037
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Thu Apr 7 01:03:46 2011 +0800

    Merge branch 'ppa/unstable/karmic' into ppa/karmic
    
    Conflicts:
    	debian/control
    	debian/gbp.conf

diff --combined debian/changelog
index 498af17,d19feb0..753a69c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,21 +1,21 @@@
+ banshee (2.0.0-1ubuntu1~hyper1+karmic) karmic; urgency=low
+ 
+   * [d333418] 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, 07 Apr 2011 00:30:43 +0800
+ 
  banshee (2.0.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
  
    * [ea9cc58] Merge from Maverick, remaining changes
@@@ -51,33 -69,51 +69,51 @@@ banshee (2.0.0-1) UNRELEASED; urgency=l
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 06 Apr 2011 18:14:27 +0800
  
 +banshee (1.9.6-1ubuntu1~hyper1+natty) natty; urgency=low
 +
 +  * [bd79546] Merge from Ubuntu Natty, remaining changes:
 +    + [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>  Fri, 25 Mar 2011 21:36:01 +0800
 +
 +banshee (1.9.6-1ubuntu1~hyper1+maverick) 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>  Fri, 25 Mar 2011 22:19:37 +0800
 +
 +banshee (1.9.6-1ubuntu1~hyper1+lucid) lucid; urgency=low
 +
 +  * [77b9996] Merge from Maverick, remaining changes
 +    + [aed3a69] Disable soundmenu extension from building
 +    + [a24ddc3] Drop soundmenu related patches
 +    + [9d0f757] Drop libgtk2.0-dev >= 2.22 dependency
 +  * [874b3e2] Drop libindicate0.1-cil-dev (soundmenu not built)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 25 Mar 2011 22:28:12 +0800
 +
+ banshee (1.9.6-1ubuntu1~hyper1+karmic) karmic; urgency=low
+ 
+   * [8b86b79] 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, 25 Mar 2011 22:31:34 +0800
+ 
 -banshee (1.9.6-1ubuntu1~hyper1+lucid) lucid; urgency=low
 -
 -  * [77b9996] Merge from Maverick, remaining changes
 -    + [aed3a69] Disable soundmenu extension from building
 -    + [a24ddc3] Drop soundmenu related patches
 -    + [9d0f757] Drop libgtk2.0-dev >= 2.22 dependency
 -  * [874b3e2] Drop libindicate0.1-cil-dev (soundmenu not built)
 -
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 25 Mar 2011 22:28:12 +0800
 -
 -banshee (1.9.6-1ubuntu1~hyper1+maverick) 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>  Fri, 25 Mar 2011 22:19:37 +0800
 -
 -banshee (1.9.6-1ubuntu1~hyper1+natty) natty; urgency=low
 -
 -  * [bd79546] Merge from Ubuntu Natty, remaining changes:
 -    + [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>  Fri, 25 Mar 2011 21:36:01 +0800
 -
  banshee (1.9.6-1ubuntu1) natty; urgency=low
  
    * Merge from Debian Unstable, remaining changes:
@@@ -124,53 -160,89 +160,89 @@@ banshee (1.9.6-1) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 26 Mar 2011 00:48:41 +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+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+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+karmic1) 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>  Sun, 13 Mar 2011 20:10:34 +0800
+ 
 -banshee (1.9.5-1ubuntu1~hyper1+lucid1) lucid; urgency=low
 +banshee (1.9.5-1ubuntu1~hyper1+natty) natty; 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
 +  * Backport to natty
  
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 13 Mar 2011 20:01:55 +0800
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 11 Mar 2011 01:55:30 +0800
  
 -banshee (1.9.5-1ubuntu1~hyper1+maverick1) maverick; urgency=low
 +banshee (1.9.5-1ubuntu1~hyper1+maverick) 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
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 11 Mar 2011 01:56:41 +0800
  
 -banshee (1.9.5-1ubuntu1~hyper1+natty1) natty; urgency=low
 +banshee (1.9.5-1ubuntu1~hyper1+lucid) lucid; urgency=low
  
 -  * [a55ea97] Revert "Disable Boo support and remove build dependency"
 -  * [7fb44c9] Revert "Temporarily disable Rio Karma support until libkarma is back in shape"
 +  * 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 19:46:33 +0800
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 11 Mar 2011 02:01:19 +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
 -    + [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>  Fri, 11 Mar 2011 02:01:19 +0800
 -
 -banshee (1.9.5-1ubuntu1~hyper1+maverick) 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>  Fri, 11 Mar 2011 01:56:41 +0800
 -
 -banshee (1.9.5-1ubuntu1~hyper1+natty) natty; urgency=low
 -
 -  * Backport to natty
 -
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 11 Mar 2011 01:55:30 +0800
 -
  banshee (1.9.5-1ubuntu1) natty; urgency=low
  
    * Merge from Debian Unstable, remaining changes:
@@@ -209,29 -281,47 +281,47 @@@ 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+natty) natty; urgency=low
 +
 +  * No change upload to PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 24 Feb 2011 01:51:13 +0800
 +
 +banshee (1.9.4-1ubuntu1~hyper1+maverick) 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>  Thu, 24 Feb 2011 01:53:11 +0800
 +
 +banshee (1.9.4-1ubuntu1~hyper1+lucid) 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>  Thu, 24 Feb 2011 01:56:10 +0800
 +
+ 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
 -    + [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>  Thu, 24 Feb 2011 01:56:10 +0800
 -
 -banshee (1.9.4-1ubuntu1~hyper1+maverick) 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>  Thu, 24 Feb 2011 01:53:11 +0800
 -
 -banshee (1.9.4-1ubuntu1~hyper1+natty) natty; urgency=low
 -
 -  * No change upload to PPA
 -
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 24 Feb 2011 01:51:13 +0800
 -
  banshee (1.9.4-1ubuntu1) natty; urgency=low
  
    * Merge from Debian Experimental, remaining changes:
@@@ -278,28 -368,47 +368,47 @@@ 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+natty) natty; urgency=low
 +
 +  * No change upload to PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 03 Feb 2011 22:17:53 +0800
 +
 +banshee (1.9.3-1ubuntu1~hyper1+maverick) maverick; urgency=low
 +
 +  * [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
 +  * [c31d919] Revert rename of libwebkit-dev
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 03 Feb 2011 23:06:42 +0800
 +
 +banshee (1.9.3-1ubuntu1~hyper1+lucid) 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>  Thu, 03 Feb 2011 22:23:33 +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:
 -    + [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>  Thu, 03 Feb 2011 22:23:33 +0800
 -
 -banshee (1.9.3-1ubuntu1~hyper1+maverick) maverick; urgency=low
 -
 -  * [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
 -  * [c31d919] Revert rename of libwebkit-dev
 -
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 03 Feb 2011 23:06:42 +0800
 -
 -banshee (1.9.3-1ubuntu1~hyper1+natty) natty; urgency=low
 -
 -  * No change upload to PPA
 -
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 03 Feb 2011 22:17:53 +0800
 -
  banshee (1.9.3-1ubuntu1) UNRELEASED; urgency=low
  
    * Merge from Debian Experimental, remaining changes:
@@@ -347,27 -456,45 +456,45 @@@ 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+natty) natty; urgency=low
 +
 +  * No change backport to PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 14 Jan 2011 00:35:43 +0800
 +
 +banshee (1.9.2-1ubuntu1~hyper1+maverick) maverick; urgency=low
 +
 +  * No change backport to PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 14 Jan 2011 00:38:09 +0800
 +
 +banshee (1.9.2-1ubuntu1~hyper1+lucid) 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>  Fri, 14 Jan 2011 00:50:52 +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:
 -    + [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>  Fri, 14 Jan 2011 00:50:52 +0800
 -
 -banshee (1.9.2-1ubuntu1~hyper1+maverick) maverick; urgency=low
 -
 -  * No change backport to PPA
 -
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 14 Jan 2011 00:38:09 +0800
 -
 -banshee (1.9.2-1ubuntu1~hyper1+natty) natty; urgency=low
 -
 -  * No change backport to PPA
 -
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 14 Jan 2011 00:35:43 +0800
 -
  banshee (1.9.2-1) experimental; urgency=low
  
    * [df82d8d] Add libgnome-desktop-dev build-dep
@@@ -416,61 -543,97 +543,97 @@@ 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) natty; urgency=low
 +
 +  * [f1bb0cf] Enable SoundMenu by default
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 27 Dec 2010 10:59:06 +0800
 +
 +banshee (1.9.1-1ubuntu2~hyper1+natty) natty; urgency=low
 +
 +  * No change backport to PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 27 Dec 2010 11:07:40 +0800
 +
 +banshee (1.9.1-1ubuntu2~hyper1+maverick) maverick; urgency=low
 +
 +  * No change backport to PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 27 Dec 2010 11:12:33 +0800
 +
 +banshee (1.9.1-1ubuntu2~hyper1+lucid) lucid; urgency=low
 +
 +  * Merge from Maverick, remaining changes:
 +    + [aed3a69] Disable soundmenu extension from building
 +    + [a24ddc3] Drop soundmenu related patches
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 27 Dec 2010 11:19:24 +0800
 +
+ 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
 +banshee (1.9.1-1ubuntu1) natty; urgency=low
  
 -  * Merge from Maverick, remaining changes:
 -    + [aed3a69] Disable soundmenu extension from building
 -    + [a24ddc3] Drop soundmenu related patches
 +  * Merge from Debian experimental, remaining changes:
 +    + Disable notification area by default
 +    + Disable boo and karma extensions
 +    + Enable and recommend u1ms and soundmenu extensions
 +    + Move desktop file for Meego UI to /usr/share/une/applications
  
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 27 Dec 2010 11:19:24 +0800
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 21 Dec 2010 13:22:57 +0800
  
 -banshee (1.9.1-1ubuntu2~hyper1+maverick) maverick; urgency=low
 +banshee (1.9.1-1ubuntu1~hyper1+natty) natty; urgency=low
  
    * No change backport to PPA
  
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 27 Dec 2010 11:12:33 +0800
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 24 Dec 2010 21:21:47 +0800
  
 -banshee (1.9.1-1ubuntu2) natty; urgency=low
 +banshee (1.9.1-1ubuntu1~hyper1+maverick) maverick; urgency=low
  
 -  * [f1bb0cf] Enable SoundMenu by default
 +  * No change backport to PPA
  
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 27 Dec 2010 10:59:06 +0800
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 24 Dec 2010 21:34:25 +0800
  
 -banshee (1.9.1-1ubuntu2~hyper1+natty) natty; urgency=low
 +banshee (1.9.1-1ubuntu1~hyper1+lucid) lucid; urgency=low
  
 -  * No change backport to PPA
 +  * Merge from Maverick, remaining changes:
 +    + [aed3a69] Disable soundmenu extension from building
  
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 27 Dec 2010 11:07:40 +0800
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 24 Dec 2010 23:17:00 +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:
 -    + [aed3a69] Disable soundmenu extension from building
 -
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 24 Dec 2010 23:17:00 +0800
 -
 -banshee (1.9.1-1ubuntu1~hyper1+maverick) maverick; urgency=low
 -
 -  * No change backport to PPA
 -
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 24 Dec 2010 21:34:25 +0800
 -
 -banshee (1.9.1-1ubuntu1) natty; urgency=low
 -
 -  * Merge from Debian experimental, remaining changes:
 -    + Disable notification area by default
 -    + Disable boo and karma extensions
 -    + Enable and recommend u1ms and soundmenu extensions
 -    + Move desktop file for Meego UI to /usr/share/une/applications
 -
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 21 Dec 2010 13:22:57 +0800
 -
 -banshee (1.9.1-1ubuntu1~hyper1+natty) natty; urgency=low
 -
 -  * No change backport to PPA
 -
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 24 Dec 2010 21:21:47 +0800
 -
  banshee (1.9.1-1) experimental; urgency=low
  
    [ Chow Loong Jin ]
@@@ -570,21 -733,29 +733,21 @@@ 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
 +banshee (1.9.0-1ubuntu1) natty; 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)
 +  * Merge from Debian experimental, remaining changes:
 +    + debian/banshee-meego.install: Install netbook banshee.desktop to UNE
 +      location
 +    + Disable boo support
 +    + Recommend soundmenu extension
  
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Nov 2010 03:12:44 +0800
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 18 Nov 2010 02:31:18 +0800
  
 -banshee (1.9.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
 +banshee (1.9.0-1ubuntu1~hyper1+natty) natty; urgency=low
  
 -  * Backport to Lucid, changes:
 -    + Drop banshee-extension-soundmenu recommends, since Sound Menu is not
 -      in Lucid
 +  * No change upload to PPA
  
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Nov 2010 02:14:23 +0800
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Nov 2010 01:15:49 +0800
  
  banshee (1.9.0-1ubuntu1~hyper1+maverick) maverick; urgency=low
  
@@@ -592,14 -763,22 +755,30 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Nov 2010 01:21:16 +0800
  
 -banshee (1.9.0-1ubuntu1) natty; urgency=low
 +banshee (1.9.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
  
 -  * Merge from Debian experimental, remaining changes:
 -    + debian/banshee-meego.install: Install netbook banshee.desktop to UNE
 -      location
 -    + Disable boo support
 -    + Recommend soundmenu extension
 +  * Backport to Lucid, changes:
 +    + Drop banshee-extension-soundmenu recommends, since Sound Menu is not
 +      in Lucid
  
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 18 Nov 2010 02:31:18 +0800
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Nov 2010 02:14:23 +0800
  
 -banshee (1.9.0-1ubuntu1~hyper1+natty) natty; urgency=low
++banshee (1.9.0-1ubuntu1~hyper1+karmic) karmic; urgency=low
+ 
 -  * No change upload to PPA
++  * 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 01:15:49 +0800
++ -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Nov 2010 03:12:44 +0800
+ 
  banshee (1.9.0-1) experimental; urgency=low
  
    * New upstream release
@@@ -651,102 -830,6 +830,102 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 11 Nov 2010 22:45:14 +0800
  
 +banshee (1.8.1-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)
 +  * [4bb4f5f] Use libgdata-cil-dev (backported to Karmic PPA)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 30 Jan 2011 03:14:54 +0800
 +
 +banshee (1.8.1-0ubuntu1~hyper1+lucid) lucid; urgency=low
 +
 +  * No change upload to PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 30 Jan 2011 02:54:20 +0800
 +
 +banshee (1.8.1-0ubuntu1~hyper1+maverick) maverick; urgency=low
 +
 +  * No change upload to PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 30 Jan 2011 02:51:24 +0800
 +
 +banshee (1.8.1-0ubuntu1) maverick-proposed; urgency=low
 +
 +  * [338f8fe] New upstream bugfix release:
 +    + Sync dialog would sometimes be displayed forever
 +    + Nereid: Always grab search entry focus on ctrl+f
 +    + Lastfm: Fix NRE in LastfmRequest when the request times out
 +    + bgo#486543: Playlists: Fix parsing when started from root directory
 +      (LP: #674116)
 +    + bgo#540394: AudioCdRipper: Don't overwrite existing files when
 +      ripping (LP: #348502)
 +    + bgo#540525: TrackActions: Stop when the playing track is deleted
 +      (LP: #366893)
 +    + bgo#587936: AppleDevice: Sync the Sort+ fields
 +    + bgo#609463: Equalizer: Fix distortion by using floating math
 +    + bgo#620010: Fix displaying random image for "All Albums"
 +    + bgo#623441: DatabaseImportManager: Fix duplicates on import
 +    + bgo#624734: InternetRadio: Allow editing stations again
 +    + bgo#629005: FullscreenWindow: Fix full-screen on multi-head displays
 +    + bgo#630209: AppleDevice: Fix podcast flag for video podcasts
 +    + bgo#631172: AppleDevice: Fix podcast support
 +    + bgo#631961: Gio: Fix InvalidCastException
 +    + bgo#632114: Fix hang when replaying video
 +    + bgo#632196: AlbumListView: Fix MissingIntPtrCtorException
 +    + bgo#632246: ThickClient: Fix IntPtr ctor issue in SourceComboBox
 +      (LP: #669857)
 +    + bgo#632420: Booter: Use the MeeGo client if appropriate
 +    + bgo#632715: Bookmarks: Fix UI not getting loaded
 +    + bgo#633764: Dap: Fix not transcoding some files when we should
 +    + bgo#633841: StreamTagger: Recognize webm as video (LP: #669682)
 +    + bgo#634652: AppleDevice: Remove invalid tracks before syncing
 +    + bgo#634686: Streaming: Fix streaming broken after first play
 +    + bgo#635453: Importing: Fix regression with importing mkv
 +    + bgo#635776: build: Ensure karma-sharp's DLLmap is copied in the
 +      build
 +    + bgo#635791: Metrics: Fix translation of the preference label
 +    + bgo#637303: FileChooserDialog: Fix error message on first launch
 +      (LP: #687402)
 +    + bgo#637627: FullscreenWindow: Keep fullscreen when showing volume
 +      osd
 +    + bgo#637991: SourceRowRenderer: Fix vertical alignment calculation
 +    + bgo#638477: X11NotificationArea: Enhance check for RGBA visual
 +      (LP: #689505)
 +    + bgo#638755: Dap.MassStorage: Add support for Xperia X10 mini pro
 +    + bgo#638989: Dap.MassStorage: Add support for Nexus S
 +    + bgo#635088: Dap.MassStorage: Add support for the LG Ally phone
 +    + bgo#633551: Dap.MassStorage: Add support for Huawei Ideos Android
 +      phones
 +    + bgo#631687: Dap.MassStorage: Fix extensionless files
 +    + bgo#639603: PlayerEngine: Fix NRE when current track doesn't have a
 +      Uri
 +    + bnc#642505: Fix insecure LD_LIBRARY_PATH
 +  * [7fd9862] Drop patch for bgo#623441 (applied upstream)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 30 Jan 2011 02:42:20 +0800
 +
 +banshee (1.8.0-2ubuntu1~maverick2) maverick-proposed; urgency=low
 +
 +  * debian/rules: Fix gettext domain (LP: #677173)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 25 Nov 2010 12:05:09 +0800
 +
 +banshee (1.8.0-2ubuntu1~maverick1) maverick-proposed; urgency=low
 +
 +  * Upload to Maverick
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 22 Oct 2010 17:45:59 +0800
 +
  banshee (1.8.0-2ubuntu1) natty; urgency=low
  
    * Merge from Debian experimental, remaining changes:
@@@ -757,42 -840,6 +936,42 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 22 Oct 2010 01:53:21 +0800
  
 +banshee (1.8.0-1ubuntu1~hyper3+maverick) maverick; urgency=low
 +
 +  * No change re-upload to PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 16 Jan 2011 11:18:52 +0800
 +
 +banshee (1.8.0-1ubuntu1~hyper3+lucid) lucid; urgency=low
 +
 +  * No change re-upload to PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 16 Jan 2011 11:19:07 +0800
 +
 +banshee (1.8.0-1ubuntu1~hyper3+karmic) karmic; urgency=low
 +
 +  * No change re-upload to PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 16 Jan 2011 11:19:22 +0800
 +
 +banshee (1.8.0-1ubuntu1~hyper2+maverick) maverick; urgency=low
 +
 +  * maverick No change re-upload to PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 16 Jan 2011 11:12:07 +0800
 +
 +banshee (1.8.0-1ubuntu1~hyper2+lucid) maverick; urgency=low
 +
 +  * lucid No change re-upload to PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 16 Jan 2011 11:12:10 +0800
 +
 +banshee (1.8.0-1ubuntu1~hyper2+karmic) maverick; urgency=low
 +
 +  * karmic No change re-upload to PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 16 Jan 2011 11:12:12 +0800
 +
  banshee (1.8.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
  
    * No change backport to Lucid
diff --combined debian/control
index e594245,4b1de48..cd5f87a
--- a/debian/control
+++ b/debian/control
@@@ -14,7 -14,6 +14,6 @@@ Build-Depends: debhelper (>= 7.0.50)
                 libndesk-dbus1.0-cil (>= 0.5),
                 libndesk-dbus-glib1.0-cil (>= 0.3),
                 libmono-addins0.2-cil (>= 0.3.1),
-                libmono-addins-gui0.2-cil (>= 0.3.1),
                 libtaglib-cil-dev (>= 2.0.3.7),
                 libmono-zeroconf1.0-cil (>= 0.7.3),
                 libnotify0.4-cil,
@@@ -42,9 -41,9 +41,9 @@@
                 libx11-dev,
                 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.23),
 +               libgstreamer0.10-dev (>= 0.10.12),
 +               libgstreamer-plugins-base0.10-dev (>= 0.10.12),
-                gnome-doc-utils (>= 0.17.3)
+                gnome-doc-utils (>= 0.17.3),
                 libgnome-desktop-dev
  Standards-Version: 3.9.1
  Homepage: http://www.banshee.fm
@@@ -62,7 -61,6 +61,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,
@@@ -76,22 -74,6 +74,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 d684df8,4bc0b6c..622d20e
--- a/debian/rules
+++ b/debian/rules
@@@ -37,7 -37,7 +37,7 @@@ CONFFLAGS += 
  	--enable-boo \
  	--enable-karma \
  	--disable-soundmenu \
- 	--enable-ubuntuone
+ 	--disable-ubuntuone
  else
  CONFFLAGS += \
  	--enable-boo \
@@@ -76,13 -76,11 +76,11 @@@ override_dh_install
  	      debian/banshee/usr/lib/banshee/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/Extensions/Banshee.UbuntuOneMusicStore.*
  	cd po; intltool-update --pot
  
  	for d in $$(find debian/ -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \
  	    sed -ri '/^(Name|GenericName|Comment|X-GNOME-FullName)\[/d' $$d; \
 -	    echo "X-Ubuntu-Gettext-Domain=banshee" >> $$d; \
 +	    echo "X-Ubuntu-Gettext-Domain=banshee-1" >> $$d; \
  	done
  endif
  

-- 
banshee



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