[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ubuntu, updated. debian/1.5.5-1ubuntu2-13-g6cd5520
Chow Loong Jin
hyperair at ubuntu.com
Sun Apr 4 10:33:00 UTC 2010
The following commit has been merged in the ubuntu branch:
commit 28ef3fcc520d8b11483845781bc9f1ded63fc59a
Merge: 2dd972ee907f45890fd6f12d1254c5b669f75487 14a22ebe97c13d06568954c525aa7356da6ebf44
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Sun Apr 4 18:20:57 2010 +0800
Merge branch 'master' into ubuntu
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index 2f5b8e8,0a79451..9913d24
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,36 +1,44 @@@
- banshee-community-extensions (1.5.5-1ubuntu2) lucid; urgency=low
++banshee-community-extensions (1.6.0-1ubuntu1) lucid; urgency=low
++
++ * debian/(control, rules):
++ + Enable AppIndicator, Lirc and U1MS extensions
++ * Fixes needs-packaging bug (LP: #537691)
++
++ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 04 Apr 2010 18:17:28 +0800
++
+ banshee-community-extensions (1.6.0-1) UNRELEASED; urgency=low
+
+ * 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> Sun, 04 Apr 2010 18:00:24 +0800
+
+ banshee-community-extensions (1.5.5-2) unstable; urgency=low
* debian/control:
+ + 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/*)
- -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 25 Mar 2010 23:05:55 +0800
-
- banshee-community-extensions (1.5.5-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
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 25 Mar 2010 11:17:11 +0800
banshee-community-extensions (1.5.5-1) unstable; urgency=low
- * Initial release (LP: #537691)
+ * Initial release (Closes: #570329)
- -- Chow Loong Jin <hyperair at ubuntu.com> Wed, 17 Mar 2010 00:50:46 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Mar 2010 21:36:21 +0800
diff --combined debian/control
index ff21d80,7ba965b..f3baef2
--- a/debian/control
+++ b/debian/control
@@@ -6,12 -6,11 +6,11 @@@ Uploaders: Chow Loong Jin <hyperair at ubu
Build-Depends: debhelper (>= 7.0.50),
cli-common-dev (>= 0.5.7),
mono-devel (>= 2.4.2.3),
- quilt (>= 0.46-7~),
autotools-dev,
lsb-release,
banshee (>= 1.5.5),
pkg-config,
-# liblircclient-dev (>= 0.8.6),
+ liblircclient-dev (>= 0.8.6),
libglib2.0-dev,
libfftw3-dev,
libsqlite3-dev (>= 3.3),
@@@ -28,7 -27,8 +27,8 @@@
libndesk-dbus1.0-cil-dev,
libmono-addins-cil-dev,
libnotify-cil-dev,
-# libappindicator-cil-dev
-# libubuntuone1.0-cil-dev
+ libubuntuone1.0-cil-dev
++ libappindicator-cil-dev
Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/banshee-community-extensions.git
Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/banshee-community-extensions.git
@@@ -37,11 -37,12 +37,12 @@@ Homepage: http://gitorious.org/banshee-
Package: banshee-community-extensions
Architecture: all
Depends: banshee-extension-alarm (>= ${source:Version}),
-# banshee-extension-appindicator (>= ${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-lirc (>= ${source:Version}),
banshee-extension-liveradio (>= ${source:Version}),
banshee-extension-lyrics (>= ${source:Version}),
banshee-extension-magnatune (>= ${source:Version}),
@@@ -49,7 -50,7 +50,7 @@@
banshee-extension-radiostationfetcher (>= ${source:Version}),
banshee-extension-streamrecorder (>= ${source:Version}),
banshee-extension-telepathy (>= ${source:Version}),
-# banshee-extension-ubuntuonemusicstore (>= ${source:Version}),
+ banshee-extension-ubuntuonemusicstore (>= ${source:Version}),
${misc:Depends}
Description: set of community contributed extensions for Banshee
This package is a metapackage which depends on the current versions of all the
@@@ -78,6 -79,19 +79,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}),
-# # TODO: binary-dep on appind things
-# ${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-appindicator
++Architecture: all
++Depends: banshee (>= ${banshee:Version}),
++ banshee-extensions-common (= ${source:Version}),
++ TODO: binary-dep on appind things
++ ${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}),
@@@ -124,17 -138,17 +138,17 @@@ Description: LCD display integration ex
.
Banshee is a media management and playback application for the GNOME desktop.
-# Package: banshee-extension-lirc
-# Architecture: any
-# Depends: banshee (>= ${banshee:Version}),
-# banshee-extensions-common (= ${source:Version}),
-# lirc,
-# ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}
-# Description: LIRC integration extension for Banshee
-# This package provides LIRC integration for Banshee, which will allow Banshee to
-# be controlled using an infra-red device.
-# .
-# Banshee is a media management and playback application for the GNOME desktop.
+Package: banshee-extension-lirc
+Architecture: any
+Depends: banshee (>= ${banshee:Version}),
+ banshee-extensions-common (= ${source:Version}),
+ lirc,
+ ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}
+Description: LIRC integration extension for Banshee
+ This package provides LIRC integration for Banshee, which will allow Banshee to
+ be controlled using an infra-red device.
+ .
+ Banshee is a media management and playback application for the GNOME desktop.
Package: banshee-extension-liveradio
Architecture: all
@@@ -256,12 -270,12 +270,12 @@@ Description: Telepathy extension for Ba
.
Banshee is a media management and playback application for the GNOME desktop.
-# Package: banshee-extension-ubuntuonemusicstore
-# Architecture: all
-# Depends: banshee (>= ${banshee:Version}),
-# banshee-extensions-common (= ${source:Version}),
-# ${cli:Depends}, ${misc:Depends}
-# Description: Ubuntu One Music Store extension for Banshee
-# This extension makes the Ubuntu One Music Store available in Banshee.
-# .
-# Banshee is a media management and playback application for the GNOME desktop.
+Package: banshee-extension-ubuntuonemusicstore
+Architecture: all
+Depends: banshee (>= ${banshee:Version}),
+ banshee-extensions-common (= ${source:Version}),
+ ${cli:Depends}, ${misc:Depends}
+Description: Ubuntu One Music Store extension for Banshee
+ This extension makes the Ubuntu One Music Store available in Banshee.
+ .
+ Banshee is a media management and playback application for the GNOME desktop.
diff --combined debian/rules
index 584da5f,01de786..cf912a4
--- a/debian/rules
+++ b/debian/rules
@@@ -12,11 -12,12 +12,12 @@@ override_dh_auto_configure
--enable-gnome \
--enable-schemas-install \
--enable-alarmclock \
- --disable-appindicator
++ --enable-appindicator
--enable-awn \
--disable-clutterflow \
--enable-coverwallpaper \
--enable-lcd \
- --disable-lirc \
+ --enable-lirc \
--enable-lyrics \
--enable-liveradio \
--enable-magnatune \
@@@ -24,7 -25,7 +25,7 @@@
--enable-radiostationfetcher \
--enable-streamrecorder \
--enable-telepathy \
- --disable-ubuntuonemusicstore \
+ --enable-ubuntuonemusicstore \
--disable-shave \
MCS=/usr/bin/mono-csc
@@@ -35,4 -36,4 +36,4 @@@ override_dh_gencontrol
dh_gencontrol
%:
- dh --with=quilt $@
+ dh $@
--
banshee-community-extensions
More information about the Pkg-cli-apps-commits
mailing list