[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/unstable/karmic, updated. debian/1.7.3-1ubuntu1-67-gcbd5c1c

Chow Loong Jin hyperair at ubuntu.com
Sat Jul 24 20:26:11 UTC 2010


The following commit has been merged in the ppa/unstable/karmic branch:
commit 79f1ea13921e353953d28b0d04c17133e761a806
Merge: ddc314cfc651f793cc1f348237b8a035229af999 cbf87f1d7a6893d54f72d94cb4b75b140ec7ac5c
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sat Jul 24 22:14:41 2010 +0800

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

diff --combined debian/changelog
index 205d374,94014ae..7f41a49
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,235 +1,251 @@@
+ banshee (1.7.3-2ubuntu2) lucid; urgency=low
+ 
+   * No change backport to Lucid
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 24 Jul 2010 05:27:48 +0800
+ 
+ banshee (1.7.3-2ubuntu1) UNRELEASED; 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>  Sat, 24 Jul 2010 05:25:00 +0800
+ 
+ banshee (1.7.3-2) UNRELEASED; urgency=low
+ 
+   * debian/control: Add libsoup{,-gnome}2.4-dev build-deps which were
+     forgotten in the previous release
+ 
+  -- 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:
+     + 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:
+     + New Features Since 1.7.2:
+       - Amazon MP3 Store Source, supporting US, UK, FR, DE, and JP
+         storefronts. Supports browsing, searching, previewing, buying, and
+         downloading music from Amazon MP3 stores.
+       - Support for downloading and importing Amazon MP3 purchases (.amz files)
+         See http://abock.org/2010/07/08/amazon-mp3-downloader-support-in-banshee
+       - New Miro Guide Podcast Directory extension integrating with
+         miroguide.com. Seamlessly stream and subscribe to podcasts in
+         the guide.
+       - New extension for bulk metadata fixing to merge artists and albums
+         that vary only by case, '&' vs 'and', etc.
+     + Enhancements/API Additions:
+       - Add visual separators in the source view between categories of sources
+       - Culturally format the status bar item count (e.g. in en_US 1,000
+         instead of the old 1000)
+       - Improve the downloading and visual refreshing of new cover art
+       - Tweak the grid view album artwork hover effect
+       - New Banshee.WebBrowser API for creating embedded WebKit web browsers
+         and sources: used by the new Amazon MP3 store, Miro Guide, and the
+         Wikipedia context pane
+       - New Hyena.Downloader API for performing downloads and easy
+         HTTP operations: HttpFileDownloader, HttpStringDownloader
+       - Drop dependency of webkit-sharp, take dependency directly on
+         libwebkit 1.2.2+ for new Banshee.WebBrowser API
+     + Notable Bugs Fixed (9 fixed since 1.7.2):
+       - Fix cover art refreshing
+       - Fix a slow running query to speed things up
+       - Fix importing of compilation albums
+       - Fix loading of libbnpx11.so on some distros
+       - Wrap instead of elipsize Last.fm titles
+       - Escape %20 in filenames for items without embedded metadata (LP: #602201)
+       - Escape Uri value in SQL query
+   * debian/control:
+     + No-change Standards-Version bump from 3.8.4 to 3.9.0
+     + Update build-deps:
+       - Drop libwebkit-cil-dev
+       - Add libwebkit-dev
+       - Add libsoup2.4-dev
+       - Add libsoup-gnome2.4-dev
+   * debian/rules:
+     + Update list of configure flags:
+       - Drop --enable-scrollkeeper
+       - Drop --enable-webkit
+   * debian/patches:
+     + 02_fix-configure.patch: Fix configure failure with --enable-user-docs
+ 
+  -- 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 ]
+   * debian/(rules, banshee-meego.install):
+     + Move missed desktop moblin panel .desktop file to banshee-meego package.
+     + Be more explicit about the files which shouldn't be duplicated in the
+       banshee binary package.
+ 
+   [ Chow Loong Jin ]
+   * New upstream release:
+     + New Features:
+       - Mallard-based documentation
+       - Brand new ready to hack on Gst#-based backend
+     + Enhancements:
+       - Overhaul GNOME proxy support (LP: #545879)
+       - Make GIO optional with --disable-gio configure switch
+       - Use new YouTube icon in context buttons
+       - Wrap long strings in the Now Playing view
+       - Xperia X10 support
+       - Refresh podcast feeds when network is reconnected
+       - Add metadata-saving support for File System Queue (bgo#609411)
+     + Notable Bugs Fixed
+       - Allow building without gnome-doc-utils
+       - Fix various volume-related issues
+       - Fix Play Queue when using it with different locales (bgo#621480)
+       - Fix the Internet Archive playback (bgo#621687)
+       - Correct Play Queue track reordering (bgo#613333)
+       - Fix SourceSwitcher crasher (bgo#618117)
+   * debian/(control, watch):
+     + Update Banshee URL
+   * debian/patches/01_fix-icon-transparency.patch:
+     + Add patch to fix notification area icon transparency with Banshee
+       (LP: #403135)
+   * debian/(rules, banshee-meego.install):
+     + Move org.moblin.*.service D-Bus service files to banshee-meego package
+   * debian/rules:
+     + Add more flags to counter Banshee's automagic to avoid unpleasant surprises:
+       - --disable-gst-sharp
+       - --enable-user-help
+       - --enable-scrollkeeper
+       - --enable-gio
+   * debian/control:
+     + Add gnome-doc-utils build-dependency for user documentation
+   * debian/copyright:
+     + Add license information for user help documentation
+     + Drop old license information for taglib-sharp and dbus-sharp which
+       are not bundled any more
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 02 Jul 2010 02:21:03 +0800
+ 
+ banshee (1.7.2-1~hyper1+maverick) maverick; urgency=low
+ 
+   * No change upload to Maverick PPA
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 02 Jul 2010 13:05:01 +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~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
@@@ -26,22 -242,6 +258,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
@@@ -54,7 -254,7 +286,7 @@@ 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.1-1) UNRELEASED; urgency=low
+ banshee (1.7.1-1) experimental; urgency=low
  
    [ Chow Loong Jin ]
    * New upstream release:
@@@ -84,22 -284,6 +316,22 @@@
  
   -- 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
@@@ -140,21 -324,12 +372,21 @@@ 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.0-1~hyper1~lucid1) lucid; urgency=low
 +banshee (1.6.0-1~hyper1~karmic) karmic; urgency=low
  
 -  * No change version bump. Previous version was oudated and missing the
 -    --disable-clutter flag.
 +  * 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, 03 Apr 2010 18:44:59 +0800
 + -- 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
  
@@@ -186,29 -361,6 +418,29 @@@ 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.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.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
@@@ -250,22 -402,6 +482,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
@@@ -301,19 -437,6 +533,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)
@@@ -360,18 -483,6 +592,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 ]
@@@ -585,14 -696,6 +817,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 4f107d9,b924201..9b353ec
--- a/debian/control
+++ b/debian/control
@@@ -1,31 -1,33 +1,34 @@@
  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 ubuntu.com>
  Build-Depends: debhelper (>= 7.0.50),
                 autotools-dev,
                 cli-common-dev (>= 0.5.7),
                 intltool (>= 0.35),
                 lsb-release,
 -               mono-devel (>= 2.4.3),
 -               libboo-cil-dev (>= 0.8.1),
 -               libndesk-dbus1.0-cil-dev (>= 0.5),
 -               libndesk-dbus-glib1.0-cil-dev (>= 0.3),
 -               libmono-addins-cil-dev (>= 0.3.1),
 -               libmono-addins-gui-cil-dev (>= 0.3.1),
 +               mono-devel (>= 2.4.2.3),
 +               boo (>= 0.8.1),
 +               libmono-cairo2.0-cil,
 +               libmono-sqlite2.0-cil,
 +               libndesk-dbus1.0-cil (>= 0.5),
 +               libndesk-dbus-glib1.0-cil (>= 0.3),
 +               libmono-addins-gui0.2-cil (>= 0.3),
                 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,
                 libipod-cil-dev (>= 0.8.5),
                 libipodui-cil-dev (>= 0.8.5),
 -               libkarma-cil-dev (>= 0.0.5),
 +               libkarma-cil (>= 0.0.5),
-                libwebkit1.0-cil (>= 0.2),
+                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.2.0),
@@@ -37,9 -39,10 +40,10 @@@
                 libxrandr-dev (>= 2:1.1.1),
                 libxxf86vm-dev (>= 1:1.0.1),
                 libgstreamer0.10-dev (>= 0.10.12),
-                libgstreamer-plugins-base0.10-dev (>= 0.10.12)
- Standards-Version: 3.8.4
- Homepage: http://www.banshee-project.org
 -               libgstreamer-plugins-base0.10-dev (>= 0.10.25.2),
++               libgstreamer-plugins-base0.10-dev (>= 0.10.12),
+                gnome-doc-utils (>= 0.17.3)
+ Standards-Version: 3.9.0
+ 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
  
diff --combined debian/patches/series
index 9be4fcd,aa50eef..6392c77
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,11 +1,12 @@@
 +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
+ 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
+ 08_remove_unrelevant_media.patch
+ 01_fix-icon-transparency.patch
+ 02_fix-configure.patch
  99_ltmain_as-needed.patch
diff --combined debian/rules
index 9be5114,2e7490c..3d912d0
--- a/debian/rules
+++ b/debian/rules
@@@ -10,10 -10,12 +10,12 @@@ override_dh_auto_configure
  	                     --with-vendor-build-id="`lsb_release -ds`" \
  	                     --disable-clutter \
  	                     --disable-builtin-equalizer \
+ 	                     --disable-gst-sharp \
+ 	                     --enable-user-help \
  	                     --enable-boo \
  	                     --enable-docs \
- 	                     --enable-webkit \
  	                     --enable-youtube \
+ 	                     --disable-gio \
  	                     --disable-moonlight \
  	                     --enable-gnome \
  	                     --enable-schemas-install \
@@@ -24,7 -26,7 +26,7 @@@
  	                     --disable-remote-audio \
  	                     --disable-torrent \
  	                     --enable-meego \
 -	                     --enable-gapless-playback \
 +	                     --disable-gapless-playback \
  	                     --enable-podcast \
  	                     --enable-release \
  	                     --disable-shave \
@@@ -42,6 -44,11 +44,11 @@@ override_dh_clistrip
  
  override_dh_install:
  	dh_install
- 	find $(CURDIR)/debian/banshee -name "*MeeGo*" -delete
+ 	# Remove MeeGo stuff from banshee binary package
+ 	rm -r $(CURDIR)/debian/banshee/usr/share/mutter-moblin/ \
+ 	$(CURDIR)/debian/banshee/usr/lib/banshee-1/MeeGo.exe \
+ 	$(CURDIR)/debian/banshee/usr/lib/banshee-1/Extensions/Banshee.MeeGo* \
+ 	$(CURDIR)/debian/banshee/usr/share/dbus-1/services/org.moblin* \
+ 
  %:
  	dh $@

-- 
banshee



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