[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/unstable/lucid, updated. debian/2.0.1-1ubuntu1-162-g0a47d28

Chow Loong Jin hyperair at ubuntu.com
Sat May 14 17:42:47 UTC 2011


The following commit has been merged in the ppa/unstable/lucid branch:
commit a9ac93c668fba9ae45fec88705d2ed9bf7291ad0
Merge: 8cdbfa9ad24d6d1a62b241294210ba218efd5c22 1c7d1e6edf7b614a8e65480d1698f89110f13738
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sun May 15 01:03:58 2011 +0800

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

diff --combined debian/changelog
index ecf1c6c,9a1e9cb..f2d4c18
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,193 +1,203 @@@
+ banshee (2.1.0-1ubuntu1~hyper1+maverick) maverick; urgency=low
+ 
+   * Merge from Natty, remaining changes:
+     - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+     - [c31d919] Revert rename of libwebkit-dev
+   * [1e7ce76] Disable U1MS
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 15 May 2011 00:52:25 +0800
+ 
+ banshee (2.1.0-1ubuntu1~hyper1+natty) natty; urgency=low
+ 
+   * Backport to Natty
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 14 May 2011 22:34:56 +0800
+ 
+ banshee (2.1.0-1ubuntu1~hyper1+oneiric) oneiric; urgency=low
+ 
+   * Backport to Oneiric, changes:
+     + Re-enable boo and karma
+     + Drop amazon URL patch
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 14 May 2011 22:29:16 +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) UNRELEASED; urgency=low
+ 
+   * [6b1b0d2] New upstream release:
+     + New features:
+       - eMusic store
+     + Enhancements:
+       - ArtworkManager: add --fetch-artwork argument
+       - bgo#647754: Xperia X12 support
+       - bgo#508713: MiniMode: Reduce height of window
+       - bgo#648941: Support .spc files
+       - bgo#649401: Set UserAgent when doing MusicBrainz queries
+     + Notable bug fixes:
+       - Windows installer fixes
+       - bgo#647059: Fix Remote Daap crash
+       - bgo#647089: Daap: Bind to IPAddress.Loopback instead of Any
+         (LP: #753986)
+       - bgo#644648: libbanshee fixes
+       - bgo#642113: Change Remote dialog's button from Ok to Add
+       - bgo#647144: StreamPositionLabel fixes
+       - AmazonMp3.Store: Fix signed-in detection for UK store
+       - bgo#633552: AppleDevice: Ensure m4a/mp3 are supported
+       - bgo#634647: Have ctrl-a select text in SearchEntry
+       - bgo#642140: Last.fm: Close HTTP streams when finished with them
+       - bgo#648133: build: Don't delete gnome-doc-utils.make during distclean
+       - bgo#647932: DatabaseSource: Fix NRE in SkipTrackIfRemoved
+       - bgo#646991: AlbumListView: Fix disappearing option in Preferences
+       - bgo#647024: Lastfm: Fix NRE crash
+       - bgo#636057: Fix rendering glitch
+       - PodcastFeedPropertiesDialog: Fix display of feed URL
+       - bgo#648458: PlsPlaylistFormat: Make parsing the header case-insensitive
+       - bgo#611489: GStreamer: Use Banshee.IO instead of System.IO
+       - bgo#641748: ViewActions: enable eq once we know backend supports it
+       - bgo#638889: Banshee.Services: Avoid creating dupes after moves
+   * [227b3ca] Add new GNOME URL to debian/watch
+   * [89f38cb] Bump build depends to match build system changes
+   * [b384a5b] Drop obsolete configure flags
+   * [ca2a400] Provide banshee-{api,asm}-* virtual packages
+   * [741d31a] Workaround clideps issue
+   * [287ec44] Workaround meego panel clideps failure
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 14 May 2011 22:06:44 +0800
+ 
+ banshee (2.0.1-1ubuntu1~hyper1+oneiric) oneiric; urgency=low
+ 
+   * [b0e67d0] Merge from Ubuntu Oneiric:
+     + [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>  Thu, 05 May 2011 10:07:25 +0800
+ 
+ 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
+   * [5dcec7d] New upstream release:
+     + AmazonMp3.Store: Fix signed-in detection for UK store
+     + PodcastFeedPropertiesDialog: Fix display of feed URL (underscore)
+     + bgo#648941: Add .spc to whitelist
+     + bgo#648458: PlsPlaylistFormat: Make parsing the header case+insensitive
+     + bgo#647754: Add USB ids for Xperia X12
+     + bgo#647024: Lastfm: Fix NRE crash
+     + bgo#646991: AlbumListView: Fix disappearing option in Preferences
+     + bgo#647932: DatabaseSource: Fix NRE in SkipTrackIfRemoved
+     + bgo#642140: Last.fm: Close HTTP streams when finished with them
+     + bgo#633552: AppleDevice: Ensure m4a/mp3 are supported
+     + bgo#647144: StreamPositionLabel: Avoid unnecessary redraws
+     + bgo#647089: Daap: Bind to IPAddress.Loopback instead of Any (LP: #753986)
+     + bgo#647059: Fix Remote Daap crash
+   * [5bd47d1] Drop upstreamed 10_bind-to-loopback-for-daap
+   * [a853ad8] Drop upstreamed 11_reduce_cpu_usage.patch
+ 
+  -- 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 ]
+   * [8ee2dd2] Set compression to bz2
+   * [0ffc007] Disable dh_makeclilibs
+   * [a9bdd15] Update copyright file to dep-5
+   * [8c123e8] Don't enable librarywatcher by default (LP: #760902, #622313)
+   * [0d952b6] Refresh 08_remove_unrelevant_media.patch
+ 
+   [ Christopher James Halse Rogers ]
+   * [5809dc3] Cherry-pick CPU-usage reduction patches from stable-2.0
+   * [920dd3e] Bump GIO# build-depend to ensure we build against the fixed
+     package
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 16 Apr 2011 18:51:30 +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+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+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>  Thu, 07 Apr 2011 00:27:31 +0800
 +
  banshee (2.0.0-1ubuntu1~hyper1+maverick) maverick; urgency=low
  
    * Merge from Natty, remaining changes:
@@@ -35,8 -215,9 +225,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
@@@ -49,18 -230,12 +240,22 @@@
        - 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+lucid) lucid; urgency=low
 +
 +  * [77b9996] Merge from Maverick, remaining changes
 +    + [aed3a69] Disable soundmenu extension from building
 +    + [a24ddc3] Drop soundmenu related patches
 +    + [9d0f757] Drop libgtk2.0-dev >= 2.22 dependency
 +  * [874b3e2] Drop libindicate0.1-cil-dev (soundmenu not built)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 25 Mar 2011 22:28:12 +0800
 +
  banshee (1.9.6-1ubuntu1~hyper1+maverick) maverick; urgency=low
  
    * Merge from Natty, remaining changes:
