[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/precise, updated. debian/2.4.1-1-167-g53a1366

Chow Loong Jin hyperair at debian.org
Sat Jun 2 21:14:18 UTC 2012


The following commit has been merged in the ubuntu/precise branch:
commit 315311a3f5ea1fe7d644705727ddef42dd114b07
Merge: 2943e66e0c54411598f47e5630da5a238e6e384b 494eda68915f80271563f5b3579e6d4cf437d0e4
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sat Jun 2 13:02:44 2012 +0800

    Merge branch 'master' into ubuntu/quantal
    
    Conflicts:
    	debian/banshee-meego.install
    	debian/patches/series
    	debian/rules

diff --combined debian/banshee-meego.install
index 8741539,f83dd3a..b79c0c6
--- a/debian/banshee-meego.install
+++ b/debian/banshee-meego.install
@@@ -1,4 -1,4 +1,3 @@@
- debian/tmp/usr/lib/banshee/MeeGo.exe
- debian/tmp/usr/lib/banshee/Extensions/Banshee.MeeGo.dll*
+ debian/tmp/usr/lib/*/banshee/MeeGo.exe
+ debian/tmp/usr/lib/*/banshee/Extensions/Banshee.MeeGo.dll*
 -debian/tmp/usr/share/mutter-meego
 -debian/tmp/usr/share/dbus-1/services/com.meego*
 +debian/tmp/usr/share/mutter-meego/panels/banshee.desktop usr/share/une/applications
- debian/tmp/usr/share/dbus-1/services/com.meego*
diff --combined debian/changelog
index a92af88,f5bce79..d5e3e64
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,34 +1,56 @@@
+ banshee (2.4.1-1) unstable; urgency=low
+ 
+   * [856d4d6] New upstream bugfix release:
+     - Migo.Syndication: Handle feeds with malformed enclosure URLs
+     - bgo#626659: ServiceManager: check properly if a service is required
+     - bgo#634758: PlaylistSource: Make sure the right tracks are removed
+       (LP: #785822)
+     - bgo#662909: PlaylistParser: Retry HTTP request after timeout
+       (Closes: #546749, LP: #785304)
+     - bgo#666696: DapSource: Flush pending changes when quitting
+     - bgo#672744: UPnPServerSource: Fix crash when getting the root object
+       (LP: #785822)
+     - bgo#673037: libossifer: Fix certificate validation with libsoup 2.38
+     - bgo#673416: DbIteratorJob: Abort job after several consecutive failures
+     - bgo#676144: PlayQueueSource: Fix high memory usage when shuffling
+   * debian/(control, compat):
+     - [a46c8f0] Bump debhelper compat to 9 for buildflags
+   * debian/(Banshee.GStreamer.dll.config, Banshee.NowPlaying.X11.dll.config):
+     - [437c092] Drop downstream dll.config files
+   * debian/(*.install, rules):
+     - [9e1d4c4] Use multiarch libdir
+   * debian/patches, debian/rules:
+     - [39056ef] Drop upstreamed 0013-UPnPServerSource-….patch
+     - [e34d9f3] Drop patch numbers and refresh
+     - [028167e] Drop moduleref-removing patches.
+       Use --exclude-moduleref instead.
+     - [0403c98] Patch to add Banshee.NowPlaying.X11.dll.config
+     - [ad971c3] Fix missing \ in Add-Meego-desktop-file.patch
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Fri, 01 Jun 2012 17:36:21 +0800
+ 
 +banshee (2.4.0-2ubuntu2) quantal; urgency=low
 +
 +  * [ccbcbbd] Make Banshee translatable in Launchpad
 +    - Add X-Ubuntu-Langpack-Use-Langpack: yes
 +    - Use dh-translations
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Sat, 26 May 2012 17:13:43 +0800
 +
 +banshee (2.4.0-2ubuntu1) precise; urgency=low
 +
 +  * [980ad3d] Merge from Debian Unstable, remaining changes:
 +    + Enable and recommend SoundMenu and Disable NotificationArea by default
 +    + Disable boo and karma extensions
 +    + Move desktop file for Meego UI to /usr/share/une/applications
 +    + Change the url for the Amazon store redirector
 +    * [9b356d6] Add workaround for set_Height exception.
 +  * [57afffa] Reexport patches via gbp-pq.
 +    The numbering of the Ubuntu specific patches have been upset due to the new
 +    patches imported into the previous Debian revision.
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Fri, 20 Apr 2012 23:34:40 +0800
 +
  banshee (2.4.0-2) unstable; urgency=low
  
    * d/patches:
@@@ -35,32 -44,6 +66,32 @@@
  
   -- Chow Loong Jin <hyperair at debian.org>  Fri, 20 Apr 2012 21:40:13 +0800
  
 +banshee (2.4.0-1ubuntu3) precise; urgency=low
 +
 +  * [9b356d6] Add workaround for set_Height exception.
 +    This patch was previously added to the Oneiric release but left out of
 +    Precise to facilitate further testing of the bug. (LP: #873787)
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Sat, 24 Mar 2012 05:37:04 +0800
 +
 +banshee (2.4.0-1ubuntu2) precise; urgency=low
 +
 +  * Rebuild against mono-upnp 0.1.1
 +  * [883fec1] Bump version of mono-upnp build-dep version.
 +    This fixes a crasher when the UPnP extension is enabled. (LP: #945566)
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Fri, 23 Mar 2012 01:47:11 +0800
 +
 +banshee (2.4.0-1ubuntu1) precise; urgency=low
 +
 +  * Merge from Debian Experimental, remaining changes:
 +    + Enable and recommend SoundMenu and Disable NotificationArea by default
 +    + Disable boo and karma extensions
 +    + Move desktop file for Meego UI to /usr/share/une/applications
 +    + Change the url for the Amazon store redirector
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Thu, 22 Mar 2012 08:02:27 +0800
 +
  banshee (2.4.0-1) unstable; urgency=low
  
    * [f5c6efc] Imported Upstream version 2.4.0:
@@@ -76,16 -59,6 +107,16 @@@
  
   -- Chow Loong Jin <hyperair at debian.org>  Tue, 20 Mar 2012 17:36:42 +0800
  
 +banshee (2.3.6-1ubuntu1) precise; urgency=low
 +
 +  * Merge from Debian Experimental, remaining changes:
 +    + Enable and recommend SoundMenu and Disable NotificationArea by default
 +    + Disable boo and karma extensions
 +    + Move desktop file for Meego UI to /usr/share/une/applications
 +    + Change the url for the Amazon store redirector
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Sat, 10 Mar 2012 16:48:03 +0800
 +
  banshee (2.3.6-1) experimental; urgency=low
  
    * [8466386] Drop deprecated cli.make usage
@@@ -95,16 -68,6 +126,16 @@@
  
   -- Chow Loong Jin <hyperair at debian.org>  Thu, 08 Mar 2012 12:57:31 +0800
  
 +banshee (2.3.5-1ubuntu1) precise; urgency=low
 +
 +  * Merge from Debian Experimental, remaining changes:
 +    + Enable and recommend SoundMenu and Disable NotificationArea by default
 +    + Disable boo and karma extensions
 +    + Move desktop file for Meego UI to /usr/share/une/applications
 +    + Change the url for the Amazon store redirector
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Sat, 18 Feb 2012 22:17:24 +0800
 +
  banshee (2.3.5-1) experimental; urgency=low
  
    * [e79ef58] Imported Upstream version 2.3.5:
@@@ -133,28 -96,6 +164,28 @@@
  
   -- Chow Loong Jin <hyperair at debian.org>  Fri, 17 Feb 2012 08:13:32 +0800
  
 +banshee (2.3.4.ds-1ubuntu2) precise; urgency=low
 +
 +  * [8406200] Disable Ubuntu One extension.
 +    It requires gtk3 and the mono bindings have been removed.
 +
 + -- Rodney Dawes <rodney.dawes at ubuntu.com>  Wed, 08 Feb 2012 03:14:09 +0800
 +
 +banshee (2.3.4.ds-1ubuntu1) precise; urgency=low
 +
 +  * Merge from Debian Experimental, remaining changes:
 +    + Enable and recommend SoundMenu and Disable NotificationArea by default
 +    + Disable boo and karma extensions
 +    + Enable and suggest u1ms
 +    + Move desktop file for Meego UI to /usr/share/une/applications
 +    + Change the url for the Amazon store redirector
 +    + [08dea2c] Revert "Fix invalid cast causing ftbfs with libgpod"
 +  * [b617fe0] Convert Ubuntu-specific patches to gbp-pq patches
 +  * Also fixes Launchpad bugs:
 +    - Fixes race condition while starting (LP: #766303)
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Mon, 23 Jan 2012 23:16:49 +0800
 +
  banshee (2.3.4.ds-1) unstable; urgency=low
  
    * [c56a9ec] Imported Upstream version 2.3.4
@@@ -169,18 -110,6 +200,18 @@@
  
   -- Chow Loong Jin <hyperair at debian.org>  Fri, 20 Jan 2012 23:37:39 +0800
  
 +banshee (2.3.3-1ubuntu1) precise; urgency=low
 +
 +  * Merge from Debian Experimental, remaining changes:
 +    + Enable and recommend SoundMenu and Disable NotificationArea by default
 +    + Disable boo and karma extensions
 +    + Enable and suggest u1ms
 +    + Move desktop file for Meego UI to /usr/share/une/applications
 +    + Change the url for the Amazon store redirector
 +    + [08dea2c] Revert "Fix invalid cast causing ftbfs with libgpod"
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 26 Dec 2011 01:19:15 +0800
 +
  banshee (2.3.3-1) experimental; urgency=low
  
    * [501b8bd] Imported Upstream version 2.3.3
@@@ -199,18 -128,6 +230,18 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 24 Dec 2011 01:06:46 +0800
  
 +banshee (2.3.2-1ubuntu1) precise; urgency=low
 +
 +  * Merge from Debian Experimental, remaining changes:
 +    + Enable and recommend SoundMenu and Disable NotificationArea by default
 +    + Disable boo and karma extensions
 +    + Enable and suggest u1ms
 +    + Move desktop file for Meego UI to /usr/share/une/applications
 +    + Change the url for the Amazon store redirector
 +    + [08dea2c] Revert "Fix invalid cast causing ftbfs with libgpod"
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 12 Dec 2011 01:40:00 +0800
 +
  banshee (2.3.2-1) experimental; urgency=low
  
    * [8892783] Switch over to xz tarball in debian/watch
@@@ -240,18 -157,6 +271,18 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 01 Dec 2011 10:19:44 +0800
  
 +banshee (2.3.1-1ubuntu1) precise; 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
 +    + Change the url for the Amazon store redirector
 +    + [08dea2c] Revert "Fix invalid cast causing ftbfs with libgpod"
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 08 Nov 2011 13:15:58 +0800
 +
  banshee (2.3.1-1) experimental; urgency=low
  
    * [1b4437e] Bump libgpod-cil-dev build-dep version
@@@ -334,24 -239,6 +365,24 @@@ banshee (2.2.1-1) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 03 Nov 2011 10:00:57 +0800
  
 +banshee (2.2.0-1ubuntu2) oneiric; urgency=low
 +
 +  * [cd59790] Backport patch to add U1MS URI support (LP: #856542)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 23 Sep 2011 12:03:29 +0800
 +
 +banshee (2.2.0-1ubuntu1) oneiric; 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
 +    + Change the url for the Amazon store redirector
 +    + [08dea2c] Revert "Fix invalid cast causing ftbfs with libgpod"
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 21 Sep 2011 13:54:50 +0800
 +
  banshee (2.2.0-1) unstable; urgency=low
  
    [ Chow Loong Jin ]
@@@ -369,20 -256,6 +400,20 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 20 Sep 2011 14:15:54 +0800
  
 +banshee (2.1.4-1ubuntu1) oneiric; 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
 +    + Change the url for the Amazon store redirector
 +  * [5ba1472] Move banshee-extension-ubuntuonemusicstore to Suggests.
 +    Thanks to Rodney Dawes <rodney.dawes at ubuntu.com> (LP: #833824)
 +  * [08dea2c] Revert "Fix invalid cast causing ftbfs with libgpod"
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 15 Sep 2011 02:37:59 +0800
 +
  banshee (2.1.4-1) experimental; urgency=low
  
    * [9c90bff] Imported Upstream version 2.1.4
@@@ -397,19 -270,6 +428,19 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 08 Sep 2011 10:02:04 +0800
  
 +banshee (2.1.3-1ubuntu1) oneiric; urgency=low
 +
 +  * [e356872] 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
 +    + Change the url for the Amazon store redirector
 +    + Create the U1MS widget earlier and bump libu1 requirement
 +    + [9d7c600] Drop upstreamed u1ms-initialize-earlier patch
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 25 Aug 2011 20:48:45 +0800
 +
  banshee (2.1.3-1) experimental; urgency=low
  
    * [6a4942d] Update manpage
@@@ -478,19 -338,6 +509,19 @@@ banshee (2.1.0-2) experimental; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 01 Aug 2011 22:16:48 +0800
  
 +banshee (2.1.0-1ubuntu1) oneiric; urgency=low
 +
 +  * [2396c18] 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
 +    + Change the url for the Amazon store redirector
 +    + Create the U1MS widget earlier and bump libu1 requirement
 +  * [9d7c600] Drop upstreamed u1ms-initialize-earlier patch
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 14 May 2011 22:25:36 +0800
 +
  banshee (2.1.0-1) experimental; urgency=low
  
    * [6b1b0d2] New upstream release:
@@@ -565,19 -412,6 +596,19 @@@ banshee (2.0.1-2) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 10 Jul 2011 09:57:33 +0100
  
 +banshee (2.0.1-1ubuntu1) oneiric; urgency=low
 +
 +  * [327a8d2] 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
 +    + Change the url for the Amazon store redirector
 +    + Create the U1MS widget earlier and bump libu1 requirement
 +  * [2ca3f6a] Refresh 90_amazon_url.patch
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 06 May 2011 17:00:03 +0800
 +
  banshee (2.0.1-1) unstable; urgency=low
  
    * [5f2e8a7] Switch over to bz2 in debian/watch
@@@ -600,18 -434,6 +631,18 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 03 May 2011 21:42:30 +0800
  
 +banshee (2.0.0-2ubuntu1) natty; urgency=low
 +
 +  * [d07fe37] 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
 +    + Change the url for the Amazon store redirector
 +    + Create the U1MS widget earlier and bump libu1 requirement
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 18 Apr 2011 11:38:56 +0800
 +
  banshee (2.0.0-2) unstable; urgency=low
  
    [ Chow Loong Jin ]
@@@ -628,35 -450,6 +659,35 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 16 Apr 2011 18:51:30 +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) 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 ]
@@@ -678,18 -471,6 +709,18 @@@
  
   -- 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)
@@@ -724,16 -505,6 +755,16 @@@
  
   -- 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)
@@@ -755,23 -526,6 +786,23 @@@
  
   -- 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:
@@@ -792,33 -546,12 +823,33 @@@
  
   -- 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:
@@@ -844,17 -577,6 +875,17 @@@
  
   -- 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
@@@ -896,29 -618,6 +927,29 @@@
  
   -- 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 ]
@@@ -975,59 -674,6 +1006,59 @@@
  
   -- 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
@@@ -1079,16 -725,6 +1110,16 @@@
  
   -- 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)
@@@ -1110,7 -746,7 +1141,7 @@@ 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-1) UNRELEASED; urgency=low
 +banshee (1.7.6-0ubuntu1) maverick; urgency=low
  
    * New upstream release
      + Enhancements:
@@@ -1186,101 -822,6 +1217,101 @@@ 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) 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
@@@ -1313,37 -854,6 +1344,37 @@@
  
   -- 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
@@@ -1351,28 -861,6 +1382,28 @@@
  
   -- 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:
@@@ -1424,44 -912,6 +1455,44 @@@
  
   -- 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 ]
