[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/karmic, updated. ppa/1.7.6-0ubuntu1.hyper1+karmic-27-g5e1cd3a
Chow Loong Jin
hyperair at ubuntu.com
Thu Sep 30 21:18:42 UTC 2010
The following commit has been merged in the ppa/karmic branch:
commit 9675a3e012d64158da3d2510c288aecffb2a8ae1
Merge: ae6b43640d232ad98bb543d2ce491c77d638cfdc 42007dd9dda199c14b3b1ed7de34ddf9e3b30e0b
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Fri Oct 1 03:27:57 2010 +0800
Merge branch 'ppa/lucid' into ppa/karmic
Conflicts:
debian/control
debian/gbp.conf
diff --combined debian/changelog
index ab4b67d,1a526a5..3b59e27
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,33 +1,49 @@@
+ banshee (1.8.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
+
+ * No change backport to Lucid
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 01 Oct 2010 03:13:46 +0800
+
+ banshee (1.8.0-1ubuntu1) maverick; urgency=low
+
+ * Merge from Debian experimental, remaining changes:
+ + debian/banshee-meego.install: Install netbook banshee.desktop to UNE
+ location
+ + Disable boo support
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 01 Oct 2010 03:08:28 +0800
+
+ banshee (1.8.0-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ + Adds playlist support to libgpod backend
+ + Fixes hanging issue during beginning of playback (LP: #448533)
+ + Fixes an issue where mass storage devices were not detected (LP: #646482)
+ + Fixes an issue where iPods are not updated with the gpod backend
+ (LP: #640090)
+ * Bump libgpod-cil-dev dependency to 0.7.95
+ * Import Ubuntu's upstreamable patches
+ * Run intltool and mangle desktop file for Ubuntu
+ upstream"
+
+ -- 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
@@@ -96,22 -110,6 +126,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
@@@ -187,22 -185,6 +217,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
@@@ -273,22 -255,6 +303,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
@@@ -524,22 -490,6 +554,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
@@@ -552,22 -502,6 +582,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
@@@ -610,22 -544,6 +640,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
@@@ -666,22 -584,6 +696,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.
@@@ -724,22 -626,6 +754,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
@@@ -770,22 -656,6 +800,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
@@@ -827,22 -697,6 +857,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
@@@ -878,19 -732,6 +908,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)
@@@ -937,18 -778,6 +967,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 ]
@@@ -1162,14 -991,6 +1192,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 5075747,07b6923..3bff894
--- a/debian/control
+++ b/debian/control
@@@ -9,27 -9,27 +9,27 @@@ 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),
+ libndesk-dbus1.0-cil (>= 0.5),
+ libndesk-dbus-glib1.0-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,
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),
+ libgpod-cil-dev (>= 0.7.95),
- 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.3.0),
@@@ -41,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
diff --combined debian/rules
index 00a038c,b1a4c81..1178d35
--- a/debian/rules
+++ b/debian/rules
@@@ -29,7 -29,7 +29,7 @@@ override_dh_auto_configure
--disable-remote-audio \
--disable-torrent \
--enable-meego \
- --enable-gapless-playback \
+ --disable-gapless-playback \
--enable-podcast \
--enable-release \
--disable-shave \
@@@ -61,7 -61,7 +61,7 @@@ ifeq ($(shell dpkg-vendor --query vendo
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
+ done
endif
%:
--
banshee
More information about the Pkg-cli-apps-commits
mailing list