[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/unstable/intrepid, updated. ppa/1.6.0-1.hyper1.intrepid-32-g5007db5
Chow Loong Jin
hyperair at ubuntu.com
Sat May 8 00:30:13 UTC 2010
The following commit has been merged in the ppa/unstable/intrepid branch:
commit 8c4564ca6abb88d24963a6bb0981e3b9bf428723
Merge: 1e9ebe1cfc64bfe3c8c8bfe352fc7014886e2fb1 9aed9837571e60c3163aa9178c42c9957c3bcc36
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Sat May 8 07:57:01 2010 +0800
Merge branch 'ppa/unstable/jaunty' into ppa/unstable/intrepid
Conflicts:
debian/gbp.conf
debian/rules
diff --combined debian/changelog
index 3f5a372,0048c41..b788a59
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,4 +1,4 @@@
- 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
+ banshee (1.7.0-1~hyper1~jaunty) jaunty; urgency=low
* Merge from Karmic, remaining changes:
+ debian/control:
@@@ -20,7 -11,63 +11,63 @@@
- 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
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 08 May 2010 07:37:47 +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
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 08 May 2010 07:08:00 +0800
+
+ banshee (1.7.0-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ + New features:
+ - Add Keybinding for Switching Sources
+ Typing 'g' activates the source switcher, where you can type the name
+ of a source to switch to it. You can type its acronym or a substring
+ as well. As soon as only one source matches, it will be activated.
+ For example, you can type 'g' and then 'np' to switch to Now Playing.
+ - Connect to Remote DAAP Servers by entering IP address
+ + Enhancements:
+ - Improved Last.fm authentication experience
+ - Improved Maemo device support
+ - DBus API additions for showing various dialogs
+ - DEXT/CLIQ and Galaxy Portal device support
+ - Many MeeGo specific improvements and fixes
+
+ + Notable Bugs Fixed (41 fixed since 1.6.0):
+ - Fix for fullscreen video under Mutter
+ - Fix videos playing back in a new window
+ - Fix crashes related to Gtk.Widget subclassing
+ - Fix crashes related to a11y
+ - NotificationArea fixes
+ - Cover art aspect ratio/scaling fixes
+ * debian/(control, source/format, rules):
+ + Drop quilt and switch to 3.0 (quilt) format
+ * debian/rules:
+ + Add some new compile flags (in-development features):
+ - --disable-moonlight
+ - --disable-torrent
+ - --disable-meego
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 07 May 2010 23:27:08 +0800
banshee (1.6.0-1~hyper1~karmic) karmic; urgency=low
@@@ -38,13 -85,28 +85,37 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 02 Apr 2010 00:52:53 +0800
++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~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
+ banshee (1.6.0-1) unstable; urgency=low
* New upstream release:
+ Notable bug fixes:
@@@ -68,15 -130,13 +139,22 @@@
-- 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~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:
@@@ -150,15 -210,6 +228,15 @@@ 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~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:
@@@ -228,15 -279,6 +306,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:
@@@ -310,15 -352,6 +388,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:
@@@ -455,15 -488,6 +533,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:
@@@ -573,17 -597,6 +651,17 @@@ banshee (1.5.0-3~hyper1~jaunty1) jaunty
-- Chow Loong Jin <hyperair at ubuntu.com> Sat, 15 Aug 2009 02:21:05 +0800
+banshee (1.5.0-3~hyper1~intrepid1) intrepid; urgency=low
+
+ * Merge from Jaunty unstable PPA, remaining changes:
+ + Mono 2.0 transition
+ + Revert GNOME# 2.24 transition
+ * debian/patches/series,
+ debian/patches/04_no-auto-test.patch:
+ + Don't run tests by default.
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 15 Aug 2009 02:40:01 +0800
+
banshee (1.5.0-3~hyper1~karmic1) karmic; urgency=low
* Upload to PPA
@@@ -629,13 -642,6 +707,13 @@@ banshee (1.5.0-0ubuntu1~hyper1~jaunty1
-- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 01:03:53 +0800
+banshee (1.5.0-0ubuntu1~hyper1~intrepid1) intrepid; urgency=low
+
+ * Backport to intrepid
+ * debian/control: Revert GNOME# 2.24 transition
+
+ -- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 01:11:49 +0800
+
banshee (1.5.0-1) experimental; urgency=low
[ Chow Loong Jin ]
@@@ -718,14 -724,6 +796,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:
@@@ -737,12 -735,6 +815,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/control
index 1f7d396,9c07919..54b2d35
--- a/debian/control
+++ b/debian/control
@@@ -4,16 -4,12 +4,15 @@@ Priority: optiona
Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
Uploaders: Sebastian Dröge <slomo at debian.org>, Chow Loong Jin <hyperair at ubuntu.com>
Build-Depends: debhelper (>= 7.0.50),
- quilt (>= 0.46-7~),
autotools-dev,
cli-common-dev (>= 0.5.7),
intltool (>= 0.35),
lsb-release,
- mono-devel (>= 2.0.1),
+ mono-gmcs | c-sharp-2.0-compiler,
+ libmono-dev (>= 1.9.1),
boo (>= 0.8.1),
+ libmono-dev,
+ mono-2.0-devel,
libmono-cairo2.0-cil,
libmono-sqlite2.0-cil,
libndesk-dbus1.0-cil (>= 0.5),
@@@ -24,8 -20,8 +23,8 @@@
libnotify0.4-cil,
libglib2.0-cil (>= 2.10),
libgtk2.0-cil (>= 2.12),
- libgconf2.24-cil,
- libgnome2.24-cil,
+ libgconf2.0-cil (>= 2.10),
+ libgnome2.0-cil,
libipod-cil-dev (>= 0.8.5),
libipodui-cil-dev (>= 0.8.5),
libkarma-cil (>= 0.0.5),
diff --combined debian/rules
index e066ef6,7a40c8e..97df399
--- a/debian/rules
+++ b/debian/rules
@@@ -1,6 -1,5 +1,5 @@@
#!/usr/bin/make -f
- include /usr/share/quilt/quilt.make
include /usr/share/cli-common/cli.make
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
@@@ -15,18 -14,21 +14,21 @@@ override_dh_auto_configure
--enable-docs \
--enable-webkit \
--disable-youtube \
+ --disable-moonlight \
--enable-gnome \
--enable-schemas-install \
--enable-mtp \
--enable-ipod \
--enable-karma \
- --disable-remote-audio \
--enable-daap \
+ --disable-remote-audio \
+ --disable-torrent \
+ --disable-meego \
--disable-gapless-playback \
--enable-podcast \
--enable-release \
--disable-shave \
- MCS=/usr/bin/csc LDFLAGS="$(LDFLAGS)"
+ LDFLAGS="$(LDFLAGS)"
# disable tests
override_dh_auto_test:
@@@ -39,4 -41,4 +41,4 @@@ override_dh_clistrip
dh_clistrip --dbg-package=banshee-dbg
%:
- dh --with=quilt $@
+ dh $@
--
banshee
More information about the Pkg-cli-apps-commits
mailing list