@@@ -1512,30 -962,6 +1543,30 @@@
  
   -- 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 --combined debian/control
index 4bbcdf2,444b4f3..366c058
--- a/debian/control
+++ b/debian/control
@@@ -1,17 -1,16 +1,17 @@@
  Source: banshee
  Section: sound
  Priority: optional
 -Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 +Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 +XSBC-Original-Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
  Uploaders: Sebastian Dröge <slomo at debian.org>, Chow Loong Jin <hyperair at debian.org>
- Build-Depends: debhelper (>= 7.0.50),
+ Build-Depends: debhelper (>= 9),
                 dh-autoreconf,
 +               dh-translations,
                 autotools-dev,
                 cli-common-dev (>= 0.5.7),
                 intltool (>= 0.35),
                 lsb-release,
                 mono-devel (>= 2.4.3),
 -               libboo-cil-dev (>= 0.8.1),
                 libdbus1.0-cil-dev (>= 0.7),
                 libdbus-glib1.0-cil-dev (>= 0.5),
                 libmono-addins-cil-dev (>= 0.6.2),
@@@ -26,6 -25,7 +26,6 @@@
                 libgio2.0-cil-dev (>= 2.22.3-1~),
                 libgtk-sharp-beans2.0-cil-dev (>= 2.8),
                 libgpod-cil-dev (>= 0.8.2),
 -               libkarma-cil-dev (>= 0.0.5),
                 libwebkitgtk-dev (>= 1.2.2) | libwebkit-dev (>= 1.2.2),
                 libsoup2.4-dev (>= 2.26),
                 libsoup-gnome2.4-dev (>= 2.26),
