[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/1.9.6-1-17-g5adb0dd

Chow Loong Jin hyperair at ubuntu.com
Wed Apr 13 02:23:25 UTC 2011


The following commit has been merged in the master branch:
commit 97d3c7e32f3db4cc1fa064d314a162335afef8d7
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Wed Apr 13 08:48:54 2011 +0800

    Revert "Cherry-pick CPU-usage reduction patches from stable-2.0"
    
    This reverts commit 076882befe0bbd3676d2b4a2b2a020f0c14aa3c6, which was a weird
    commit that over the entire Ubuntu delta.
    
    Git-Dch: Ignore

diff --git a/debian/changelog b/debian/changelog
index ad6c081..5b1cd63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,23 +1,3 @@
-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) natty; urgency=low
-
-  * Merge from Debian Unstable, remaining changes:
-    + Enable SoundMenu and Disable NotificationArea by default
-    + Disable boo and karma extensions
-    + Enable and recommnd u1ms and soundmenu extensions
-    + Move desktop file for Meego UI to /usr/share/une/applications
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 06 Apr 2011 23:43:24 +0800
-
 banshee (2.0.0-1) unstable; urgency=low
 
   [ Chow Loong Jin ]
@@ -39,18 +19,6 @@ banshee (2.0.0-1) unstable; urgency=low
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 06 Apr 2011 18:14:27 +0800
 
