[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/karmic, updated. ppa/2.0.0-1ubuntu1_hyper1+karmic-31-g8f68252

Chow Loong Jin hyperair at ubuntu.com
Tue Apr 12 14:29:12 UTC 2011


The following commit has been merged in the ppa/karmic branch:
commit 476e101068692e428c1e1729ef81b90ea9acdb20
Merge: a31ac8ebd4159a8ba69e7a4543f4d1fca6854110 7959d796968c985c9ce9a3d1c231576c7604e60c
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Tue Apr 12 21:45:02 2011 +0800

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

diff --combined debian/changelog
index 753a69c,ace5b68..7e8fff4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,69 +1,87 @@@
+ banshee (2.0.0-1ubuntu3~hyper1+lucid) lucid; urgency=low
+ 
+   * [ea9cc58] 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>  Tue, 12 Apr 2011 21:36:01 +0800
+ 
+ banshee (2.0.0-1ubuntu3~hyper1+maverick) maverick; urgency=low
+ 
+   * [7461aa4] Merge from Natty, remaining changes:
+     - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+     - [c31d919] Revert rename of libwebkit-dev
+   * [b111173] Disable ubuntuone (unmet dependencies)
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 12 Apr 2011 21:25:32 +0800
+ 
+ banshee (2.0.0-1ubuntu3~hyper1+natty) natty; urgency=low
+ 
+   * [ea7cf01] 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"
+   * [953736e] Revert amazon url change for PPA
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 12 Apr 2011 21:17:06 +0800
+ 
+ banshee (2.0.0-1ubuntu3) natty; urgency=low
+ 
+   * 11_reduce_cpu_usage.patch:
+     - Cherry pick two commits from the stable-2.0 branch reducing Banshee's
+       CPU use while playing by about 50%.
+   * Bump build-depend on GIO# to ensure we pick up the fix for a nasty leak.
+ 
+  -- Christopher James Halse Rogers <raof at ubuntu.com>  Mon, 11 Apr 2011 18:14:48 +1000
+ 
+ banshee (2.0.0-1ubuntu2+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, 10 Apr 2011 11:27:00 +0800
+ 
+ banshee (2.0.0-1ubuntu2+hyper1+natty) natty; urgency=low
+ 
+   * [0e3de76] 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"
+   * [953736e] Revert amazon url change for PPA
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 09 Apr 2011 22:02:05 +0800
+ 
+ banshee (2.0.0-1ubuntu2) natty; urgency=low
+ 
+   * 90_amazon_url.patch:
+     - Change the url for the Amazon store redirector (LP: #745194)
+   * 91_u1ms-initialize-earlier.patch:
+     - Create the U1MusicStore widget earlier (LP: #604699)
+     - Require libubuntuone >= 0.9.2
+ 
+  -- Rodney Dawes <rodney.dawes at canonical.com>  Fri, 08 Apr 2011 23:37:37 -0400
+ 
 +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
@@@ -53,8 -101,9 +119,9 @@@ banshee (2.0.0-1ubuntu1) natty; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 06 Apr 2011 23:43:24 +0800
  
- banshee (2.0.0-1) UNRELEASED; urgency=low
+ banshee (2.0.0-1) unstable; urgency=low
  
+   [ Chow Loong Jin ]
    * [ea911b3] New upstream release:
      + Enhancements:
        - Support Amazon Cloud Player browsing and downloading
@@@ -67,6 -116,10 +134,10 @@@
        - Wrong mouse pointer on search box (LP: #723122)
    * [69aa1ac] Refresh 06_add-meego-desktop-file.patch
  
+   [ Iain Lane ]
+   * [eac3863] Add new patch to only bind to the loopback address for the DAAP proxy
+     (LP: #753986)
+ 
   -- 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
@@@ -96,24 -149,6 +167,24 @@@ banshee (1.9.6-1ubuntu1~hyper1+lucid) l
  
   -- 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) natty; urgency=low
  
    * Merge from Debian Unstable, remaining changes:
@@@ -184,24 -219,6 +255,24 @@@ banshee (1.9.5-1ubuntu1~hyper1+lucid1) 
  
   -- 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+natty) natty; urgency=low
  
    * Backport to natty
@@@ -225,24 -242,6 +296,24 @@@ banshee (1.9.5-1ubuntu1~hyper1+lucid) l
  
   -- 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) natty; urgency=low
  
    * Merge from Debian Unstable, remaining changes:
@@@ -304,24 -303,6 +375,24 @@@ banshee (1.9.4-1ubuntu1~hyper1+lucid) l
  
   -- 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) natty; urgency=low
  
    * Merge from Debian Experimental, remaining changes:
@@@ -390,25 -371,6 +461,25 @@@ banshee (1.9.3-1ubuntu1~hyper1+lucid) l
  
   -- 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) UNRELEASED; urgency=low
  
    * Merge from Debian Experimental, remaining changes:
@@@ -477,24 -439,6 +548,24 @@@ banshee (1.9.2-1ubuntu1~hyper1+lucid) l
  
   -- 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-1) experimental; urgency=low
  
    * [df82d8d] Add libgnome-desktop-dev build-dep