@@@ -51,7 -51,6 +51,7 @@@ Standards-Version: 3.9.
  Homepage: http://www.banshee.fm
  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
 +X-Ubuntu-Use-Langpack: yes
  
  Package: banshee
  Architecture: any
@@@ -64,7 -63,6 +64,7 @@@ Depends: ${shlibs:Depends}
           gnome-icon-theme (>= 2.16)
  Recommends: brasero,
              avahi-daemon,
 +            banshee-extension-soundmenu (=${binary:Version}),
              media-player-info
  Suggests: gstreamer0.10-plugins-bad,
            gstreamer0.10-plugins-ugly,
@@@ -80,22 -78,6 +80,22 @@@ Description: Media Management and Playb
   and other media devices, play and manage video files and burn selections
   to a CD.
  
 +Package: banshee-extension-soundmenu
 +Architecture: any
 +Depends: banshee (>= ${source:Upstream-Version}),
 +         ${cli:Depends},
 +         ${shlibs:Depends},
 +         ${misc:Depends}
 +Enhances: banshee
 +Description: Media Management and Playback application - sound menu 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 Sound Menu
 +
  Package: banshee-meego
  Architecture: any
  Depends: banshee (= ${binary:Version}),
diff --combined debian/patches/series
index 5c97a31,dca2074..e1a60c6
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,17 -1,11 +1,15 @@@
- 0001-Debrand-the-interface-to-Netbook.patch
- 0002-Only-show-panel-on-client-MeeGo-and-don-t-show-when-.patch
- 0003-Quit-only-on-explicit-shutdown-request.patch
- 0004-Enable-switching-between-the-2-interfaces.patch
- 0005-Add-Meego-desktop-file.patch
- 0006-Enable-MPRIS-extension-by-default.patch
- 0007-Remove-irrelevant-media.patch
- 0008-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
- 0009-Drop-unnecessary-winmm-moduleref.patch
- 0010-Drop-unnecessary-libmeego-panel-moduleref.patch
- 0011-Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
- 0012-libossifer-Fix-certificate-validation-with-libsoup-2.patch
- 0013-UPnPServerSource-Fix-crash-when-getting-the-root-obj.patch
+ Debrand-the-interface-to-Netbook.patch
+ Only-show-panel-on-client-MeeGo-and-don-t-show-when-.patch
+ Quit-only-on-explicit-shutdown-request.patch
+ Enable-switching-between-the-2-interfaces.patch
+ Add-Meego-desktop-file.patch
+ Enable-MPRIS-extension-by-default.patch
+ Remove-irrelevant-media.patch
+ Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
+ Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
+ libossifer-Fix-certificate-validation-with-libsoup-2.patch
+ Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch
 +0014-Disable-Notification-area-extension-by-default.patch
 +0015-Enable-sound-menu-extension-by-default.patch
 +0016-Change-Amazon-redirect-url.patch
 +0017-Workaround-for-set_Height-exceptions.patch
