[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/unstable/karmic, updated. ppa/1.7.3-2ubuntu1.hyper1+karmic-28-g82e382f
Chow Loong Jin
hyperair at ubuntu.com
Fri Aug 13 10:20:49 UTC 2010
The following commit has been merged in the ppa/unstable/karmic branch:
commit 4ba8f79f9ad8ad3b8c00a1ba3d45594566368321
Merge: cbd5c1c177e02b58e6db76ed4ed72ee57dceafde 8c686c489479f0ad19effd484b2bcd434fe6be5b
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Fri Aug 13 18:07:21 2010 +0800
Merge branch 'ppa/unstable/lucid' into ppa/unstable/karmic
diff --combined debian/changelog
index 3072ebe,bc32704..6dfd1fc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,83 +1,99 @@@
+ 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
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 13 Aug 2010 17:45:50 +0800
+
+ 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) UNRELEASED; urgency=low
+
+ * New upstream release
+ + New Features:
+ - User manual available via Help » Contents menu and F1
+ + Enhancements/API Additions:
+ - Duplicate Genre solver in Metadata Fixup extension
+ - Support for Amazon MP3 purchases containing PDFs and videos
+ - Improved Metadata Fixup support for non-English languages
+ + Bugs Fixed:
+ - Fix notification icon transparency (LP: #403135)
+ - Fix glitchy search entry
+ - Better handling of non-US Amazon stores
+ - Fix scrolling Extensions list with keyboard
+ - Fix .amz mime file conflict with official downloader (LP: #609750)
+ - Fix issue that could block song scrobbling
+ - Fix subscribing to certain podcasts (eg podbean.com)
+ - Fix URIs of tracks synced to iPods
+ - Fix a pipeline deadlock evident on MeeGo
+ * debian/patches:
+ + Drop 01_fix-icon-transparency.patch
+ + Drop 02_fix-configure.patch
+ * debian/control:
+ + No change Standards-Version bump from 3.9.0 to 3.9.1
+ + Add Breaks: banshee-extensions-common (<< 1.6.1-2.) due to ABI break
+ * debian/(banshee-meego.install, rules):
+ + Change meego paths to match upstream
+ * debian/rules:
+ + Drop everything but packages/ in /usr/share/mime (Thanks Loic Minier)
+
+ -- 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) lucid; urgency=low
+ banshee (1.7.3-2ubuntu2) maverick; urgency=low
- * No change backport to Lucid
+ * 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.
- -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 24 Jul 2010 05:27:48 +0800
+ -- Loïc Minier <loic.minier at ubuntu.com> Thu, 05 Aug 2010 00:49:55 -0400
- banshee (1.7.3-2ubuntu1) UNRELEASED; urgency=low
+ banshee (1.7.3-2ubuntu1) maverick; urgency=low
* Merge from Debian Experimental, remaining changes:
+ debian/patches:
@@@ -40,9 -97,9 +113,9 @@@
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
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 26 Jul 2010 00:32:41 +0800
- banshee (1.7.3-2) UNRELEASED; urgency=low
+ banshee (1.7.3-2) experimental; urgency=low
* debian/control: Add libsoup{,-gnome}2.4-dev build-deps which were
forgotten in the previous release
@@@ -246,22 -303,6 +319,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
@@@ -274,22 -315,6 +347,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
@@@ -332,22 -357,6 +405,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
@@@ -388,21 -397,12 +461,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
@@@ -434,29 -434,6 +507,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
@@@ -498,22 -475,6 +571,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
@@@ -549,19 -510,6 +622,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)
@@@ -608,18 -556,6 +681,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 ]
@@@ -833,14 -769,6 +906,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 9b353ec,604ba8a..ba0529a
--- a/debian/control
+++ b/debian/control
@@@ -9,26 -9,25 +9,26 @@@ Build-Depends: debhelper (>= 7.0.50)
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),
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),
@@@ -40,9 -39,9 +40,9 @@@
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),
+ libgstreamer-plugins-base0.10-dev (>= 0.10.12),
gnome-doc-utils (>= 0.17.3)
- Standards-Version: 3.9.0
+ Standards-Version: 3.9.1
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
@@@ -64,6 -63,7 +64,7 @@@ Recommends: gstreamer0.10-plugins-bad
Suggests: gstreamer0.10-plugins-ugly,
gstreamer0.10-ffmpeg,
banshee-dbg (=${binary:Version})
+ 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
desktop, allowing users to import audio from CDs, search their library,
diff --combined debian/patches/series
index 6392c77,e343e61..3f76a1b
--- 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,6 -6,4 +7,4 @@@
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 3d912d0,56b9ae5..ef4d24b
--- a/debian/rules
+++ b/debian/rules
@@@ -26,7 -26,7 +26,7 @@@ override_dh_auto_configure
--disable-remote-audio \
--disable-torrent \
--enable-meego \
- --enable-gapless-playback \
+ --disable-gapless-playback \
--enable-podcast \
--enable-release \
--disable-shave \
@@@ -43,12 -43,15 +43,15 @@@ override_dh_clistrip
dh_clistrip --dbg-package=banshee-dbg
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
dh_install
# 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* \
+ rm -r debian/banshee/usr/share/mutter-meego/ \
+ 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*
%:
dh $@
+
--
banshee
More information about the Pkg-cli-apps-commits
mailing list