[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/intrepid, updated. ppa/1.5.6-1.hyper1.intrepid-16-g853921e
Chow Loong Jin
hyperair at ubuntu.com
Fri Apr 2 02:29:22 UTC 2010
The following commit has been merged in the ppa/intrepid branch:
commit 853921e25120bc544868b8eae9119582113de430
Merge: 4ef6b0a4e9de1c7864a8ef0856210ef2bc44e26b 056224c3e06f29cfdcd10c2614353fe14987cca7
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Fri Apr 2 04:49:20 2010 +0800
Merge branch 'ppa/jaunty' into ppa/intrepid
Conflicts:
debian/changelog
debian/rules
diff --combined debian/changelog
index 503bfdf,9060c35..ec83784
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,64 +1,82 @@@
++banshee (1.6.0-1~hyper1~intrepid) intrepid; urgency=low
++
++ * Merge from Jaunty, remaining changes:
++ + debian/control:
++ - Revert GNOME# 2.24 changes
++ - Revert Mono 2 transition
++
++ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 02 Apr 2010 04:49:13 +0800
++
+ banshee (1.6.0-1~hyper1~jaunty) jaunty; urgency=low
+
+ * Merge from Karmic, remaining changes:
+ + debian/control:
+ - libgconf2.0-cil -> libgconf2.24-cil
+ - Lower mono-devel version
+ - Disable clutter support (dependencies not satisfiable)
+ - Re-add libgnome2.24-cil, mono-addins-gui needs it
+ - Drop gdata
+ + debian/rules:
+ - Revert to using csc instead of mono-csc
+ - --disable-youtube
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 02 Apr 2010 04:44:47 +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
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 02 Apr 2010 00:58:50 +0800
+
+ banshee (1.6.0-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ + Notable bug fixes:
+ - Fix device support on upcoming distros with DeviceKit rename
+ - Restore equalizer preset correctly (bgo#614313)
+ - Handle broken symlinks correctly (bgo#614065)
+ - Allow overriding Android, Maemo, WebOS default settings (bgo#611991)
+ - Fix crash deleting playlist on mass storage device (bgo#613734)
+ - Fix issue with iTunes importer dialog sizing (bgo#613607)
+ - Fix play count calculation with gapless enabled (bgo#613418)
+ - Handle exceptions thrown by old plugins (LP: #546342)
+ - Use panel-specific (eg monochrome) icon in notification area
+ (LP: #525280)
+ + Other bugs fixed:
+ - Start HAL automatically if not already started (LP: #543354)
+ - Fix bug where new podcasts could not be added (Closes: #575734)
+ * debian/(control, rules):
+ + Disable the clutter video sink
+ - Uses deprecated functions, and will fail to build with a newer version
+ clutter (1.2.X which is available in experimental)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 02 Apr 2010 03:12:16 +0800
+
+banshee (1.5.6-1~hyper1~intrepid) intrepid; urgency=low
+
+ * Merge from Jaunty, remaining changes:
+ + debian/control:
+ - Revert GNOME# 2.24 changes
+ - Revert Mono 2 transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 22 Mar 2010 21:30:49 +0800
+
banshee (1.5.6-1~hyper1~jaunty) jaunty; urgency=low
* Merge from Karmic, remaining changes:
@@@ -45,7 -97,7 +115,7 @@@ banshee (1.5.6-1~hyper1~lucid) lucid; u
-- Chow Loong Jin <hyperair at ubuntu.com> Mon, 22 Mar 2010 16:45:41 +0800
- banshee (1.5.6-1) UNRELEASED; urgency=low
+ banshee (1.5.6-1) unstable; urgency=low
* New upstream release:
+ Notable bug fixes:
@@@ -80,15 -132,6 +150,15 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 21 Mar 2010 21:22:57 +0800
+banshee (1.5.5-1~hyper1~intrepid) intrepid; urgency=low
+
+ * Merge from Jaunty, remaining changes:
+ + debian/control:
+ - Revert GNOME# 2.24 changes
+ - Revert Mono 2 transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Mar 2010 04:23:55 +0800
+
banshee (1.5.5-1~hyper1~jaunty) jaunty; urgency=low
* Merge from Karmic, remaining changes:
@@@ -158,15 -201,6 +228,15 @@@ 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~intrepid) intrepid; urgency=low
+
+ * Merge from Jaunty, remaining changes:
+ + debian/control:
+ - Revert GNOME# 2.24 changes
+ - Revert Mono 2 transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 28 Feb 2010 07:32:20 +0800
+
banshee (1.5.4-1~hyper1~jaunty) jaunty; urgency=low
* Merge from Karmic, remaining changes:
@@@ -240,15 -274,6 +310,15 @@@ banshee (1.5.4-1) unstable; urgency=lo
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 28 Feb 2010 01:14:01 +0800
+banshee (1.5.3-0ubuntu1~hyper1~intrepid) intrepid; urgency=low
+
+ * Merge from Jaunty, remaining changes:
+ + debian/control:
+ - Revert GNOME# 2.24 changes
+ - Revert Mono 2 transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 29 Jan 2010 03:08:40 +0800
+
banshee (1.5.3-0ubuntu1~hyper1~jaunty) jaunty; urgency=low
* Merge from Karmic, remaining changes:
@@@ -385,15 -410,6 +455,15 @@@ banshee (1.5.2-1) unstable; urgency=lo
-- Chow Loong Jin <hyperair at ubuntu.com> Thu, 21 Jan 2010 13:19:04 +0800
+banshee (1.5.1-1~hyper1~intrepid) intrepid; urgency=low
+
+ * Merge from Jaunty, remaining changes:
+ + debian/control:
+ - Revert GNOME# 2.24 changes
+ - Revert Mono 2 transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 15 Oct 2009 10:21:18 +0800
+
banshee (1.5.1-1~hyper1~jaunty) jaunty; urgency=low
* Merge from Karmic, remaining changes:
@@@ -630,14 -646,6 +700,14 @@@ banshee (1.4.3-5) unstable; urgency=lo
-- Chow Loong Jin <hyperair at gmail.com> Mon, 25 May 2009 20:02:35 +0800
+banshee (1.4.3-4~hyper1+intrepid1) intrepid; urgency=low
+
+ * Merge from Jaunty, remaining changes:
+ + debian/control:
+ - GNOME# 2.24
+
+ -- Chow Loong Jin <hyperair at gmail.com> Tue, 21 Apr 2009 19:11:52 +0800
+
banshee (1.4.3-4) unstable; urgency=low
* debian/control:
@@@ -649,12 -657,6 +719,12 @@@
+ Bump Standards-Version
-- Chow Loong Jin <hyperair at gmail.com> Thu, 16 Apr 2009 18:26:25 +0800
+banshee (1.4.3-3~hyper1+intrepid1) intrepid; urgency=low
+
+ * Merge from Debian, remaining changes:
+ + Revert Mono 2.0 transition
+
+ -- Chow Loong Jin <hyperair at gmail.com> Sun, 22 Mar 2009 13:37:56 +0800
banshee (1.4.3-3) unstable; urgency=low
diff --combined debian/rules
index 7c515b8,2e80654..e066ef6
--- a/debian/rules
+++ b/debian/rules
@@@ -24,7 -24,9 +24,9 @@@ override_dh_auto_configure
--enable-daap \
--disable-gapless-playback \
--enable-podcast \
+ --enable-release \
+ --disable-shave \
- MCS=/usr/bin/csc LDFLAGS="$(LDFLAGS)"
+ LDFLAGS="$(LDFLAGS)"
# disable tests
override_dh_auto_test:
--
banshee
More information about the Pkg-cli-apps-commits
mailing list