@@@ -124,15 -299,6 +319,15 @@@ banshee (1.9.6-1) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 26 Mar 2011 00:48:41 +0800
  
 +banshee (1.9.5-1ubuntu1~hyper1+lucid1) lucid; urgency=low
 +
 +  * Merge from Maverick, remaining changes
 +    + [aed3a69] Disable soundmenu extension from building
 +    + [a24ddc3] Drop soundmenu related patches
 +    + [9d0f757] Drop libgtk2.0-dev >= 2.22 dependency
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 13 Mar 2011 20:01:55 +0800
 +
  banshee (1.9.5-1ubuntu1~hyper1+maverick1) maverick; urgency=low
  
    * Merge from Natty, remaining changes:
@@@ -148,15 -314,6 +343,15 @@@ banshee (1.9.5-1ubuntu1~hyper1+natty1) 
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 13 Mar 2011 19:46:33 +0800
  
 +banshee (1.9.5-1ubuntu1~hyper1+lucid) lucid; urgency=low
 +
 +  * Merge from Maverick, remaining changes
 +    + [aed3a69] Disable soundmenu extension from building
 +    + [a24ddc3] Drop soundmenu related patches
 +    + [9d0f757] Drop libgtk2.0-dev >= 2.22 dependency
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 11 Mar 2011 02:01:19 +0800
 +
  banshee (1.9.5-1ubuntu1~hyper1+maverick) maverick; urgency=low
  
    * Merge from Natty, remaining changes:
