[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/intrepid, updated. debian/1.5.2-1-47-gb51af0b
Chow Loong Jin
hyperair at gmail.com
Thu Jan 28 19:21:12 UTC 2010
The following commit has been merged in the ppa/intrepid branch:
commit b51af0b7f9867dcb4fad538fb3835d002bae7a96
Merge: ec2046481a5664005c46ae166b2b59f3cc30aafc 6f843c9f3ab9e09cad653ad815fc7378387fb89d
Author: Chow Loong Jin <hyperair at gmail.com>
Date: Fri Jan 29 03:10:06 2010 +0800
Merge branch 'ppa/jaunty' into ppa/intrepid
Conflicts:
debian/changelog
debian/rules
diff --combined debian/changelog
index b9da612,e81be05..81815d1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,4 +1,13 @@@
- banshee (1.5.2-1~hyper1~intrepid) intrepid; urgency=low
++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, 04 Dec 2009 15:24:10 +0800
++ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 29 Jan 2010 03:08:40 +0800
+
- banshee (1.5.2-1~hyper1~jaunty) jaunty; urgency=low
+ banshee (1.5.3-0ubuntu1~hyper1~jaunty) jaunty; urgency=low
* Merge from Karmic, remaining changes:
+ debian/control:
@@@ -16,23 -7,74 +16,74 @@@
- 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, 04 Dec 2009 15:01:20 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 29 Jan 2010 03:00:47 +0800
- banshee (1.5.2-1~hyper1~karmic) karmic; urgency=low
+ banshee (1.5.4~really1.5.3-0ubuntu1~hyper1~karmic) karmic; urgency=low
- * No change upload to PPA
+ * 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) UNRELEASED; urgency=low
+
+ * New upstream release
+ + New features:
+ - Sync device from playlist option
+ - Type-ahead find in track, artist, and album lists
+ - Optional cover art in lower-left corner
+ - Editable cover art via drag-and-drop and right-click
+ - Audiobooks library extension
+ - Library-folder watcher extension
+ - eMusic importer/downloader extension
+ + Enhancements:
+ - Improved Podcast filtering/browsing
+ - Extension preferences tab reworked
+ - Extension names/descriptions translated
+ - Improved sqlite performance
+ - Added --set-rating=RATING command line option
+ - Support for Nexus One devices
+ + Bug-fixes:
+ - DAPs now works with DeviceKit (LP: #382941)
+ - Fix issue with DAAP authenticating (LP: #308233)
+ - Podcast renaming should work well now
+ - Podcast download cancelling is now fast
+ - Internet Archive results paging off-by-one fixed
+ - Fix for MTP devices on 64-bit distros
+ - Fix import error for files with '\0' characters (LP: #499698)
+ - Support syncing playlists to iPods (LP: #75571)
+ - Fix syncing podcasts to iPods (LP: #140489)
+ * debian/control:
+ + Bump mono-devel version to 2.4.3 for LibraryWatcher
+ + Re-enable libkarma-cil, use libkarma-cil-dev
+ + Bump mono-addins version to 0.3.1
+ + Bump libgstreamer0.10-dev version to 0.10.12
+ * debian/rules:
+ + Add configure flags for explicitly enabling all wanted
+ features, countering Banshee's automagic silently disabling features
+ * debian/patches/01_devkit-fix.patch:
+ + Dropped, applied upstream
+ * debian/patches/:
+ + 01_monodoc-fix-enable.patch: Fix usage of AC_ARG_ENABLE for --enable-docs
- -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 03 Dec 2009 23:16:11 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 28 Jan 2010 23:52:53 +0800
- banshee (1.5.2-1) UNRELEASED; urgency=low
+ banshee (1.5.2-1) unstable; urgency=low
+ [ Chow Loong Jin ]
* New upstream release (Closes: #558611)
+ New Features:
- The Internet Archive extension
- The iTunes importer
- Metadata ratings and playcount import and export
- - Add support for Pulse and Droid phones
+ - Add support for Pulse and Droid phones (LP: #501515)
- Use new Last.fm API (Closes: #548029, LP: #415937)
+ Enhancements:
@@@ -69,21 -111,22 +120,31 @@@
* debian/control:
+ Bump libipod{,ui}-cil dependency versions to 0.8.5
- + Build-depend on -dev packages for libipod{,ui}-cil
+ + Build depend on -cil-dev packages instead of -cil
+ + Add libmono-addins-cil-dev to Build Dep
+ + Build depend on libboo-cil-dev instead of just boo
* debian/patches/01_fix-ipod-sharp-ftbfs:
+ Dropped, applied upstream
+ * debian/patches/01_devkit-fix.patch:
+ + Backport fix from upstream for DAP support with Devkit
+
+ [ Jo Shields ]
+ * debian/control:
+ + Disable Rio Karma support for now; it's broken due to bug #551049
+ * debian/monodoc-banshee-manual.postinst:
+ + Delete - we use DPKG triggers to handle manual installs now
- -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 03 Dec 2009 00:40:41 +0800
+ -- 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:
@@@ -320,14 -363,6 +381,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:
@@@ -339,12 -374,6 +400,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 d3a43ca,95e5b45..68cb187
--- a/debian/control
+++ b/debian/control
@@@ -9,8 -9,7 +9,8 @@@ Build-Depends: debhelper (>= 7.0.50)
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-cairo2.0-cil,
libmono-sqlite2.0-cil,
@@@ -23,8 -22,8 +23,8 @@@
libglib2.0-cil (>= 2.10),
libgtk2.0-cil (>= 2.12),
libglade2.0-cil (>= 2.10),
- libgconf2.24-cil,
- libgnome2.24-cil,
+ libgconf2.0-cil (>= 2.10),
+ libgnome2.0-cil (>= 2.10),
libipod-cil-dev (>= 0.8.5),
libipodui-cil-dev (>= 0.8.5),
libkarma-cil (>= 0.0.5),
@@@ -37,7 -36,7 +37,7 @@@
libx11-dev,
libxrandr-dev (>= 2:1.1.1),
libxxf86vm-dev (>= 1:1.0.1),
- libgstreamer0.10-dev (>= 0.10.3),
+ libgstreamer0.10-dev (>= 0.10.12),
libgstreamer-plugins-base0.10-dev (>= 0.10.12)
Standards-Version: 3.8.3
Homepage: http://www.banshee-project.org
@@@ -55,7 -54,7 +55,7 @@@ Depends: ${shlibs:Depends}
hal,
gnome-icon-theme (>= 2.16)
Recommends: gstreamer0.10-plugins-bad,
- podsleuth (>= 0.6.0),
+ podsleuth (>= 0.6.5-2~),
brasero,
avahi-daemon
Suggests: gstreamer0.10-plugins-ugly,
diff --combined debian/rules
index 4ad9cd5,7512078..4671da1
--- a/debian/rules
+++ b/debian/rules
@@@ -6,10 -6,24 +6,24 @@@ include /usr/share/cli-common/cli.mak
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
override_dh_auto_configure:
- dh_auto_configure -- --disable-static --enable-release \
+ dh_auto_configure -- --disable-static \
+ --enable-release \
+ --disable-tests \
+ --disable-shave \
--with-vendor-build-id="`lsb_release -ds`" \
- --disable-builtin-equalizer \
+ --disable-clutter \
+ --enable-boo \
+ --enable-docs \
+ --enable-gnome \
+ --enable-schemas-install \
+ --enable-mtp \
+ --enable-ipod \
+ --enable-karma \
+ --enable-daap \
+ --enable-podcast \
+ --disable-remote-audio \
+ --disable-builtin-equalizer \
- 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