[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/natty, updated. debian/1.9.0+git20101121.r1.b13266e-0ubuntu5-18-g05f047b
Iain Lane
laney at ubuntu.com
Mon Dec 20 00:39:52 UTC 2010
The following commit has been merged in the ubuntu/natty branch:
commit 77656e72d589c9743f9487891a9b196a12744072
Merge: 7ff9143e213161a1ffcda45c88e00441f5e68d7b cd5763136347c14ebd959f05717e83ea6afb988f
Author: Iain Lane <laney at ubuntu.com>
Date: Mon Dec 20 00:34:00 2010 +0000
Merge branch 'experimental' into ubuntu/natty
Conflicts:
debian/control
debian/rules
diff --combined debian/changelog
index 8b24f2f,b5dd2c9..7f6c584
--- a/debian/changelog
+++ b/debian/changelog
@@@ -38,7 -38,7 +38,7 @@@ banshee (1.9.1-1) experimental; urgency
- bgo#634686: Fix streaming broken after first play
- bgo#635426: Ensure track filter actions updated
- bgo#635453: Fix regression with importing mkv
- - bgo#608778: 'Random by' skips user-selected artist/album
+ - bgo#608778: 'Random by' skips user-selected artist/album
* [d50b927] Don't build the sound menu or u1ms extensions
* [c881367] Enable the Mpris extension by default
* [d7e9689] Cherry-pick upstream commit to fix issue with YOptions in
@@@ -47,53 -47,11 +47,56 @@@
[ Alex Launi ]
* [7d1f43c] Add recommends on media-player-info (Closes: #607410)
- -- Iain Lane <laney at ubuntu.com> Sun, 19 Dec 2010 18:13:07 +0000
+ [ Chow Loong Jin ]
+ * Shift gst-plugins-bad to Suggests
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 20 Dec 2010 07:43:27 +0800
+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
@@@ -145,16 -103,6 +148,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)
@@@ -176,7 -124,7 +179,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:
@@@ -252,101 -200,6 +255,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
@@@ -379,37 -232,6 +382,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
@@@ -417,28 -239,6 +420,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:
@@@ -490,44 -290,6 +493,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 ]
@@@ -578,30 -340,6 +581,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 02f97f8,e694c36..6e9f306
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,7 +1,8 @@@
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,
@@@ -10,6 -9,7 +10,6 @@@
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),
@@@ -25,8 -25,6 +25,8 @@@
libgtk-sharp-beans2.0-cil-dev (>= 2.8),
libgpod-cil-dev (>= 0.7.95),
libkarma-cil-dev (>= 0.0.5),
+ libindicate0.1-cil-dev (>= 0.4.1),
+ libubuntuone1.0-cil-dev,
libwebkit-dev (>= 1.2.2),
libsoup2.4-dev (>= 2.26),
libsoup-gnome2.4-dev (>= 2.26),
@@@ -41,8 -39,8 +41,8 @@@
libx11-dev,
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.25.2),
+ libgstreamer0.10-dev (>= 0.10.23),
+ libgstreamer-plugins-base0.10-dev (>= 0.10.26),
gnome-doc-utils (>= 0.17.3)
Standards-Version: 3.9.1
Homepage: http://www.banshee.fm
@@@ -60,9 -58,7 +60,9 @@@ Depends: ${shlibs:Depends}
gnome-icon-theme (>= 2.16)
Recommends: brasero,
avahi-daemon,
- media-player-info,
+ banshee-extension-soundmenu (=${binary:Version}),
- banshee-extension-ubuntuonemusicstore (=${binary:Version})
++ banshee-extension-ubuntuonemusicstore (=${binary:Version}),
+ media-player-info
Suggests: gstreamer0.10-plugins-bad,
gstreamer0.10-plugins-ugly,
gstreamer0.10-ffmpeg,
@@@ -75,38 -71,6 +75,38 @@@ 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-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/rules
index 8f8b242,75798fb..a62503c
--- a/debian/rules
+++ b/debian/rules
@@@ -12,7 -12,7 +12,7 @@@ override_dh_auto_configure
--disable-builtin-equalizer \
--disable-gst-sharp \
--enable-user-help \
- --enable-boo \
+ --disable-boo \
--enable-docs \
--enable-youtube \
--disable-hal \
@@@ -28,9 -28,9 +28,9 @@@
--enable-daap \
--disable-remote-audio \
--disable-torrent \
- --enable-soundmenu \
- --enable-ubuntuone \
--enable-meego \
- --disable-soundmenu \
- --disable-ubuntuone \
++ --enable-soundmenu \
++ --enable-ubuntuone \
--enable-gapless-playback \
--enable-podcast \
--enable-release \
@@@ -57,9 -57,6 +57,9 @@@ override_dh_install
debian/banshee/usr/lib/banshee-1/MeeGo.exe \
debian/banshee/usr/lib/banshee-1/Extensions/Banshee.MeeGo.dll* \
debian/banshee/usr/share/dbus-1/services/com.meego*
+ # Remove U1MS and Sound Menu stuff from banshee
+ rm -r debian/banshee/usr/lib/banshee-1/Extensions/Banshee.SoundMenu.* \
+ debian/banshee/usr/lib/banshee-1/Extensions/Banshee.UbuntuOneMusicStore.*
ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
cd po; intltool-update --pot
--
banshee
More information about the Pkg-cli-apps-commits
mailing list