[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/unstable/karmic, updated. ppa/1.7.5-0ubuntu2.hyper1+karmic
Chow Loong Jin
hyperair at ubuntu.com
Sat Sep 11 16:28:33 UTC 2010
The following commit has been merged in the ppa/unstable/karmic branch:
commit fd262e1c411c563bfc35005efc9e870051e07186
Merge: 82e382f7e3c7b30f3deab2d5586b4c02310533ea 9d734d077e51e4a31d1266aea86e190ac8eba3be
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Sat Sep 11 23:01:15 2010 +0800
Merge branch 'ppa/unstable/lucid' into ppa/unstable/karmic
Conflicts:
debian/control
diff --combined debian/changelog
index 4709945,d66eea5..6882af6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,78 +1,94 @@@
+ 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
+ * 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~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
@@@ -52,7 -111,7 +127,7 @@@ banshee (1.7.4-1ubuntu1) maverick; urge
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 13 Aug 2010 00:37:19 +0800
- banshee (1.7.4-1) UNRELEASED; urgency=low
+ banshee (1.7.4-1) experimental; urgency=low
* New upstream release
+ New Features:
@@@ -84,22 -143,6 +159,22 @@@
-- 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
@@@ -335,22 -378,6 +410,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
@@@ -363,22 -390,6 +438,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
@@@ -421,22 -432,6 +496,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
@@@ -477,21 -472,12 +552,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
@@@ -523,29 -509,6 +598,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
@@@ -587,22 -550,6 +662,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
@@@ -638,19 -585,6 +713,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)
@@@ -697,18 -631,6 +772,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 ]
@@@ -922,14 -844,6 +997,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 ba0529a,5dc28a2..5075747
--- a/debian/control
+++ b/debian/control
@@@ -9,29 -9,30 +9,30 @@@ 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),
- 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),
++ libmono-addins0.2-cil (>= 0.3.1),
++ libmono-addins-gui0.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,
- libipod-cil-dev (>= 0.8.5),
- libipodui-cil-dev (>= 0.8.5),
+ 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.94),
- 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),
+ libmtp-dev (>= 0.3.0),
gconf2,
libglib2.0-dev,
libgtk2.0-dev (>= 2.8),
@@@ -40,7 -41,7 +41,7 @@@
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.1
Homepage: http://www.banshee.fm
@@@ -55,10 -56,8 +56,8 @@@ Depends: ${shlibs:Depends}
gstreamer0.10-plugins-base,
gstreamer0.10-plugins-good (>= 0.10.8-4),
gstreamer0.10-alsa | gstreamer0.10-audiosink,
- hal,
gnome-icon-theme (>= 2.16)
Recommends: gstreamer0.10-plugins-bad,
- podsleuth (>= 0.6.5-2~),
brasero,
avahi-daemon
Suggests: gstreamer0.10-plugins-ugly,
diff --combined debian/patches/series
index 3f76a1b,552a99d..cf1b052
--- 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,4 -6,7 +7,7 @@@
06_add-meego-desktop-file.patch
07_enable-library-watch-by-default.patch
08_remove_unrelevant_media.patch
+ copy-gpod-dllmap
+ 0001-Don-t-copy-duplicate-libraries.patch
+ 0002-Also-copy-gio-sharp-s-debugging-libraries-if-they-ar.patch
99_ltmain_as-needed.patch
diff --combined debian/rules
index ef4d24b,f6c493e..00a038c
--- a/debian/rules
+++ b/debian/rules
@@@ -12,21 -12,24 +12,24 @@@ override_dh_auto_configure
--disable-builtin-equalizer \
--disable-gst-sharp \
--enable-user-help \
- --enable-boo \
+ --disable-boo \
--enable-docs \
--enable-youtube \
- --disable-gio \
+ --disable-hal \
+ --enable-gio \
+ --enable-gio-hardware \
--disable-moonlight \
--enable-gnome \
--enable-schemas-install \
--enable-mtp \
- --enable-ipod \
+ --enable-appledevice \
+ --disable-ipod \
--enable-karma \
--enable-daap \
--disable-remote-audio \
--disable-torrent \
--enable-meego \
- --enable-gapless-playback \
+ --disable-gapless-playback \
--enable-podcast \
--enable-release \
--disable-shave \
@@@ -45,12 -48,21 +48,21 @@@ override_dh_clistrip
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
+ rm -f debian/tmp/usr/share/applications/mimeinfo.cache
dh_install
# Remove MeeGo stuff from banshee binary package
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*
+ ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
+ cd po; intltool-update --pot
+
+ for d in $$(find debian/ -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \
+ sed -ri '/^(Name|GenericName|Comment|X-GNOME-FullName)\[/d' $$d; \
+ echo "X-Ubuntu-Gettext-Domain=banshee" >> $$d; \
+ done
+ endif
%:
dh $@
--
banshee
More information about the Pkg-cli-apps-commits
mailing list