-banshee (1.9.6-1ubuntu1) natty; urgency=low
-
-  * Merge from Debian Unstable, remaining changes:
-    + Enable SoundMenu and Disable NotificationArea by default
-    + Disable boo and karma extensions
-    + Enable and recommnd u1ms and soundmenu extensions
-    + Move desktop file for Meego UI to /usr/share/une/applications
-  * [b14f32d] Bump libubuntuone1.0-cil-dev version in build-dep
-  * [e382b0f] Update soundmenu and u1ms install files for rename
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 29 Mar 2011 08:16:04 +0800
-
 banshee (1.9.6-1) unstable; urgency=low
 
   * [3b75d9a] Fix wrong comparison of yes vs y for gio-hardware (LP: #736631)
@@ -85,16 +53,6 @@ banshee (1.9.6-1) unstable; urgency=low
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 26 Mar 2011 00:48:41 +0800
 
-banshee (1.9.5-1ubuntu1) natty; urgency=low
-
-  * Merge from Debian Unstable, remaining changes:
-    + Enable SoundMenu and Disable NotificationArea by default
-    + Disable boo and karma extensions
-    + Enable and recommnd u1ms and soundmenu extensions
-    + Move desktop file for Meego UI to /usr/share/une/applications
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 11 Mar 2011 01:05:18 +0800
-
 banshee (1.9.5-1) unstable; urgency=low
 
   * [6e971aa] Only use GIO Hardware on linux-any (Closes: #615126)
@@ -116,23 +74,6 @@ banshee (1.9.5-1) unstable; urgency=low
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 11 Mar 2011 01:10:49 +0800
 
-banshee (1.9.4-1ubuntu2) natty; urgency=low
-
-  * 0001-Add-support-for-u1ms-links.patch:
-    - Handle u1ms:// links in the U1 Music Store (LP: #723960)
-
- -- Rodney Dawes <rodney.dawes at ubuntu.com>  Mon, 28 Feb 2011 14:06:16 -0500
-
-banshee (1.9.4-1ubuntu1) natty; urgency=low
-
-  * Merge from Debian Experimental, remaining changes:
-    + Enable SoundMenu and Disable NotificationArea by default
-    + Disable boo and karma extensions
-    + Enable and recommnd u1ms and soundmenu extensions
-    + Move desktop file for Meego UI to /usr/share/une/applications
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 26 Feb 2011 22:05:24 +0800
-
 banshee (1.9.4-1) unstable; urgency=low
 
   * [f49212c] New upstream release:
@@ -153,33 +94,12 @@ banshee (1.9.4-1) unstable; urgency=low
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 24 Feb 2011 01:35:05 +0800
 
-banshee (1.9.3-2ubuntu1) natty; urgency=low
-
-  * Merge from Debian Experimental, remaining changes:
-    + Enable SoundMenu and Disable NotificationArea by default
-    + Disable boo and karma extensions
-    + Enable and recommnd u1ms and soundmenu extensions
-    + Move desktop file for Meego UI to /usr/share/une/applications
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 20 Feb 2011 14:48:54 +0800
-
 banshee (1.9.3-2) unstable; urgency=low
 
   * [c349fbb] Bump gdata-sharp build-dep to accomodate ABI bump
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 13 Feb 2011 18:53:16 +0800
 
-banshee (1.9.3-1ubuntu1) UNRELEASED; urgency=low
-
-  * Merge from Debian Experimental, remaining changes:
-    + Enable SoundMenu and Disable NotificationArea by default
-    + Disable boo and karma extensions
-    + Enable and recommnd u1ms and soundmenu extensions
-    + Move desktop file for Meego UI to /usr/share/une/applications
-  * [aa23652] Drop libindicate0.1-cil-dev
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 03 Feb 2011 22:16:35 +0800
-
 banshee (1.9.3-1) unstable; urgency=low
 
   * [e588bea] New upstream release:
@@ -205,17 +125,6 @@ banshee (1.9.3-1) unstable; urgency=low
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 03 Feb 2011 14:16:19 +0800
 
-banshee (1.9.2-1ubuntu1) natty; urgency=low
-
-  * Merge from Debian Experimental, remaining changes:
-    + Enable SoundMenu and Disable NotificationArea by default
-    + Disable boo and karma extensions
-    + Enable and recommnd u1ms and soundmenu extensions
-    + Move desktop file for Meego UI to /usr/share/une/applications
-  * [0c8acd9] Enable u1ms by default
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 24 Jan 2011 22:17:31 +0800
-
 banshee (1.9.2-1) experimental; urgency=low
 
   * [df82d8d] Add libgnome-desktop-dev build-dep
@@ -257,29 +166,6 @@ banshee (1.9.2-1) experimental; urgency=low
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 15 Jan 2011 02:41:50 +0800
 
-banshee (1.9.1-1ubuntu3) natty; urgency=low
-
-  * debian/control:
-    - Change build-depends from libwebkit-dev to libwebkitgtk-dev
-
- -- 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-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-1) experimental; urgency=low
 
   [ Chow Loong Jin ]
@@ -336,59 +222,6 @@ banshee (1.9.1-1) experimental; urgency=low
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 25 Dec 2010 13:07:06 +0800
 
-banshee (1.9.0+git20101121.r1.b13266e-0ubuntu6) natty; urgency=low
-
-  * debian/rules, debian/control:
-    - Drop support for Rio Karma devices, as libkarma is not yet
-      ready to enter main.
-
- -- Michael Terry <mterry at ubuntu.com>  Fri, 17 Dec 2010 09:33:48 -0500
-
-banshee (1.9.0+git20101121.r1.b13266e-0ubuntu5) natty; urgency=low
-
-  * [e0db4ba] Disable the notification area and enable MPRIS by default
-
- -- Iain Lane <laney at ubuntu.com>  Fri, 26 Nov 2010 18:35:59 +0000
-
-banshee (1.9.0+git20101121.r1.b13266e-0ubuntu4) natty; urgency=low
-
-  * debian/rules: Fix gettext domain (LP: #677173)
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 25 Nov 2010 11:30:48 +0800
-
-banshee (1.9.0+git20101121.r1.b13266e-0ubuntu3) natty; urgency=low
-
-  * debian/control:
-    + Recommend banshee-extension-u1ms
-    + Demote gst-plugins-bad from recommends to suggests
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 23 Nov 2010 04:27:24 +0800
-
-banshee (1.9.0+git20101121.r1.b13266e-0ubuntu2) natty; urgency=low
-
-  * debian/patches/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch:
-    + Revert a recent performance related patch that caused artwork to not
-      display at all
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 22 Nov 2010 05:11:45 +0800
-
-banshee (1.9.0+git20101121.r1.b13266e-0ubuntu1) natty; urgency=low
-
-  * New upstream snapshot: Drop binary dep on libmono-system-data*-cil
-  * debian/patches/06_add-meego-desktop-file.patch: Refresh
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 21 Nov 2010 12:21:02 +0800
-
-banshee (1.9.0-1ubuntu1) natty; 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
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 18 Nov 2010 02:31:18 +0800
-
 banshee (1.9.0-1) experimental; urgency=low
 
   * New upstream release
@@ -440,16 +273,6 @@ banshee (1.9.0-1) experimental; urgency=low
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 11 Nov 2010 22:45:14 +0800
 
-banshee (1.8.0-2ubuntu1) natty; 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
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 22 Oct 2010 01:53:21 +0800
-
 banshee (1.8.0-2) experimental; urgency=low
 
   * Fix duplicates on import (BGO #623441)
@@ -471,7 +294,7 @@ banshee (1.8.0-1) experimental; urgency=low
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 01 Oct 2010 02:41:41 +0800
 
-banshee (1.7.6-0ubuntu1) maverick; urgency=low
+banshee (1.7.6-1) UNRELEASED; urgency=low
 
   * New upstream release
     + Enhancements:
@@ -547,101 +370,6 @@ banshee (1.7.5-1) UNRELEASED; urgency=low
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 18 Sep 2010 01:47:47 +0800
 
-banshee (1.7.5-0ubuntu2) maverick; urgency=low
-
-  * Fix casing of variable in patch, resolving missing dllmap issue
-  * Ensure that gpod-sharp's DLLmap is copied
-
- -- Iain Lane <laney at ubuntu.com>  Wed, 08 Sep 2010 01:21:22 +0800
-
-banshee (1.7.5-0ubuntu1) maverick; urgency=low
-
-  [ Chow Loong Jin ]
-  * New upstream release
-    + New Features:
-      - GIO/udev-based hardware backend
-      - Apple Devices backend with support for iPod/iOS devices (LP: #554141)
-      - MPRIS v2 support (Ubuntu Sound Menu, etc)
-      - Audiobooks and Miro Guide extensions enabled by default
-    + Enhancements/API Additions:
-      - Play menu item in track context menu
-      - Amazon affiliate codes for all supported countries
-      - "Amazon MP3s" Music smart playlist
-      - Miro Guide teaser in Podcasts
-      - Zoom support in Amazon MP3 Store and Miro Guide
-      - Now Playing simplify mode that declutters the UI
-      - Play Queue shuffle action
-      - Podcast errors shown to user
-      - Better MTP device detection
-      - Default smart playlists hidden when empty, for new users
-      - New and improved user documentation
-    + Notable Bugs Fixed
-      - bgo#626786: Prevent crash in search-for-artist when blank
-      - bgo#628388: Fix overflow bug with MTP playlists
-      - bgo#625683: Fixup checkboxes now clickable
-      - bgo#626928: Fetch podcast artwork asap
-      - bgo#626791: Catch crashes caused by missing extensions
-      - bgo#528383: Re-enable writing video metadata to file
-      - bgo#626803, LP: #617017: Fix Ogg rating parsing in non-English locales
-  * debian/(control, rules):
-    + Update configure flags:
-      - --disable-hal
-      - --disable-ipod
-      - --enable-appledevice
-      - --enable-gio
-      - --enable-gio-hardware
-    + Add new build depends:
-      - libgudev1.0-cil-dev
-      - libgkeyfile-cil-dev
-      - libgio2.0-cil-dev
-      - libgtk-sharp-beans2.0-cil-dev
-      - libgpod-cil-dev
-    + Update version of libmtp-dev build-dep to 0.3.0
-    + Drop hal, podsleuth and ipod-sharp dependencies
-  * debian/patches:
-    + 0001-Don-t-copy-duplicate-libraries.patch: Don't copy duplicate
-      libraries
-    + 0002-Also-copy-gio-sharp-s-debugging-libraries-if-they-ar.patch:
-      Copy debugging libraries if they exist
-
-  [ Iain Lane ]
-  * Upload to Ubuntu from Debian git, as the dependencies are not all
-    ready in Debian.
-  * [fe5e8fb] Refresh and update patches to apply cleanly
-  * [a688fa9] Disable Boo support and remove build dependency
-  * [df01b1e] Generate translation template and set gettext domain in
-    the Ubuntu build
-  * [9c3402b] Make sure mimeinfo.cache is removed
-  * [d54fedc] Update changelog version for Ubuntu
-
- -- Iain Lane <laney at ubuntu.com>  Mon, 06 Sep 2010 20:05:45 +0100
-
-banshee (1.7.4-1ubuntu1) maverick; urgency=low
-
-  * Merge from Debian experimental, remaining changes:
-    + debian/patches:
-      - 01_Debranch-netbook-interface.patch: Debrand the netbook interface
-      - 02_only-show-netbook-panel-on-request.patch: Only show netbook
-        interface on --client=Meego and start traditional interface
-        otherwise
-      - 03_quit-only-on-explicit-shutdown-request.patch: Quit on explicit
-        shutdown request only
-      - 04_enable-switching-between-the-2-interfaces.patch: Enable
-        switching between netbook and traditional interfaces.
-      - 05_show-a-empty-library-message-in-banshee.patch: Show empty hint
-        when starting for the first time with an empty library.
-      - 06_add-meego-desktop-file.patch: Add desktop file to start netbook interface
-      - 07_enable-library-watch-by-default.patch: Enable Library Watcher by default
-      - 08_remove_unrelevant_media.patch: Don't show "media" in netbook
-        interface as this is irrelevant on non-Meego interfaces
-    + debian/banshee-meego.install: Install desktop file for Banshee netbook interface
-  * Ubuntu-specific changes from previous merge:
-    + Refresh patches:
-      - 04_enable-switching-between-the-2-interfaces.patch
-      - 06_add-meego-desktop-file.patch
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 13 Aug 2010 00:37:19 +0800
-
 banshee (1.7.4-1) experimental; urgency=low
 
   * New upstream release
@@ -674,37 +402,6 @@ banshee (1.7.4-1) experimental; urgency=low
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 13 Aug 2010 00:30:24 +0800
 
-banshee (1.7.3-2ubuntu2) maverick; urgency=low
-
-  * banshee shipped a generated MIME database (/usr/share/mime/*) breaking the
-    system one.  Change debian/rules to delete everything below
-    debian/tmp/usr/share/mime/ except "packages" before dh_install.
-  * Minor syntax tweaks to rules.
-
- -- Loïc Minier <loic.minier at ubuntu.com>  Thu, 05 Aug 2010 00:49:55 -0400
-
-banshee (1.7.3-2ubuntu1) maverick; urgency=low
-
-  * Merge from Debian Experimental, remaining changes:
-    + debian/patches:
-      - 01_Debranch-netbook-interface.patch: Debrand the netbook interface
-      - 02_only-show-netbook-panel-on-request.patch: Only show netbook
-        interface on --client=Meego and start traditional interface
-        otherwise
-      - 03_quit-only-on-explicit-shutdown-request.patch: Quit on explicit
-        shutdown request only
-      - 04_enable-switching-between-the-2-interfaces.patch: Enable
-        switching between netbook and traditional interfaces.
-      - 05_show-a-empty-library-message-in-banshee.patch: Show empty hint
-        when starting for the first time with an empty library.
-      - 06_add-meego-desktop-file.patch: Add desktop file to start netbook interface
-      - 07_enable-library-watch-by-default.patch: Enable Library Watcher by default
-      - 08_remove_unrelevant_media.patch: Don't show "media" in netbook
-        interface as this is irrelevant on non-Meego interfaces
-    + debian/banshee-meego.install: Install desktop file for Banshee netbook interface
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 26 Jul 2010 00:32:41 +0800
-
 banshee (1.7.3-2) experimental; urgency=low
 
   * debian/control: Add libsoup{,-gnome}2.4-dev build-deps which were
@@ -712,28 +409,6 @@ banshee (1.7.3-2) experimental; urgency=low
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 24 Jul 2010 04:44:30 +0800
 
-banshee (1.7.3-1ubuntu1) maverick; urgency=low
-
-  * Merge from Debian Experimental, remaining changes:
-    + debian/patches:
-      - 01_Debranch-netbook-interface.patch: Debrand the netbook interface
-      - 02_only-show-netbook-panel-on-request.patch: Only show netbook
-        interface on --client=Meego and start traditional interface
-        otherwise
-      - 03_quit-only-on-explicit-shutdown-request.patch: Quit on explicit
-        shutdown request only
-      - 04_enable-switching-between-the-2-interfaces.patch: Enable
-        switching between netbook and traditional interfaces.
-      - 05_show-a-empty-library-message-in-banshee.patch: Show empty hint
-        when starting for the first time with an empty library.
-      - 06_add-meego-desktop-file.patch: Add desktop file to start netbook interface
-      - 07_enable-library-watch-by-default.patch: Enable Library Watcher by default
-      - 08_remove_unrelevant_media.patch: Don't show "media" in netbook
-        interface as this is irrelevant on non-Meego interfaces
-    + debian/banshee-meego.install: Install desktop file for Banshee netbook interface
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 23 Jul 2010 19:16:11 +0800
-
 banshee (1.7.3-1) experimental; urgency=low
 
   * New upstream release:
@@ -785,44 +460,6 @@ banshee (1.7.3-1) experimental; urgency=low
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 22 Jul 2010 19:07:31 +0800
 
-banshee (1.7.2-1ubuntu3) maverick; urgency=low
-
-  * debian/patches/06_add-meego-desktop-file.patch,
-    debian/banshee-meego.install:
-    - desktop file is now called banshee-1 and installed
-    in usr/share/une/applications/ to show the une desktop file in UNE
-    session only
-
- -- Didier Roche <didrocks at ubuntu.com>  Tue, 20 Jul 2010 12:23:28 +0200
-
-banshee (1.7.2-1ubuntu2) maverick; urgency=low
-
-  * add debian/patches/08_remove_unrelevant_media.patch:
-    Don't show "media" in netbook interface as this is unrelevant on non
-    meego interface (LP: #602759)
-
- -- Didier Roche <didrocks at ubuntu.com>  Mon, 12 Jul 2010 18:39:36 +0200
-
-banshee (1.7.2-1ubuntu1) maverick; urgency=low
-
-  * Merge from Debian Experimental, remaining changes:
-    + debian/patches:
-      - 01_Debranch-netbook-interface.patch: Debrand the netbook interface
-      - 02_only-show-netbook-panel-on-request.patch: Only show netbook
-        interface on --client=Meego and start traditional interface
-        otherwise
-      - 03_quit-only-on-explicit-shutdown-request.patch: Quit on explicit
-        shutdown request only
-      - 04_enable-switching-between-the-2-interfaces.patch: Enable
-        switching between netbook and traditional interfaces.
-      - 05_show-a-empty-library-message-in-banshee.patch: Show empty hint
-        when starting for the first time with an empty library.
-      - 06_add-meego-desktop-file.patch: Add desktop file to start netbook interface
-      - 07_enable-library-watch-by-default.patch: Enable Library Watcher by default
-    + debian/banshee-meego.install: Install desktop file for Banshee netbook interface
-
- -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 07 Jul 2010 15:54:29 +0800
-
 banshee (1.7.2-1) experimental; urgency=low
 
   [ Iain Lane ]
@@ -873,30 +510,6 @@ banshee (1.7.2-1) experimental; urgency=low
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 02 Jul 2010 02:21:03 +0800
 
-banshee (1.7.1-1ubuntu1) maverick; urgency=low
-
-  * Enhance netbook interface:
-    - debian/patches/01_Debranch-netbook-interface.patch
-      debrand the netbook interface to "Netbook"
-    - debian/patches/02_only-show-netbook-panel-on-request.patch:
-      only show netbook inteface on --client=Meego and start traditional
-      interface otherwise
-    - debian/patches/03_quit-only-on-explicit-shutdown-request.patch:
-      quit on explicit shutdown request only
-    - debian/patches/04_enable-switching-between-the-2-interfaces.patch:
-      switch back and forth beetween the 2 interfaces, even if traditional
-      interface started. Also, have only one interface shown at a time
-    - debian/patches/05_show-a-empty-library-message-in-banshee.patch:
-      show an empty hint when starting the first time and having no library
-      imported (Bertrand Lorentz and Alex Launi)
-    - debian/patches/06_add-meego-desktop-file.patch:
-      add desktop file to start the netbook interface
-  * debian/patches/07_enable-library-watch-by-default.patch:
-    enable library watcher
-  * debian/banshee-meego.install: install the new deskop file
-
- -- Didier Roche <didrocks at ubuntu.com>  Mon, 05 Jul 2010 15:19:53 +0200
-
 banshee (1.7.1-1) experimental; urgency=low
 
   [ Chow Loong Jin ]
diff --git a/debian/patches/11_reduce_cpu_usage.patch b/debian/patches/11_reduce_cpu_usage.patch
deleted file mode 100644
index 310dc76..0000000
--- a/debian/patches/11_reduce_cpu_usage.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit cdff2efe25758edc9ce33d0feb62e6e635273e8d
-Author: Gabriel Burt <gabriel.burt at gmail.com>
-Date:   Fri Apr 8 11:42:36 2011 -0500
-
-    StreamPositionLabel: Avoid unnecessary redraws (bgo#647144)
-    
-    Ignore attempts to set the label to its current value.
-
-diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs
-index fdb1293..a31a21c 100644
---- a/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs
-+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs
-@@ -174,12 +174,14 @@ namespace Banshee.Widgets
-             }
-         }
- 
-+        private string last_text;
-         private void UpdateLabel (string text)
-         {
--            if (!IsRealized || layout == null) {
-+            if (!IsRealized || layout == null || text == last_text) {
-                 return;
-             }
- 
-+            last_text = text;
-             layout.SetMarkup (String.Format (format_string, GLib.Markup.EscapeText (text)));
-             QueueResize ();
-         }
-
-commit fb9cb9970cb0b35f5bee0d543e6622b4e2dcbcad
-Author: Christopher James Halse Rogers <chrishr at src.gnome.org>
-Date:   Fri Apr 8 16:34:37 2011 +1000
-
-    StreamPositionLabel: Drop unnecessary redraws (bgo#647144)
-    
-    UpdateLabel calls QueueResize, which causes an expose event anyway.
-    
-    Signed-off-by: Gabriel Burt <gabriel.burt at gmail.com>
-
-diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs
-index e8e3748..fdb1293 100644
---- a/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs
-+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs
-@@ -202,7 +202,6 @@ namespace Banshee.Widgets
-             set {
-                 buffering_progress = Math.Max (0.0, Math.Min (1.0, value));
-                 UpdateLabel ();
--                QueueDraw ();
-             }
-         }
- 
-@@ -228,7 +227,6 @@ namespace Banshee.Widgets
-                 if (state != value) {
-                     state = value;
-                     UpdateLabel ();
--                    QueueDraw ();
-                 }
-             }
-         }
-@@ -239,7 +237,6 @@ namespace Banshee.Widgets
-                 if (is_live != value) {
-                     is_live = value;
-                     UpdateLabel ();
--                    QueueDraw ();
-                 }
-             }
-         }
diff --git a/debian/patches/series b/debian/patches/series
index f8ab466..767b4c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,4 @@
 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
-90_amazon_url.patch
-91_u1ms-initialize-earlier.patch
 99_ltmain_as-needed.patch

-- 
banshee



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