@@@ -209,15 -366,6 +404,15 @@@ banshee (1.9.4-1ubuntu2) natty; urgency
  
   -- Rodney Dawes <rodney.dawes at ubuntu.com>  Mon, 28 Feb 2011 14:06:16 -0500
  
 +banshee (1.9.4-1ubuntu1~hyper1+lucid) lucid; urgency=low
 +
 +  * Merge from Maverick, remaining changes
 +    + [aed3a69] Disable soundmenu extension from building
 +    + [a24ddc3] Drop soundmenu related patches
 +    + [9d0f757] Drop libgtk2.0-dev >= 2.22 dependency
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 24 Feb 2011 01:56:10 +0800
 +
  banshee (1.9.4-1ubuntu1~hyper1+maverick) maverick; urgency=low
  
    * Merge from Natty, remaining changes:
@@@ -278,15 -426,6 +473,15 @@@ banshee (1.9.3-2) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 13 Feb 2011 18:53:16 +0800
  
 +banshee (1.9.3-1ubuntu1~hyper1+lucid) lucid; urgency=low
 +
 +  * Merge from Maverick, remaining changes:
 +    + [aed3a69] Disable soundmenu extension from building
 +    + [a24ddc3] Drop soundmenu related patches
 +    + [9d0f757] Drop libgtk2.0-dev >= 2.22 dependency
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 03 Feb 2011 22:23:33 +0800
 +
  banshee (1.9.3-1ubuntu1~hyper1+maverick) maverick; urgency=low
  
    * [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
@@@ -347,15 -486,6 +542,15 @@@ banshee (1.9.2-1ubuntu1) natty; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 24 Jan 2011 22:17:31 +0800
  
 +banshee (1.9.2-1ubuntu1~hyper1+lucid) lucid; urgency=low
 +
 +  * Merge from Maverick, remaining changes:
 +    + [aed3a69] Disable soundmenu extension from building
 +    + [a24ddc3] Drop soundmenu related patches
 +  * [9d0f757] Drop libgtk2.0-dev >= 2.22 dependency
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 14 Jan 2011 00:50:52 +0800
 +
  banshee (1.9.2-1ubuntu1~hyper1+maverick) maverick; urgency=low
  
    * No change backport to PPA
@@@ -416,14 -546,6 +611,14 @@@ banshee (1.9.1-1ubuntu3) natty; urgency
  
   -- Robert Ancell <robert.ancell at canonical.com>  Mon, 10 Jan 2011 15:37:55 -0600
  
 +banshee (1.9.1-1ubuntu2~hyper1+lucid) lucid; urgency=low
 +
 +  * Merge from Maverick, remaining changes:
 +    + [aed3a69] Disable soundmenu extension from building
 +    + [a24ddc3] Drop soundmenu related patches
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 27 Dec 2010 11:19:24 +0800
 +
  banshee (1.9.1-1ubuntu2~hyper1+maverick) maverick; urgency=low
  
    * No change backport to PPA
@@@ -442,13 -564,6 +637,13 @@@ banshee (1.9.1-1ubuntu2~hyper1+natty) n
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 27 Dec 2010 11:07:40 +0800
  
 +banshee (1.9.1-1ubuntu1~hyper1+lucid) lucid; urgency=low
 +
 +  * Merge from Maverick, remaining changes:
 +    + [aed3a69] Disable soundmenu extension from building
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 24 Dec 2010 23:17:00 +0800
 +
  banshee (1.9.1-1ubuntu1~hyper1+maverick) maverick; urgency=low
  
    * No change backport to PPA
@@@ -570,14 -685,6 +765,14 @@@ banshee (1.9.0+git20101121.r1.b13266e-0
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 21 Nov 2010 12:21:02 +0800
  
 +banshee (1.9.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
 +
 +  * Backport to Lucid, changes:
 +    + Drop banshee-extension-soundmenu recommends, since Sound Menu is not
 +      in Lucid
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Nov 2010 02:14:23 +0800
 +
  banshee (1.9.0-1ubuntu1~hyper1+maverick) maverick; urgency=low
  
    * Backport to Maverick
@@@ -661,11 -768,11 +856,11 @@@ banshee (1.8.0-2ubuntu1) natty; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 22 Oct 2010 01:53:21 +0800
  
 -banshee (1.8.0-1ubuntu1~hyper1+maverick) maverick; urgency=low
 +banshee (1.8.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
  
 -  * No change upload to Maverick PPA
 +  * No change backport to Lucid
  
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 01 Oct 2010 03:40:04 +0800
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 01 Oct 2010 03:13:46 +0800
  
  banshee (1.8.0-2) experimental; urgency=low
  
@@@ -673,12 -780,6 +868,12 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 21 Oct 2010 18:53:54 +0800
  
 +banshee (1.8.0-1ubuntu1~hyper1+maverick) maverick; urgency=low
 +
 +  * No change upload to Maverick PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 01 Oct 2010 03:40:04 +0800
 +
  banshee (1.8.0-1) experimental; urgency=low
  
    * New upstream release
@@@ -694,12 -795,6 +889,12 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 01 Oct 2010 02:41:41 +0800
  
 +banshee (1.7.6-0ubuntu1~hyper1+lucid) lucid; urgency=low
 +
 +  * No change backport to Lucid
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 20 Sep 2010 01:46:43 +0800
 +
  banshee (1.7.6-0ubuntu1) maverick; urgency=low
  
    * New upstream release
@@@ -776,12 -871,6 +971,12 @@@ 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+lucid) lucid; urgency=low
 +
 +  * No change backport to Lucid
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 09 Sep 2010 03:25:36 +0800
 +
  banshee (1.7.5-0ubuntu2) maverick; urgency=low
  
    * Fix casing of variable in patch, resolving missing dllmap issue
@@@ -851,12 -940,6 +1046,12 @@@ 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~lucid1) lucid; urgency=low
 +
 +  * No change backport to Lucid
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 13 Aug 2010 18:01:12 +0800
 +
  banshee (1.7.4-1ubuntu1~maverick1) maverick; urgency=low
  
    * No change backport to Maverick
@@@ -959,12 -1042,6 +1154,12 @@@ banshee (1.7.3-2) experimental; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 24 Jul 2010 04:44:30 +0800
  
 +banshee (1.7.3-1ubuntu1~hyper1+lucid) lucid; urgency=low
 +
 +  * No change backport to Lucid
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 24 Jul 2010 00:34:30 +0800
 +
  banshee (1.7.3-1ubuntu1) maverick; urgency=low
  
    * Merge from Debian Experimental, remaining changes:
@@@ -1156,12 -1233,6 +1351,12 @@@ 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~lucid1) lucid; urgency=low
 +
 +  * No change upload to PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 31 May 2010 21:08:41 +0800
 +
  banshee (1.7.1-1) experimental; urgency=low
  
    [ Chow Loong Jin ]
@@@ -1192,12 -1263,6 +1387,12 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 27 May 2010 18:14:20 +0800
  
 +banshee (1.7.1-1~hyper1~lucid) lucid; urgency=low
 +
 +  * No change upload to PPA
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 28 May 2010 03:42:18 +0800
 +
  banshee (1.7.1-1~hyper1~maverick1) maverick; urgency=low
  
    * Split MeeGo out into its own package
@@@ -1210,12 -1275,6 +1405,12 @@@ 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~lucid) lucid; urgency=low
 +
 +  * No change upload to lucid
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 08 May 2010 07:08:00 +0800
 +
  banshee (1.7.0-1) experimental; urgency=low
  
    * New upstream release:
