[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ppa/intrepid, updated. debian/1.6.0-1-31-g61fb0c8
Chow Loong Jin
hyperair at ubuntu.com
Tue Apr 6 13:00:47 UTC 2010
The following commit has been merged in the ppa/intrepid branch:
commit 61fb0c86c4bcd2855e21f303434f0d8083c16165
Merge: 99b13f642169765b637ba4b9790a6b1c9a5c99f4 6e7287a8345382dfdc60879499e7f3cbf76b9ec7
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Tue Apr 6 18:52:12 2010 +0800
Merge branch 'ppa/jaunty' into ppa/intrepid
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index 8b50076,4ed94ba..be16b00
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,4 +1,16 @@@
- banshee-community-extensions (1.5.5-1ubuntu1~hyper1~intrepid) intrepid; urgency=low
++banshee-community-extensions (1.6.0-1ubuntu1~hyper1~intrepid) intrepid; urgency=low
+
+ * Merge from jaunty, remaining changes:
+ + debian/control:
+ - Use mono-gmcs | c-sharp-2.0-compiler instead of mono-devel
+ - Add libmono-dev (>= 1.9.1) build-dep
+ - Use libgconf2.0-cil instead of libgconf2.24-cil
+ + debian/rules:
+ - Drop MCS override
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Wed, 24 Mar 2010 16:26:06 +0800
+
- banshee-community-extensions (1.5.5-1ubuntu1~hyper1~jaunty) jaunty; urgency=low
+ banshee-community-extensions (1.6.0-1ubuntu1~hyper1~jaunty) jaunty; urgency=low
* Merge from karmic, remaining changes:
+ debian/{control,rules}
@@@ -19,90 -7,58 +19,58 @@@
- Disable lirc (insufficient build-depends)
- Disable telepathy (needs newer mono)
- -- Chow Loong Jin <hyperair at ubuntu.com> Wed, 24 Mar 2010 15:40:48 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com> Tue, 06 Apr 2010 18:39:18 +0800
- banshee-community-extensions (1.5.5-1ubuntu1~hyper1~karmic) karmic; urgency=low
+ banshee-community-extensions (1.6.0-1ubuntu1~hyper1~karmic) karmic; urgency=low
* Backport to karmic, changes:
+ debian/control, debian/rules:
- - Disable u1ms
+ - Disable u1ms and appindicator
- Revert -cil-dev transition
- -- Chow Loong Jin <hyperair at ubuntu.com> Wed, 24 Mar 2010 14:15:04 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com> Tue, 06 Apr 2010 18:16:41 +0800
- banshee-community-extensions (1.5.5-1ubuntu1) lucid; urgency=low
+ banshee-community-extensions (1.6.0-1ubuntu1) lucid; urgency=low
- * Changes from Debian not yet uploaded:
- + debian/control:
- - Fix double "and" in the description of -empathy
- * Ubuntu-specific changes:
- + debian/control, rules:
- - Enable banshee-extension-{ubuntuonemusicstore,lirc}
- + Fixes needs-packaging bug (LP: #537691)
-
- -- Chow Loong Jin <hyperair at ubuntu.com> Wed, 24 Mar 2010 13:53:06 +0800
-
- banshee-community-extensions (1.5.5-1) unstable; urgency=low
-
- * Initial release (LP: #537691)
-
- -- Chow Loong Jin <hyperair at ubuntu.com> Wed, 17 Mar 2010 00:50:46 +0800
-
- banshee-community-extensions (1.5.4-1~hyper2~intrepid) intrepid; urgency=low
-
- * Merge from jaunty, remaining changes:
- + debian/control:
- - Use mono-gmcs | c-sharp-2.0-compiler instead of mono-devel
- - Add libmono-dev (>= 1.9.1) build-dep
- - Use libgconf2.0-cil instead of libgconf2.24-cil
- + debian/rules:
- - Drop MCS override
+ * debian/(control, rules):
+ + Enable AppIndicator, Lirc and U1MS extensions
+ * Fixes needs-packaging bug (LP: #537691)
- -- Chow Loong Jin <hyperair at ubuntu.com> Wed, 03 Mar 2010 01:24:24 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 04 Apr 2010 18:17:28 +0800
- banshee-community-extensions (1.5.4-1~hyper2~jaunty) jaunty; urgency=low
+ banshee-community-extensions (1.6.0-1) unstable; urgency=low
- * Merge from karmic, remaining changes:
- + debian/{control,rules}
- - Use mono-devel 2.0.1 and /usr/bin/csc
- - libgconf2.0-cil => libgconf2.24-cil
+ * New upstream release
+ * debian/(control, banshee-extension-appindicator.install):
+ + Add Application Indicator package and build-depends (commented out
+ because these dependencies are not present in Debian yet)
+ * debian/copyright:
+ + Document more MIT/X11 files in Mirage's source
+ + Document LGPL-3 files in Banshee.Telepathy
+ + Document bundled NDesk.DBus in Banshee.Telepathy
+ + Document Banshee.Lirc copyrights
+ * debian/rules:
+ + --disable-appindicator
+ * debian/patches/*, debian/control, debian/rules:
+ + Drop all patches, applied upstream and/or not needed any more
+ + De-quiltify package
- -- Chow Loong Jin <hyperair at ubuntu.com> Wed, 03 Mar 2010 01:18:30 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 04 Apr 2010 18:00:24 +0800
- banshee-community-extensions (1.5.4-1~hyper2~karmic) karmic; urgency=low
+ banshee-community-extensions (1.5.5-2) unstable; urgency=low
* debian/control:
- + Shift awn dependency to banshee-extension-awn
- * debian/patches/01_random-by-similar.patch:
- + Fix crash with random-by-similar
-
- -- Chow Loong Jin <hyperair at ubuntu.com> Wed, 03 Mar 2010 00:53:41 +0800
-
- banshee-community-extensions (1.5.4-1~hyper1~intrepid) intrepid; urgency=low
-
- * Backport to intrepid, changes:
- + debian/control:
- - Use mono-gmcs | c-sharp-2.0-compiler instead of mono-devel
- - Add libmono-dev (>= 1.9.1) build-dep
- - Use libgconf2.0-cil instead of libgconf2.24-cil
- + debian/rules:
- - Drop MCS override
-
- -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 28 Feb 2010 18:38:10 +0800
-
- banshee-community-extensions (1.5.4-1~hyper1~jaunty) jaunty; urgency=low
+ + Fix double "and" in the description of -empathy
+ + Add lsb-release to build-dep
+ * debian/(control, rules, banshee-extension-liveradio.install):
+ + Enable and add banshee-extension-liveradio package
+ * debian/copyright:
+ + Update (document src/LiveRadio/* and src/CoverWallpaper/*)
- * Backport to jaunty, changes:
- + debian/{control,rules}:
- - Use mono-devel 2.0.1 and /usr/bin/csc
- - libgconf2.0-cil => libgconf2.24-cil
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 25 Mar 2010 11:17:11 +0800
- -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 28 Feb 2010 18:09:21 +0800
-
- banshee-community-extensions (1.5.4-1~hyper1~karmic) karmic; urgency=low
-
- * Backport to karmic, changes:
- + Revert -cil-dev transition
+ banshee-community-extensions (1.5.5-1) unstable; urgency=low
- -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 28 Feb 2010 17:30:19 +0800
+ * Initial release (Closes: #570329)
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Mar 2010 21:36:21 +0800
diff --combined debian/control
index a9c81ef,26c2335..8f62ff0
--- a/debian/control
+++ b/debian/control
@@@ -5,10 -5,9 +5,10 @@@ Maintainer: Debian CLI Applications Tea
Uploaders: Chow Loong Jin <hyperair at ubuntu.com>
Build-Depends: debhelper (>= 7.0.50),
cli-common-dev (>= 0.5.7),
- mono-devel (>= 2.0.1),
+ mono-gmcs | c-sharp-2.0-compiler,
+ libmono-dev (>= 1.9.1),
- quilt (>= 0.46-7~),
autotools-dev,
+ lsb-release,
banshee (>= 1.5.5),
pkg-config,
# liblircclient-dev (>= 0.8.6),
@@@ -20,7 -19,7 +20,7 @@@
libsamplerate0-dev,
intltool (>= 0.35),
libwebkit1.0-cil,
- libgconf2.24-cil,
+ libgconf2.0-cil,
libglib2.0-cil,
libgtk2.0-cil,
libtaglib-cil-dev,
@@@ -36,11 -35,13 +36,13 @@@ Homepage: http://gitorious.org/banshee-
Package: banshee-community-extensions
Architecture: all
Depends: banshee-extension-alarm (>= ${source:Version}),
+ # banshee-extension-appindicator (>= ${source:Version}),
banshee-extension-awn (>= ${source:Version}),
# banshee-extension-clutterflow (>= ${source:Version}),
banshee-extension-coverwallpaper (>= ${source:Version}),
banshee-extension-lcd (>= ${source:Version}),
# banshee-extension-lirc (>= ${source:Version}),
+ banshee-extension-liveradio (>= ${source:Version}),
banshee-extension-lyrics (>= ${source:Version}),
banshee-extension-magnatune (>= ${source:Version}),
banshee-extension-mirage (>= ${source:Version}),
@@@ -76,6 -77,19 +78,19 @@@ Description: Alarm extension for Banshe
.
Banshee is a media management and playback application for the GNOME desktop.
+ # Package: banshee-extension-appindicator
+ # Architecture: all
+ # Depends: banshee (>= ${banshee:Version}),
+ # banshee-extensions-common (= ${source:Version}),
+ # indicator-applet, indicator-application,
+ # ${cli:Depends}, ${misc:Depends}
+ # Description: Application Indicator extension for Banshee
+ # This package provides integration for Banshee with Application Indicators,
+ # which is a replacement for the notification area in Ubuntu, as a way to add
+ # menus in the panel.
+ # .
+ # Banshee is a media management and playback application for the GNOME desktop.
+
Package: banshee-extension-awn
Architecture: all
Depends: banshee (>= ${banshee:Version}),
@@@ -134,6 -148,27 +149,27 @@@ Description: LCD display integration ex
# .
# Banshee is a media management and playback application for the GNOME desktop.
+ Package: banshee-extension-liveradio
+ Architecture: all
+ Depends: banshee (>= ${banshee:Version}),
+ banshee-extensions-common (= ${source:Version}),
+ ${cli:Depends}, ${misc:Depends}
+ Description: LiveRadio extension for Banshee
+ The LiveRadio extension for Banshee is a browser for online Internet station
+ directories integrated into the Banshee media player. It currently supports
+ live365.com, shoutcast.com and xiph.org, but its plugin-like code structure can
+ easily be extended to support just about any directory.
+ .
+ LiveRadio has the follwing features:
+ * Browse and query three online internet radio directories:
+ – live365.com
+ – shoutcast.com
+ – xiph.org
+ * Retrieve stream information and play the stream
+ * Add your favorite streams to your list of Internet Radio stations in Banshee
+ .
+ Banshee is a media management and playback application for the GNOME desktop.
+
Package: banshee-extension-lyrics
Architecture: all
Depends: banshee (>= ${banshee:Version}),
diff --combined debian/rules
index ac0b4fd,85e3fff..d95bd99
--- a/debian/rules
+++ b/debian/rules
@@@ -6,27 -6,28 +6,27 @@@ include /usr/share/cli-common/cli.mak
BANSHEE_VERSION = $(shell pkg-config --modversion banshee-1-thickclient)
# disable clutterflow and lirc due to dependencies missing
- # disable liveradio due to its alpha status
override_dh_auto_configure:
dh_auto_configure -- \
--with-vendor-build-id="`lsb_release -ds`" \
--enable-gnome \
--enable-schemas-install \
--enable-alarmclock \
+ --disable-appindicator \
--enable-awn \
--disable-clutterflow \
--enable-coverwallpaper \
--enable-lcd \
--disable-lirc \
--enable-lyrics \
- --disable-liveradio \
+ --enable-liveradio \
--enable-magnatune \
--enable-mirage \
--enable-radiostationfetcher \
--enable-streamrecorder \
--disable-telepathy \
--disable-ubuntuonemusicstore \
- --disable-shave \
- MCS=/usr/bin/csc
+ --disable-shave
override_dh_gencontrol:
for pkg in `sed -n 's/^Package: //p' debian/control`; do \
@@@ -35,4 -36,4 +35,4 @@@
dh_gencontrol
%:
- dh --with=quilt $@
+ dh $@
--
banshee-community-extensions
More information about the Pkg-cli-apps-commits
mailing list