@@@ -569,24 -513,6 +640,24 @@@ banshee (1.9.1-1ubuntu2~hyper1+lucid) l
  
   -- 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-1ubuntu1) natty; urgency=low
  
    * Merge from Debian experimental, remaining changes:
@@@ -616,24 -542,6 +687,24 @@@ banshee (1.9.1-1ubuntu1~hyper1+lucid) l
  
   -- 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-1) experimental; urgency=low
  
    [ Chow Loong Jin ]
@@@ -763,22 -671,6 +834,22 @@@ banshee (1.9.0-1ubuntu1~hyper1+lucid) l
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Nov 2010 02:14:23 +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-1) experimental; urgency=low
  
    * New upstream release
@@@ -830,23 -722,6 +901,23 @@@
  
   -- 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
@@@ -948,12 -823,6 +1019,12 @@@ banshee (1.8.0-1ubuntu1~hyper3+lucid) l
  
   -- 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
@@@ -966,34 -835,12 +1037,34 @@@ banshee (1.8.0-1ubuntu1~hyper2+lucid) m
  
   -- 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
  
   -- 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)
@@@ -1021,22 -868,6 +1092,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
@@@ -1119,22 -950,6 +1190,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
@@@ -1210,22 -1025,6 +1281,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
@@@ -1296,22 -1095,6 +1367,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
@@@ -1547,22 -1330,6 +1618,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
@@@ -1599,22 -1366,6 +1670,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
@@@ -1633,22 -1384,6 +1704,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
@@@ -1689,22 -1424,6 +1760,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.
@@@ -1747,22 -1466,6 +1818,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
@@@ -1793,22 -1496,6 +1864,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
@@@ -1850,22 -1537,6 +1921,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
@@@ -1901,19 -1572,6 +1972,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)
@@@ -1960,18 -1618,6 +2031,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 ]
@@@ -2185,14 -1831,6 +2256,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 cd5f87a,23b9707..c90d658
--- a/debian/control
+++ b/debian/control
@@@ -9,23 -9,23 +9,23 @@@ 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),
+                libgio2.0-cil-dev (>= 2.22.3-1~),
                 libgtk-sharp-beans2.0-cil-dev (>= 2.8),
                 libgpod-cil-dev (>= 0.7.95),
 -               libkarma-cil-dev (>= 0.0.5),
 +               libkarma-cil (>= 0.0.5),
                 libwebkit-dev (>= 1.2.2),
                 libsoup2.4-dev (>= 2.26),
                 libsoup-gnome2.4-dev (>= 2.26),
@@@ -41,13 -41,13 +41,13 @@@
                 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.26),
 +               libgstreamer0.10-dev (>= 0.10.12),
 +               libgstreamer-plugins-base0.10-dev (>= 0.10.12),
                 gnome-doc-utils (>= 0.17.3),
                 libgnome-desktop-dev
  Standards-Version: 3.9.1
  Homepage: http://www.banshee.fm
- Vcs-Git:  git://git.debian.org/git/pkg-cli-apps/packages/banshee.git
+ Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/banshee.git
  Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/banshee.git
  
  Package: banshee
diff --combined debian/gbp.conf
index 359789e,3690b2d..61a6cdf
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,3 -1,4 +1,4 @@@
  [DEFAULT]
 -debian-branch = ppa/lucid
 +debian-branch = ppa/karmic
  upstream-branch = upstream
+ compression = bzip2
diff --combined debian/patches/series
index 326dd9e,5df6741..3acb02f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,3 +1,4 @@@
 +02_bundle-inotifywatcher.patch
  01_Debranch-netbook-interface.patch
  02_only-show-netbook-panel-on-request.patch
  03_quit-only-on-explicit-shutdown-request.patch
@@@ -9,4 -8,7 +9,7 @@@
  07_enable-mpris-by-default.patch
  08_remove_unrelevant_media.patch
  0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
+ 10_bind-to-loopback-for-daap
+ 11_reduce_cpu_usage.patch
+ 91_u1ms-initialize-earlier.patch
  99_ltmain_as-needed.patch
diff --combined debian/rules
index 622d20e,0819323..6e3ffa8
--- 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 \
@@@ -76,11 -76,12 +76,12 @@@ 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
  	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-1" >> $$d; \
+ 	    echo "X-Ubuntu-Gettext-Domain=banshee" >> $$d; \
  	done
  endif
  

-- 
banshee



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