[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/unstable/jaunty, updated. ppa/1.7.0-1.hyper1.jaunty1-15-g0b32405
Chow Loong Jin
hyperair at ubuntu.com
Thu May 27 20:55:30 UTC 2010
The following commit has been merged in the ppa/unstable/jaunty branch:
commit e5e088061ee92dc30d3a19b3ef0f4e2fb2c37b05
Merge: e1e18c72639acee5516da31cfeb5e3bda159c526 dd0d096b71ae2d97b941c2785e47ea4b30d9c836
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Fri May 28 04:26:18 2010 +0800
Merge branch 'ppa/unstable/karmic' into ppa/unstable/jaunty
Conflicts:
debian/gbp.conf
diff --combined debian/changelog
index 729082f,1c5468a..9e42bee
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,56 +1,77 @@@
+ 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
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 28 May 2010 03:42:18 +0800
+
+ banshee (1.7.1-1~hyper1~maverick) maverick; urgency=low
+
+ * No change upload to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 28 May 2010 01:41:45 +0800
+
+ banshee (1.7.1-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ + New Features Since 1.7.0:
+ - Improvements for Audiobooks support
+ Audiobooks tracks are now organized in books, which can be merged
+ together. The last position in each book is automatically saved, so
+ you can resume playing a book right from where you stopped.
+ + Enhancements:
+ - New preference to have the classic album layout instead of the grid view
+ - Last.fm streaming can be disabled separately from the other Last.fm
+ features.
+ - Support for reading and writing MusicBrainz IDs
+ - Show the TrackEditor fields as read-only mode when they are not editable
+ + Notable Bugs Fixed
+ - Fix Youtube playback
+ - Fix deletion of Podcast metadata during modification
+ - Fix a crash related to the notification deamon
+ - Fix fetching cover for albums with several discs
+ - Several fixes for the N800 device
+ * debian/rules:
+ + Enable Moblin integration (--enable-meego)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 27 May 2010 18:14:20 +0800
+
+banshee (1.7.0-1~hyper1~jaunty1) jaunty; urgency=low
+
+ * Switch back to 1.0 format
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 08 May 2010 08:38:12 +0800
+
+banshee (1.7.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> Sat, 08 May 2010 07:37:47 +0800
+
banshee (1.7.0-1~hyper1~karmic) karmic; urgency=low
* Merge from Lucid, remaining changes:
@@@ -41,7 -73,7 +94,7 @@@ banshee (1.7.0-1~hyper1~lucid) lucid; u
-- Chow Loong Jin <hyperair at ubuntu.com> Sat, 08 May 2010 07:08:00 +0800
- banshee (1.7.0-1) UNRELEASED; urgency=low
+ banshee (1.7.0-1) experimental; urgency=low
* New upstream release:
+ New features:
@@@ -65,6 -97,8 +118,6 @@@
- 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
@@@ -89,21 -123,6 +142,21 @@@ banshee (1.6.0-1~hyper1~karmic) karmic
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 02 Apr 2010 00:52:53 +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
@@@ -141,22 -160,6 +194,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.5.6-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-youtube
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 22 Mar 2010 21:26:21 +0800
+
banshee (1.5.6-1~hyper1~karmic) karmic; urgency=low
* Merge from Lucid, remaining changes:
@@@ -214,24 -217,6 +267,24 @@@ 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~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:
@@@ -283,20 -268,6 +336,20 @@@ 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~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
+ + debian/rules:
+ - Revert to using csc instead of mono-csc
+ - --disable-clutter
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 28 Feb 2010 07:35:46 +0800
+
banshee (1.5.4-1~hyper1~karmic) karmic; urgency=low
* Merge from unstable, remaining changes:
@@@ -356,19 -327,6 +409,19 @@@ 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~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)
+ + debian/rules:
+ - Revert to using csc instead of mono-csc
+ - --disable-clutter
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 29 Jan 2010 03:00:47 +0800
+
banshee (1.5.4~really1.5.3-0ubuntu1~hyper1~karmic) karmic; urgency=low
* Merge from unstable, remaining changes:
@@@ -492,18 -450,6 +545,18 @@@ 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~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)
+ + debian/rules:
+ - Revert to using csc instead of mono-csc
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 15 Oct 2009 09:36:34 +0800
+
banshee (1.5.1-1) unstable; urgency=low
* New upstream release
@@@ -594,21 -540,6 +647,21 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Wed, 14 Oct 2009 19:21:51 +0800
+banshee (1.5.0-3~hyper1~jaunty1) jaunty; urgency=low
+
+ * Merge from Karmic unstable PPA, remaining changes:
+ + Revert bad GNOME# 2.24 transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 15 Aug 2009 02:21:05 +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-3) experimental; urgency=low
* debian/patches/03_muinshee-booter.patch,
@@@ -621,6 -552,14 +674,6 @@@
-- 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:
@@@ -639,13 -578,6 +692,13 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Wed, 08 Jul 2009 22:10:27 +0800
+banshee (1.5.0-0ubuntu1~hyper1~jaunty1) jaunty; urgency=low
+
+ * Backport to jaunty
+ * debian/control: Revert bad GNOME# 2.24 transition
+
+ -- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 01:03:53 +0800
+
banshee (1.5.0-1) experimental; urgency=low
[ Chow Loong Jin ]
diff --combined debian/gbp.conf
index 46ef771,09417d1..5fe775e
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,2 -1,3 +1,3 @@@
[DEFAULT]
-debian-branch = ppa/unstable/karmic
+debian-branch = ppa/unstable/jaunty
+ upstream-branch = upstream-experimental
diff --combined debian/rules
index c23f325,cf93f6f..a19e3f6
--- a/debian/rules
+++ b/debian/rules
@@@ -1,6 -1,5 +1,6 @@@
#!/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
@@@ -14,7 -13,7 +14,7 @@@ override_dh_auto_configure
--enable-boo \
--enable-docs \
--enable-webkit \
- --enable-youtube \
+ --disable-youtube \
--disable-moonlight \
--enable-gnome \
--enable-schemas-install \
@@@ -24,12 -23,12 +24,12 @@@
--enable-daap \
--disable-remote-audio \
--disable-torrent \
- --disable-meego \
+ --enable-meego \
--disable-gapless-playback \
--enable-podcast \
--enable-release \
--disable-shave \
- MCS=/usr/bin/mono-csc LDFLAGS="$(LDFLAGS)"
+ MCS=/usr/bin/csc LDFLAGS="$(LDFLAGS)"
# disable tests
override_dh_auto_test:
@@@ -42,4 -41,4 +42,4 @@@ override_dh_clistrip
dh_clistrip --dbg-package=banshee-dbg
%:
- dh $@
+ dh --with=quilt $@
--
banshee
More information about the Pkg-cli-apps-commits
mailing list