@@@ -1250,12 -1309,6 +1445,12 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 07 May 2010 23:27:08 +0800
  
 +banshee (1.6.1-1~hyper1~lucid) lucid; urgency=low
 +
 +  * No change backport to Lucid.
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 27 May 2010 18:55:34 +0800
 +
  banshee (1.6.1-1) unstable; urgency=low
  
    * New bugfix upstream release:
@@@ -1285,19 -1338,6 +1480,19 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 20 May 2010 00:43:45 +0800
  
 +banshee (1.6.0-1~hyper1~lucid1) lucid; urgency=low
 +
 +  * No change version bump. Previous version was oudated and missing the
 +    --disable-clutter flag.
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 03 Apr 2010 18:44:59 +0800
 +
 +banshee (1.6.0-1~hyper1~lucid) lucid; urgency=low
 +
 +  * No change backport to Lucid
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 02 Apr 2010 00:58:50 +0800
 +
  banshee (1.6.0-1) unstable; urgency=low
  
    * New upstream release:
@@@ -1322,12 -1362,6 +1517,12 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 02 Apr 2010 03:12:16 +0800
  
 +banshee (1.5.6-1~hyper1~lucid) lucid; urgency=low
 +
 +  * No change backport to Lucid
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 22 Mar 2010 16:45:41 +0800
 +
  banshee (1.5.6-1) unstable; urgency=low
  
    * New upstream release:
@@@ -1363,12 -1397,6 +1558,12 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 21 Mar 2010 21:22:57 +0800
  
 +banshee (1.5.5-1~hyper1~lucid) lucid; urgency=low
 +
 +  * No change backport to Lucid
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 20 Mar 2010 15:54:18 +0800
 +
  banshee (1.5.5-1) unstable; urgency=low
  
    * New upstream release
diff --combined debian/control
index f59c552,074f75f..0542701
--- a/debian/control
+++ b/debian/control
@@@ -11,22 -11,22 +11,21 @@@ Build-Depends: debhelper (>= 7.0.50)
                 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),
+                libdbus1.0-cil-dev (>= 0.7),
+                libdbus-glib1.0-cil-dev (>= 0.5),
                 libmono-addins-cil-dev (>= 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),
+                libglib2.0-cil-dev (>= 2.12.10),
                 libgtk2.0-cil-dev (>= 2.12),
                 libgconf2.0-cil-dev,
                 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),
 -               libindicate0.1-cil-dev (>= 0.4.1),
                 libkarma-cil-dev (>= 0.0.5),
-                libubuntuone1.0-cil-dev (>= 0.3.2),
                 libwebkit-dev (>= 1.2.2),
                 libsoup2.4-dev (>= 2.26),
                 libsoup-gnome2.4-dev (>= 2.26),
@@@ -37,18 -37,18 +36,18 @@@
                 gconf2,
                 libglib2.0-dev,
                 libwnck-dev,
-                libgtk2.0-dev (>= 2.8),
+                libgtk2.0-dev (>= 2.12.10),
  #               libclutter-1.0-dev (>= 1.0.1),
                 libx11-dev,
                 libxrandr-dev (>= 2:1.1.1),
                 libxxf86vm-dev (>= 1:1.0.1),
-                libgstreamer0.10-dev (>= 0.10.23),
+                libgstreamer0.10-dev (>= 0.10.26),
                 libgstreamer-plugins-base0.10-dev (>= 0.10.26),
                 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
@@@ -62,12 -62,14 +61,13 @@@ Depends: ${shlibs:Depends}
           gnome-icon-theme (>= 2.16)
  Recommends: brasero,
              avahi-daemon,
-             banshee-extension-ubuntuonemusicstore (=${binary:Version}),
 -            banshee-extension-soundmenu (=${binary:Version}),
              media-player-info
  Suggests: gstreamer0.10-plugins-bad,
            gstreamer0.10-plugins-ugly,
            gstreamer0.10-ffmpeg,
            banshee-dbg (=${binary:Version})
+ Provides: banshee-api-${banshee:API},
+           banshee-asm-${banshee:ASM}
  Breaks: banshee-extensions-common (<< 1.6.1-2.)
  Description: Media Management and Playback application
   Banshee is a media management and playback application for the GNOME
@@@ -76,22 -78,22 +76,6 @@@
   and other media devices, play and manage video files and burn selections
   to a CD.
  
- Package: banshee-extension-ubuntuonemusicstore
- Architecture: any
- Depends: banshee (>= ${source:Upstream-Version}),
-          ${cli:Depends},
-          ${shlibs:Depends},
-          ${misc:Depends}
- Enhances: banshee
- Description: Media Management and Playback application - U1MS extension
-  Banshee is a media management and playback application for the GNOME
-  desktop, allowing users to import audio from CDs, search their library,
-  create playlists of selections of their library, sync music to/from iPods
-  and other media devices, play and manage video files and burn selections
-  to a CD.
-  .
-  This package contains Banshee's support for the Ubuntu One Music Store
- 
 -Package: banshee-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/gbp.conf