diff --combined debian/rules
index 94593a1,c33e2db..dc76610
--- a/debian/rules
+++ b/debian/rules
@@@ -37,7 -37,7 +37,7 @@@ CONFFLAGS += 
  	--disable-boo \
  	--disable-karma \
  	--enable-soundmenu \
 -	--enable-ubuntuone
 +	--disable-ubuntuone
  else
  CONFFLAGS += \
  	--enable-boo \
@@@ -68,6 -68,13 +68,13 @@@ override_dh_clistrip
  # disable dh_makeclilibs for weird signed libraries
  override_dh_makeclilibs:
  
+ override_dh_clideps:
+ 	dh_clideps					\
+ 		--exclude-moduleref=libmeego-panel	\
+ 		--exclude-moduleref=winmm		\
+ 		--exclude-moduleref=libbanshee		\
+ 		--exclude-moduleref=libbnpx11
+ 
  override_dh_install:
  	# make sure we don't include a generated MIME database
  	find debian/tmp/usr/share/mime/ -mindepth 1 -maxdepth 1 -not -name packages -print0 | xargs -0 rm -rf
@@@ -77,12 -84,19 +84,12 @@@
  	dh_install
  	# Remove MeeGo stuff from banshee binary package
  	rm -r debian/banshee/usr/share/mutter-meego/ \
- 	      debian/banshee/usr/lib/banshee/MeeGo.exe \
- 	      debian/banshee/usr/lib/banshee/Extensions/Banshee.MeeGo.dll* \
+ 	      debian/banshee/usr/lib/*/banshee/MeeGo.exe \
+ 	      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.SoundMenu.* 
 -	rm -r debian/banshee/usr/lib/*/banshee/Extensions/Banshee.SoundMenu.* \
 -	      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; \
 -	done
++	rm -r debian/banshee/usr/lib/*/banshee/Extensions/Banshee.SoundMenu.*
  endif
  
  override_dh_gencontrol:
@@@ -94,4 -108,4 +101,4 @@@ override_dh_autoreconf
  	NOCONFIGURE=1 dh_autoreconf --as-needed ./autogen.sh --
  
  %:
 -	dh $@ --with=cli,autoreconf
 +	dh $@ --with=cli,autoreconf,translations

-- 
banshee



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