[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/intrepid, updated. ppa/1.5.3-0ubuntu1.hyper1.intrepid-14-g031c3a7
Chow Loong Jin
hyperair at ubuntu.com
Sun Feb 28 11:19:59 UTC 2010
The following commit has been merged in the ppa/intrepid branch:
commit cfbf960926b2ad212fb130bc895b25c113c6a166
Merge: b51af0b7f9867dcb4fad538fb3835d002bae7a96 324b128928b369912771d8c92ca3fd87e110537f
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Sun Feb 28 07:32:33 2010 +0800
Merge branch 'ppa/jaunty' into ppa/intrepid
Conflicts:
debian/changelog
debian/control
debian/rules
diff --combined debian/changelog
index 81815d1,2b1c6eb..6fdbc21
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,75 +1,93 @@@
++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:
+ + 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> Sun, 28 Feb 2010 07:27:26 +0800
+
+ banshee (1.5.4-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
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 27 Feb 2010 15:54:13 +0800
+
+ banshee (1.5.4-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ + New features:
+ - Opt-In Usage Data Collection
+ - Default Equalizer Presets
+ - Extensible Shuffle Modes
+ + Enhancements:
+ - Wikipedia context pane extension enabled by default
+ - Add support for Nokia N900 phones
+ - Add tooltip to playback error column
+ - On close Internet Archive item, return to Search
+ - Notify user if trying to sync missing file to DAP
+ - Popup explanation of manual playlist ordering when appropriate
+ - Simplify the default set of columns in Podcasts
+ - Enable 'Delete From Drive' action in File System Queue
+ - Coverart for unicode artist/albums now supported
+ - Dropped glade-sharp dep; GNOME 3.0 ready
+ - Add columns showing track sample rate and bits per sample
+ - Option to sort an artist's albums by year, not title
+ - If starting Banshee hidden (--hide), up to half a second of
+ startup time is saved
+ + Notable bug fixes:
+ - Enable LibraryWatcher only for Music and Video libraries
+ - Do better job preserving IsCompilation metadata
+ - Store some PlayQueue settings in the db (not GConf)
+ - Update to Last.fm's API change for scrobbling/recs
+ - Bring back static FileNamePattern API used by some scripts
+ - Fix several memory leaks
+ + Other bugs fixed:
+ - Fix segfault with Cairo when playing a song without album art (LP: #523913)
+ - Follow symlinks when scanning the library (LP: #406667)
+ - Fix issue importing mp3s with non-ASCII ID3 tags (LP: #364562)
+ * debian/control:
+ + Bump libtaglib-cil-dev version requirement to 2.0.3.5
+ + Drop libglade2.0-cil-dev and libgnome2.0-cil-dev build-dep
+ + Add libwebkit-cil-dev to build-deps
+ * debian/rules:
+ + Reorder configure flags to match upstream's ./configure --help listing
+ + Add --enable-webkit since it is now enabled by default
+ * debian/patches/01_monodoc-fix-enable.patch,
+ debian/patches/series:
+ + Dropped, applied upstream
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 26 Feb 2010 01:23:59 +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:
@@@ -32,8 -95,9 +113,9 @@@ banshee (1.5.4~really1.5.3-0ubuntu1~hyp
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 29 Jan 2010 00:23:27 +0800
- banshee (1.5.3-1) UNRELEASED; urgency=low
+ banshee (1.5.3-1) unstable; urgency=low
+ [ Chow Loong Jin ]
* New upstream release
+ New features:
- Sync device from playlist option
@@@ -73,6 -137,12 +155,12 @@@
* debian/patches/:
+ 01_monodoc-fix-enable.patch: Fix usage of AC_ARG_ENABLE for --enable-docs
+ [ Jo Shields ]
+ * debian/control:
+ + Drop individual library build-deps as all mono libs are pulled in at
+ build time
+ + Bump Standards version to 3.8.4 (no changes needed)
+
-- Chow Loong Jin <hyperair at ubuntu.com> Thu, 28 Jan 2010 23:52:53 +0800
banshee (1.5.2-1) unstable; urgency=low
@@@ -136,15 -206,6 +224,15 @@@
-- 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:
@@@ -381,14 -442,6 +469,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:
@@@ -400,12 -453,6 +488,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 68cb187,924c989..d447051
--- a/debian/control
+++ b/debian/control
@@@ -9,25 -9,23 +9,24 @@@ 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,
libndesk-dbus1.0-cil (>= 0.5),
libndesk-dbus-glib1.0-cil (>= 0.3),
libmono-addins-gui0.2-cil (>= 0.3),
- libtaglib2.0-cil (>= 2.0.3.2),
+ libtaglib-cil-dev (>= 2.0.3.5),
libmono-zeroconf1.0-cil (>= 0.7.3),
libnotify0.4-cil,
libglib2.0-cil (>= 2.10),
libgtk2.0-cil (>= 2.12),
- libglade2.0-cil (>= 2.10),
- libgconf2.24-cil,
+ libgconf2.0-cil (>= 2.10),
libipod-cil-dev (>= 0.8.5),
libipodui-cil-dev (>= 0.8.5),
libkarma-cil (>= 0.0.5),
+ libwebkit1.0-cil (>= 0.2),
monodoc-base (>= 1.1.9),
libsqlite3-dev (>= 3.4),
libmtp-dev (>= 0.2.0),
@@@ -39,7 -37,7 +38,7 @@@
libxxf86vm-dev (>= 1:1.0.1),
libgstreamer0.10-dev (>= 0.10.12),
libgstreamer-plugins-base0.10-dev (>= 0.10.12)
- Standards-Version: 3.8.3
+ Standards-Version: 3.8.4
Homepage: http://www.banshee-project.org
Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/banshee.git
Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/banshee.git
diff --combined debian/rules
index 4671da1,2ca1077..2bc79a8
--- a/debian/rules
+++ b/debian/rules
@@@ -7,23 -7,22 +7,22 @@@ LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as
override_dh_auto_configure:
dh_auto_configure -- --disable-static \
- --enable-release \
--disable-tests \
- --disable-shave \
--with-vendor-build-id="`lsb_release -ds`" \
--disable-clutter \
+ --disable-builtin-equalizer \
--enable-boo \
--enable-docs \
+ --enable-webkit \
--enable-gnome \
--enable-schemas-install \
--enable-mtp \
--enable-ipod \
--enable-karma \
+ --disable-remote-audio \
--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