[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/intrepid, updated. ppa/1.5.4-1.hyper1.intrepid-17-g3e67029
Chow Loong Jin
hyperair at ubuntu.com
Thu Mar 11 20:35:14 UTC 2010
The following commit has been merged in the ppa/intrepid branch:
commit 3e6702957394513802e04bd5e92c5c1b20912cc9
Merge: 031c3a7987ee3990a91dc51a89d9c3805f7f22b8 846b813217114d524f5887fe6228c1b717f1a871
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Fri Mar 12 04:24:07 2010 +0800
Merge branch 'ppa/jaunty' into ppa/intrepid
Conflicts:
debian/changelog
diff --combined debian/changelog
index 20ca817,b4cd059..736b93e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,66 +1,84 @@@
++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:
+ + 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-clutter
+ - --disable-gdata
+ + debian/patches/01_waitone-override.patch:
+ - Use Compat WaitOne override. Fixes FTBFS with older mono
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Mar 2010 04:08:04 +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) UNRELEASED; urgency=low
+
+ * New upstream release
+ + New Features:
+ - Gapless Playback / Playbin2 (LP: #45518, #377354)
+ - Grid View
+ - YouTube Extension
+ + Enhancements:
+ - Improve search responsiveness on large libraries (LP: #474514)
+ - Add icons for Nexus One and Audiobooks (LP: #532182)
+ - Play Queue item count, size, duration now ignores old tracks
+ - Muinshee fixes: disable Auto-DJ, allow reordering, hide previous song
+ + Notable bug fixes:
+ - Fix a very common, SQL-related crash in 1.5.4 (Closes: #572136)
+ - Fix saving equalizer settings in culture-invariant way
+ - Jumping to a source's prefs via its context menu works again
+ - Usage data not submitted more than every 48 hours
+ - Fix repeatedly resyncing some files to a device b/c transcoded
+ - Clear the redo stack on shuffle mode change
+ - Accept feeds with empty title (LP: #468323)
+ - Uri encode file location queries, making them work properly
+ * debian/control:
+ + Bump gst-plugins-base-dev version for gapless playback
+ + Add libgdata-cil-dev for youtube extenesion
+ * debian/rules:
+ + Add --enable-gapless-playback and --enable-gdata
+
+ -- 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:
@@@ -34,9 -88,9 +106,9 @@@ banshee (1.5.4-1~hyper1~karmic) karmic
-- Chow Loong Jin <hyperair at ubuntu.com> Sat, 27 Feb 2010 15:54:13 +0800
- banshee (1.5.4-1) UNRELEASED; urgency=low
+ banshee (1.5.4-1) unstable; urgency=low
- * New upstream release
+ * New upstream release (Closes: #571734)
+ New features:
- Opt-In Usage Data Collection
- Default Equalizer Presets
@@@ -78,17 -132,8 +150,17 @@@
debian/patches/series:
+ Dropped, applied upstream
- -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 26 Feb 2010 01:23:59 +0800
+ -- 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:
@@@ -225,15 -270,6 +297,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:
@@@ -470,14 -506,6 +542,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:
@@@ -489,12 -517,6 +561,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 2bc79a8,a194d69..bafcd57
--- a/debian/rules
+++ b/debian/rules
@@@ -14,6 -14,7 +14,7 @@@ override_dh_auto_configure
--enable-boo \
--enable-docs \
--enable-webkit \
+ --disable-gdata \
--enable-gnome \
--enable-schemas-install \
--enable-mtp \
@@@ -21,8 -22,9 +22,9 @@@
--enable-karma \
--disable-remote-audio \
--enable-daap \
+ --disable-gapless-playback \
--enable-podcast \
- 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