[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/unstable/karmic, updated. ppa/1.9.1-1ubuntu2.hyper1+karmic-22-g6caf205

Chow Loong Jin hyperair at ubuntu.com
Fri Jan 14 16:44:41 UTC 2011


The following commit has been merged in the ppa/unstable/karmic branch:
commit 9829dbbe2d238e8916be6fc12f488bd8b1a5ba37
Merge: c6b5a300c46436cc7750c0822aa428945a0a35b2 94068977331c2f880bb8b5c694ca073c7118dcdb
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Fri Jan 14 01:05:51 2011 +0800

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

diff --combined debian/changelog
index cfc8a51,4bef76a..29337e4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,77 +1,95 @@@
+ banshee (1.9.2-1ubuntu1~hyper1+lucid) lucid; urgency=low
+ 
+   * Merge from Maverick, remaining changes:
+     + [aed3a69] Disable soundmenu extension from building
+     + [a24ddc3] Drop soundmenu related patches
+   * [9d0f757] Drop libgtk2.0-dev >= 2.22 dependency
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 14 Jan 2011 00:50:52 +0800
+ 
+ banshee (1.9.2-1ubuntu1~hyper1+maverick) maverick; urgency=low
+ 
+   * No change backport to PPA
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 14 Jan 2011 00:38:09 +0800
+ 
+ banshee (1.9.2-1ubuntu1~hyper1+natty) natty; urgency=low
+ 
+   * No change backport to PPA
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 14 Jan 2011 00:35:43 +0800
+ 
+ banshee (1.9.2-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
+   * [0c8acd9] Enable u1ms by default
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 13 Jan 2011 18:06:47 +0800
+ 
+ banshee (1.9.2-1) UNRELEASED; urgency=low
+ 
+   * [df82d8d] Add libgnome-desktop-dev build-dep
+   * [bc58842] New upstream release:
+     + Enhancements:
+       - Add support for Nexus S and Xperia X10 mini pro
+       - Many improvements and fixes to the F1 user guide
+       - SoundMenu: Implement the proper close/quit behavior
+       - MPRIS: Implement the Playlists interface
+       - Improved write-metadata-to-file performance
+     + Notable Bugs Fixed (33 fixed since 1.9.1):
+       - bgo#637333: MeeGo: Fix NRE at start up
+       - bgo#637350: Fix SimpleTable crash
+       - bgo#636077: Fix Podcasts selection bug w/ DAP plugged in
+       - bgo#637366: SmartPlaylistSource: Fix NRE with "selected by random"
+       - bgo#637365: SmartPlaylistSource: Clear the condition when it's not enabled
+       - bgo#637303: FileChooserDialog: Fix error message on first launch
+       - bgo#637627: FullscreenWindow: Keep fullscreen when showing volume osd
+       - bgo#634652: AppleDevice: Remove invalid tracks before syncing
+       - bgo#638477: X11NotificationArea: Enhance check for RGBA visual
+       - bgo#637991: SourceRowRenderer: Fix vertical alignment calculation
+       - bgo#611796: [Preferences] Have source list use theme icon size
+       - bgo#639044: UnknownTrackInfo: Avoid NRE if URI is null
+       - bgo#639032: LastfmStreaming: Delete the Loved stations from the database
+     + Launchpad bugs fixed:
+       - Delete from drive on album/artist will delete entire library (LP: #678113)
+       - TaskStatusIcon being GC'd early causing crashes (LP: #636953)
+       - Songs imported from CD are duplicated in the library (LP: #659364)
+       - Hang when using the mini model (LP: #669857)
+       - First track in an audiobook is played endlessly (LP: #675226)
+       - "Folder contents could not be dislpayed" when importing playlist (LP: #687402)
+       - Unknown Artist/Unknown Album gets overwritten (LP: #348502)
+       - Song continues playing after being deleted (LP: #366893)
+       - Different sizes of music source and music folder icons in preferences
+         dialogue (LP: #683609)
+       - Single tab shown in Properties window (LP: #683617)
+   * [5129ab2] Build-depend on libgtk2.0-dev >= 2.22 for gdk-x11-2.0 check
+   * [f2b0176] Refresh 06_add-meego-desktop-file.patch
+   * [8e8e81f] Drop 09_Fix-issue-with-YOptions-in-SimpleTable.patch
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 13 Jan 2011 16:12:42 +0800
+ 
 +banshee (1.9.1-1ubuntu2~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
 +        gio#, gtk#beans, and libgpod which were backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +      - Drop UbuntuOne
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +      - Drop UbuntuOne
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 27 Dec 2010 11:23:43 +0800
 +
  banshee (1.9.1-1ubuntu2~hyper1+lucid) lucid; urgency=low
  
    * Merge from Maverick, remaining changes:
@@@ -42,24 -98,6 +116,24 @@@ banshee (1.9.1-1ubuntu2) natty; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 27 Dec 2010 10:59:06 +0800
  
 +banshee (1.9.1-1ubuntu1~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
 +        gio#, gtk#beans, and libgpod which were backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +      - Drop UbuntuOne
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +      - Drop UbuntuOne
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 25 Dec 2010 01:30:16 +0800
 +
  banshee (1.9.1-1ubuntu1~hyper1+lucid) lucid; urgency=low
  
    * Merge from Maverick, remaining changes:
@@@ -188,22 -226,6 +262,22 @@@ banshee (1.9.0+git20101121.r1.b13266e-0
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 21 Nov 2010 12:21:02 +0800
  
 +banshee (1.9.0-1ubuntu1~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
 +        gio#, gtk#beans, and libgpod which were backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Nov 2010 03:12:44 +0800
 +
  banshee (1.9.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
  
    * Backport to Lucid, changes:
@@@ -301,22 -323,6 +375,22 @@@ banshee (1.8.0-1ubuntu1~hyper1+lucid) l
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 01 Oct 2010 03:13:46 +0800
  
 +banshee (1.8.0-1ubuntu1~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
 +        gio#, gtk#beans, and libgpod which were backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 01 Oct 2010 03:28:50 +0800
 +
  banshee (1.8.0-2) experimental; urgency=low
  
    * Fix duplicates on import (BGO #623441)
@@@ -344,22 -350,6 +418,22 @@@ banshee (1.8.0-1) experimental; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 01 Oct 2010 02:41:41 +0800
  
 +banshee (1.7.6-0ubuntu1~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
 +        gio#, gtk#beans, and libgpod which were backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 20 Sep 2010 04:31:04 +0800
 +
  banshee (1.7.6-0ubuntu1~hyper1+lucid) lucid; urgency=low
  
    * No change backport to Lucid
@@@ -442,22 -432,6 +516,22 @@@ banshee (1.7.5-1) UNRELEASED; urgency=l
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 18 Sep 2010 01:47:47 +0800
  
 +banshee (1.7.5-0ubuntu2~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
 +        gio#, gtk#beans, and libgpod which were backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 11 Sep 2010 23:05:00 +0800
 +
  banshee (1.7.5-0ubuntu2~hyper1+lucid) lucid; urgency=low
  
    * No change backport to Lucid
@@@ -533,22 -507,6 +607,22 @@@ banshee (1.7.5-0ubuntu1) maverick; urge
  
   -- Iain Lane <laney at ubuntu.com>  Mon, 06 Sep 2010 20:05:45 +0100
  
 +banshee (1.7.4-1ubuntu1~karmic1) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 13 Aug 2010 18:08:25 +0800
 +
  banshee (1.7.4-1ubuntu1~lucid1) lucid; urgency=low
  
    * No change backport to Lucid
@@@ -619,22 -577,6 +693,22 @@@ banshee (1.7.4-1) experimental; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 13 Aug 2010 00:30:24 +0800
  
 +banshee (1.7.3-2ubuntu1~hyper1+karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 24 Jul 2010 22:19:49 +0800
 +
  banshee (1.7.3-2ubuntu2) maverick; urgency=low
  
    * banshee shipped a generated MIME database (/usr/share/mime/*) breaking the
@@@ -870,22 -812,6 +944,22 @@@ banshee (1.7.1-1ubuntu1) maverick; urge
  
   -- Didier Roche <didrocks at ubuntu.com>  Mon, 05 Jul 2010 15:19:53 +0200
  
 +banshee (1.7.1-1~hyper1~karmic1) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 31 May 2010 21:10:46 +0800
 +
  banshee (1.7.1-1~hyper1~lucid1) lucid; urgency=low
  
    * No change upload to PPA
@@@ -898,22 -824,6 +972,22 @@@ banshee (1.7.1-1~hyper1~maverick1) mave
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 31 May 2010 21:03:52 +0800
  
 +banshee (1.7.1-1~hyper1~karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 28 May 2010 04:22:52 +0800
 +
  banshee (1.7.1-1~hyper1~lucid) lucid; urgency=low
  
    * No change upload to PPA
@@@ -956,22 -866,6 +1030,22 @@@ banshee (1.7.1-1) experimental; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 27 May 2010 18:14:20 +0800
  
 +banshee (1.7.0-1~hyper1~karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 08 May 2010 07:19:03 +0800
 +
  banshee (1.7.0-1~hyper1~lucid) lucid; urgency=low
  
    * No change upload to lucid
@@@ -1012,22 -906,6 +1086,22 @@@ banshee (1.7.0-1) experimental; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 07 May 2010 23:27:08 +0800
  
 +banshee (1.6.1-1~hyper1~karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 27 May 2010 18:59:09 +0800
 +
  banshee (1.6.1-1~hyper1~lucid) lucid; urgency=low
  
    * No change backport to Lucid.
@@@ -1070,22 -948,6 +1144,22 @@@ banshee (1.6.0-1~hyper1~lucid1) lucid; 
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 03 Apr 2010 18:44:59 +0800
  
 +banshee (1.6.0-1~hyper1~karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 02 Apr 2010 00:52:53 +0800
 +
  banshee (1.6.0-1~hyper1~lucid) lucid; urgency=low
  
    * No change backport to Lucid
@@@ -1116,22 -978,6 +1190,22 @@@ banshee (1.6.0-1) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 02 Apr 2010 03:12:16 +0800
  
 +banshee (1.5.6-1~hyper1~karmic) karmic; urgency=low
 +
 +  * Merge from Lucid, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 22 Mar 2010 20:33:30 +0800
 +
  banshee (1.5.6-1~hyper1~lucid) lucid; urgency=low
  
    * No change backport to Lucid
@@@ -1173,22 -1019,6 +1247,22 @@@ banshee (1.5.6-1) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 21 Mar 2010 21:22:57 +0800
  
 +banshee (1.5.5-1~hyper1~karmic) karmic; urgency=low
 +
 +  * Merge from unstable, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +      - Revert gst-plugins-base-dev version bump
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +    + debian/rules:
 +      - Disable gapless (gstreamer not new enough)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Mar 2010 03:21:19 +0800
 +
  banshee (1.5.5-1~hyper1~lucid) lucid; urgency=low
  
    * No change backport to Lucid
@@@ -1224,19 -1054,6 +1298,19 @@@ banshee (1.5.5-1) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Mar 2010 03:13:23 +0800
  
 +banshee (1.5.4-1~hyper1~karmic) karmic; urgency=low
 +
 +  * Merge from unstable, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition (except libtaglib2.0-cil which was
 +        backported)
 +      - Use mono-devel 2.4.2.3
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream and
 +        force-enable LibraryWatcher
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 27 Feb 2010 15:54:13 +0800
 +
  banshee (1.5.4-1) unstable; urgency=low
  
    * New upstream release (Closes: #571734)
@@@ -1283,18 -1100,6 +1357,18 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 28 Feb 2010 01:14:01 +0800
  
 +banshee (1.5.4~really1.5.3-0ubuntu1~hyper1~karmic) karmic; urgency=low
 +
 +  * Merge from unstable, remaining changes:
 +    + debian/control:
 +      - Revert -cil-dev transition
 +      - Use mono-devel 2.4.2.3
 +    + debian/patches/02_bundle-inotifywatcher.patch:
 +      - Revert the InotifyWatcher removal commit from upstream, and
 +        force-enable LibraryWatcher
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 29 Jan 2010 00:23:27 +0800
 +
  banshee (1.5.3-1) unstable; urgency=low
  
    [ Chow Loong Jin ]
@@@ -1508,14 -1313,6 +1582,14 @@@ banshee (1.5.0-3) experimental; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 19 Jul 2009 00:22:34 +0800
  
 +banshee (1.5.0-3~hyper1~karmic1) karmic; urgency=low
 +
 +  * Upload to PPA
 +  * debian/gbp.conf:
 +    + Add a gbp.conf to ease git buildpackage work
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 15 Aug 2009 02:10:33 +0800
 +
  banshee (1.5.0-2) experimental; urgency=low
  
    * debian/control:
diff --combined debian/control
index e0e1e29,07439e9..df6ed31
--- a/debian/control
+++ b/debian/control
@@@ -9,25 -9,26 +9,25 @@@ Build-Depends: debhelper (>= 7.0.50)
                 cli-common-dev (>= 0.5.7),
                 intltool (>= 0.35),
                 lsb-release,
 -               mono-devel (>= 2.4.3),
 -               libndesk-dbus1.0-cil-dev (>= 0.5),
 -               libndesk-dbus-glib1.0-cil-dev (>= 0.3),
 -               libmono-addins-cil-dev (>= 0.3.1),
 +               mono-devel (>= 2.4.2.3),
 +               libndesk-dbus1.0-cil (>= 0.5),
 +               libndesk-dbus-glib1.0-cil (>= 0.3),
 +               libmono-addins0.2-cil (>= 0.3.1),
                 libtaglib-cil-dev (>= 2.0.3.7),
 -               libmono-zeroconf-cil-dev (>= 0.7.3),
 -               libnotify-cil-dev,
 -               libglib2.0-cil-dev (>= 2.10),
 -               libgtk2.0-cil-dev (>= 2.12),
 -               libgconf2.0-cil-dev,
 +               libmono-zeroconf1.0-cil (>= 0.7.3),
 +               libnotify0.4-cil,
 +               libglib2.0-cil (>= 2.10),
 +               libgtk2.0-cil (>= 2.12),
 +               libgconf2.0-cil,
                 libgudev1.0-cil-dev (>= 0.1),
                 libgkeyfile-cil-dev (>= 0.1),
                 libgio2.0-cil-dev (>= 2.22),
                 libgtk-sharp-beans2.0-cil-dev (>= 2.8),
                 libgpod-cil-dev (>= 0.7.95),
                 libwebkit-dev (>= 1.2.2),
                 libsoup2.4-dev (>= 2.26),
                 libsoup-gnome2.4-dev (>= 2.26),
 -               libgdata-cil-dev (>= 1.4),
 +               libgdata1.4-cil,
                 monodoc-base (>= 1.1.9),
                 libsqlite3-dev (>= 3.4),
                 libmtp-dev (>= 0.3.0),
@@@ -39,8 -40,9 +39,9 @@@
                 libxrandr-dev (>= 2:1.1.1),
                 libxxf86vm-dev (>= 1:1.0.1),
                 libgstreamer0.10-dev (>= 0.10.23),
 -               libgstreamer-plugins-base0.10-dev (>= 0.10.26),
 +               libgstreamer-plugins-base0.10-dev (>= 0.10.23),
-                gnome-doc-utils (>= 0.17.3)
+                gnome-doc-utils (>= 0.17.3),
+                libgnome-desktop-dev
  Standards-Version: 3.9.1
  Homepage: http://www.banshee.fm
  Vcs-Git:  git://git.debian.org/git/pkg-cli-apps/packages/banshee.git
@@@ -57,6 -59,7 +58,6 @@@ Depends: ${shlibs:Depends}
           gnome-icon-theme (>= 2.16)
  Recommends: brasero,
              avahi-daemon,
 -            banshee-extension-ubuntuonemusicstore (=${binary:Version}),
              media-player-info
  Suggests: gstreamer0.10-plugins-bad,
            gstreamer0.10-plugins-ugly,
@@@ -70,6 -73,22 +71,6 @@@ Description: Media Management and Playb
   and other media devices, play and manage video files and burn selections
   to a CD.
  
 -Package: banshee-extension-ubuntuonemusicstore
 -Architecture: any
 -Depends: banshee (>= ${source:Upstream-Version}),
 -         ${cli:Depends},
 -         ${shlibs:Depends},
 -         ${misc:Depends}
 -Enhances: banshee
 -Description: Media Management and Playback application - U1MS extension
 - Banshee is a media management and playback application for the GNOME
 - desktop, allowing users to import audio from CDs, search their library,
 - create playlists of selections of their library, sync music to/from iPods
 - and other media devices, play and manage video files and burn selections
 - to a CD.
 - .
 - This package contains Banshee's support for the Ubuntu One Music Store
 -
  Package: banshee-meego
  Architecture: any
  Depends: banshee (= ${binary:Version}),
diff --combined debian/patches/series
index a9a944b,8c892f5..e9311e3
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,3 +1,4 @@@
 +02_bundle-inotifywatcher.patch
  01_Debranch-netbook-interface.patch
  02_only-show-netbook-panel-on-request.patch
  03_quit-only-on-explicit-shutdown-request.patch
@@@ -7,8 -6,8 +7,8 @@@
  06_add-meego-desktop-file.patch
  07_enable-library-watch-by-default.patch
  07_enable-mpris-by-default.patch
+ 07_enable-u1ms-by-default.patch
  08_remove_unrelevant_media.patch
- 09_Fix-issue-with-YOptions-in-SimpleTable.patch
  0001-Don-t-copy-duplicate-libraries.patch
  0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
  99_ltmain_as-needed.patch

-- 
banshee



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