index 18ce884,291580d..43bb29a
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,3 -1,4 +1,4 @@@
  [DEFAULT]
 -debian-branch = ppa/unstable/maverick
 +debian-branch = ppa/unstable/lucid
  upstream-branch = upstream-experimental
+ compression = bzip2
diff --combined debian/patches/series
index 8cacd23,31d6123..c04e208
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -2,10 -2,12 +2,10 @@@
  02_only-show-netbook-panel-on-request.patch
  03_quit-only-on-explicit-shutdown-request.patch
  04_enable-switching-between-the-2-interfaces.patch
- 05_show-a-empty-library-message-in-banshee.patch
  06_add-meego-desktop-file.patch
- 07_enable-library-watch-by-default.patch
  07_enable-mpris-by-default.patch
 -07_disable-notification-area-by-default.patch
 -07_enable-soundmenu-by-default.patch
  08_remove_unrelevant_media.patch
  0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
+ workaround-clideps-winmm.patch
+ workaround-clideps-meego.patch
  99_ltmain_as-needed.patch
diff --combined debian/rules
index 7df2094,8b98d0f..d93b0c0
--- a/debian/rules
+++ b/debian/rules
@@@ -4,6 -4,9 +4,9 @@@ include /usr/share/cli-common/cli.mak
  
  LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
  
+ BANSHEE_API_VERSION = $(shell grep API_VERSION= configure | cut -f2 -d=)
+ BANSHEE_ASM_VERSION = $(shell grep ASM_VERSION= configure | cut -f2 -d=)
+ 
  CONFFLAGS = \
  	--disable-static \
  	--disable-tests \
@@@ -14,20 -17,17 +17,17 @@@
  	--enable-user-help \
  	--enable-docs \
  	--enable-youtube \
- 	--disable-hal \
  	--enable-gio \
  	--disable-moonlight \
  	--enable-gnome \
  	--enable-schemas-install \
  	--enable-mtp \
  	--enable-appledevice \
- 	--disable-ipod \
  	--enable-daap \
  	--disable-remote-audio \
  	--disable-torrent \
  	--enable-meego \
  	--enable-gapless-playback \
- 	--enable-podcast \
  	--enable-release \
  	--disable-shave \
  	MCS=/usr/bin/mono-csc LDFLAGS="$(LDFLAGS)"
@@@ -36,8 -36,8 +36,8 @@@ ifeq ($(shell dpkg-vendor --query vendo
  CONFFLAGS += \
  	--enable-boo \
  	--enable-karma \
 -	--enable-soundmenu \
 +	--disable-soundmenu \
- 	--enable-ubuntuone
+ 	--disable-ubuntuone
  else
  CONFFLAGS += \
  	--enable-boo \
@@@ -65,6 -65,9 +65,9 @@@ override_dh_strip
  override_dh_clistrip:
  	dh_clistrip --dbg-package=banshee-dbg
  
+ # disable dh_makeclilibs for weird signed libraries
+ override_dh_makeclilibs:
+ 
  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,7 -80,7 +80,6 @@@
  	      debian/banshee/usr/share/dbus-1/services/com.meego*
  ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
  	# Remove U1MS and Sound Menu stuff from banshee
- 	rm -r debian/banshee/usr/lib/banshee/Extensions/Banshee.UbuntuOneMusicStore.*
 -	rm -r debian/banshee/usr/lib/banshee/Extensions/Banshee.SoundMenu.*
  	cd po; intltool-update --pot
  
  	for d in $$(find debian/ -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \
@@@ -86,5 -89,11 +88,11 @@@
  	done
  endif
  
+ override_dh_gencontrol:
+ 	dh_gencontrol -- \
+ 		-V"banshee:API=$(BANSHEE_API_VERSION)" \
+ 		-V"banshee:ASM=$(BANSHEE_ASM_VERSION)"
+ 
+ 
  %:
  	dh $@

-- 
banshee



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