[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ppa/karmic, updated. ppa/1.9.6-1ubuntu1_hyper1+karmic-21-g4da53d4
Chow Loong Jin
hyperair at ubuntu.com
Thu Apr 7 04:05:32 UTC 2011
The following commit has been merged in the ppa/karmic branch:
commit 74cc02de5c7b0f0bbd9ad3580da1febaf8da438d
Merge: 2b5fe181b9c82cfae7ca459c631d9652b858a70d a3a9740655964ce6dd7ee2ab666341dfee9427fa
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Thu Apr 7 08:28:00 2011 +0800
Merge branch 'ppa/lucid' into ppa/karmic
Conflicts:
debian/control
debian/gbp.conf
diff --combined debian/changelog
index ec2ffef,abc3601..7090630
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,38 +1,47 @@@
+ banshee-community-extensions (2.0.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
+
+ * Backport to lucid
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 07 Apr 2011 08:26:03 +0800
+
+ banshee-community-extensions (2.0.0-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Backport to maverick
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 07 Apr 2011 08:21:39 +0800
+
+ banshee-community-extensions (2.0.0-1ubuntu1~hyper1+natty) natty; urgency=low
+
+ * Backport to natty
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 07 Apr 2011 08:16:53 +0800
+
+ banshee-community-extensions (2.0.0-1ubuntu1) natty; urgency=low
+
+ * [36d8c92] Merge from Debian Unstable, remaining changes:
+ + Enable LIRC and AppIndicator extensions
+ * [11e40ce] Drop explicit banshee depends from -lirc
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 07 Apr 2011 00:11:26 +0800
+
+ banshee-community-extensions (2.0.0-1) UNRELEASED; urgency=low
+
+ * [b1cf183] New upstream release
+ + Lyrics: Improve writing lyrics to the cache
+ + i18n: Update translations from transifex
+ * [5ca7849] Drop explicit Banshee depends from -clutterflow
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 07 Apr 2011 00:00:13 +0800
+
+banshee-community-extensions (1.9.6-1ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + Use -cil packages for build-dep instead of -cil-dev
+ + Use csc instead of mono-csc
+ + Disable appindicator and clutterflow
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 13 Mar 2011 00:42:15 +0800
+
banshee-community-extensions (1.9.6-1ubuntu1~hyper1+lucid) lucid; urgency=low
* Backport to lucid
@@@ -32,7 -58,7 +67,7 @@@ banshee-community-extensions (1.9.6-1ub
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 11 Mar 2011 22:21:22 +0800
- banshee-community-extensions (1.9.6-1) UNRELEASED; urgency=low
+ banshee-community-extensions (1.9.6-1) unstable; urgency=low
* [9bb7ba5] New upstream release:
+ Enhancements:
@@@ -48,15 -74,6 +83,15 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 27 Mar 2011 04:32:23 +0800
+banshee-community-extensions (1.9.5-1ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + Use -cil packages for build-dep instead of -cil-dev
+ + Use csc instead of mono-csc
+ + Disable appindicator and clutterflow
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 13 Mar 2011 00:42:15 +0800
+
banshee-community-extensions (1.9.5-1ubuntu1~hyper1+lucid) lucid; urgency=low
* Backport to lucid
@@@ -99,15 -116,6 +134,15 @@@ banshee-community-extensions (1.9.5-1)
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 11 Mar 2011 21:50:31 +0800
+banshee-community-extensions (1.9.3-1ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + Use -cil packages for build-dep instead of -cil-dev
+ + Use csc instead of mono-csc
+ + Disable appindicator and clutterflow
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 20 Feb 2011 16:16:14 +0800
+
banshee-community-extensions (1.9.3-1ubuntu1~hyper1+lucid) lucid; urgency=low
* No change upload to Lucid
@@@ -153,16 -161,6 +188,16 @@@ banshee-community-extensions (1.9.3-1)
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 20 Feb 2011 16:48:42 +0800
+banshee-community-extensions (1.9.2-1ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + Use -cil packages for build-dep instead of -cil-dev
+ + Use csc instead of mono-csc
+ + Disable appindicator
+ * [96762e9] Disable clutterflow extension
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 14 Jan 2011 16:50:46 +0800
+
banshee-community-extensions (1.9.2-1ubuntu1~hyper1+lucid) lucid; urgency=low
* No change upload to PPA
@@@ -203,15 -201,6 +238,15 @@@ banshee-community-extensions (1.9.2-1)
-- Chow Loong Jin <hyperair at ubuntu.com> Wed, 19 Jan 2011 22:03:57 +0800
+banshee-community-extensions (1.9.1-1ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + Use -cil packages for build-dep instead of -cil-dev
+ + Use csc instead of mono-csc
+ + Disable appindicator
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 26 Dec 2010 19:12:44 +0800
+
banshee-community-extensions (1.9.1-1ubuntu1~hyper1+lucid) lucid; urgency=low
* No change upload to PPA
@@@ -290,14 -279,6 +325,14 @@@ banshee-community-extensions (1.9.0-1ub
-- Iain Lane <laney at ubuntu.com> Wed, 24 Nov 2010 14:59:52 +0000
+banshee-community-extensions (1.9.0-1ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + Revert -cil-dev transition
+ + Disable U1MS and AppIndicator
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Nov 2010 18:07:42 +0800
+
banshee-community-extensions (1.9.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
* Merge from Maverick, remaining changes:
@@@ -351,14 -332,6 +386,14 @@@ banshee-community-extensions (1.9.0-1)
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Nov 2010 14:19:02 +0800
+banshee-community-extensions (1.8.0-1ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + Revert -cil-dev transition
+ + Disable U1MS and AppIndicator
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 02 Oct 2010 19:52:09 +0800
+
banshee-community-extensions (1.8.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
* Backport to Lucid, changes:
@@@ -403,20 -376,6 +438,20 @@@ banshee-community-extensions (1.7.6-0ub
-- Emmet Hikory <persia at ubuntu.com> Sun, 19 Sep 2010 12:01:03 +0900
+banshee-community-extensions (1.7.6-0ubuntu2~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + Use -cil instead of -cil-dev
+ + Use csc instead of mono-csc
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 20 Sep 2010 04:51:16 +0800
+
+banshee-community-extensions (1.7.6-0ubuntu2~hyper1+lucid) lucid; urgency=low
+
+ * No change backport to Lucid
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 20 Sep 2010 04:36:50 +0800
+
banshee-community-extensions (1.7.6-0ubuntu1) maverick; urgency=low
* New upstream release
@@@ -443,22 -402,6 +478,22 @@@ banshee-community-extensions (1.7.4-1ub
-- Iain Lane <laney at ubuntu.com> Mon, 13 Sep 2010 23:14:59 +0100
+banshee-community-extensions (1.7.4-1ubuntu1) maverick; urgency=low
+
+ * Merge from experimental, remaining changes:
+ + Enable AppIndicator, Lirc, SoundMenu, and U1MS
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Tue, 24 Aug 2010 22:02:51 +0800
+
+banshee-community-extensions (1.7.4-1ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Backport to Karmic
+ * Set debian-branch to ppa/unstable/karmic
+ * Use -cil instead of -cil-dev
+ * Use csc instead of mono-csc
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 13 Sep 2010 04:21:34 +0800
+
banshee-community-extensions (1.7.4-1ubuntu1~hyper1+lucid) lucid; urgency=low
* Backport to Lucid
@@@ -600,15 -543,6 +635,15 @@@ banshee-community-extensions (1.6.0-1ub
-- Chow Loong Jin <hyperair at ubuntu.com> Sat, 10 Apr 2010 02:05:28 +0800
+banshee-community-extensions (1.6.0-1ubuntu1~hyper1~karmic) karmic; urgency=low
+
+ * Backport to karmic, changes:
+ + debian/control, debian/rules:
+ - Disable u1ms and appindicator
+ - Revert -cil-dev transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Tue, 06 Apr 2010 18:16:41 +0800
+
banshee-community-extensions (1.6.0-1ubuntu1) lucid; urgency=low
* debian/(control, rules):
diff --combined debian/control
index 36ee936,acdea87..0ac0a98
--- a/debian/control
+++ b/debian/control
@@@ -19,19 -19,22 +19,19 @@@ Build-Depends: debhelper (>= 7.0.50)
libgstreamer-plugins-base0.10-dev (>= 0.10.15),
libsamplerate0-dev,
intltool (>= 0.35),
- libgconf2.0-cil-dev,
- libglib2.0-cil-dev,
- libgtk2.0-cil-dev,
+ libgconf2.0-cil,
+ libglib2.0-cil,
+ libgtk2.0-cil,
libtaglib-cil-dev,
- libndesk-dbus-glib1.0-cil-dev,
- libndesk-dbus1.0-cil-dev,
- libmono-addins-cil-dev,
- libnotify-cil-dev,
- libappindicator0.1-cil-dev,
- libtaoframework-opengl-cil-dev (>= 2.1),
- libtaoframework-freeglut-cil-dev,
- libtaoframework-sdl-cil-dev (>= 1.2.13),
+ libndesk-dbus-glib1.0-cil,
+ libndesk-dbus1.0-cil,
+ libmono-addins0.2-cil,
+ libnotify0.4-cil,
+ libtaoframework-opengl3.0-cil (>= 2.1),
+ libtaoframework-freeglut2.4-cil,
+ libtaoframework-sdl1.2-cil (>= 1.2.13),
mono-jay,
gnome-doc-utils (>= 0.17.3),
- libclutter-cil-dev,
- libclutter-gtk-cil-dev,
libzeitgeist-cil-dev
Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/banshee-community-extensions.git
@@@ -42,8 -45,10 +42,8 @@@ Package: banshee-community-extension
Architecture: all
Recommends: banshee-extension-alarm (>= ${source:Version}),
banshee-extension-ampache (>= ${source:Version}),
- banshee-extension-appindicator (>= ${source:Version}),
banshee-extension-awn (>= ${source:Version}),
banshee-extension-coverwallpaper (>= ${source:Version}),
- banshee-extension-clutterflow (>= ${source:Version}),
banshee-extension-jamendo (>= ${source:Version}),
banshee-extension-lastfmfingerprint (>= ${source:Version}),
banshee-extension-lcd (>= ${source:Version}),
@@@ -100,6 -105,17 +100,6 @@@ Description: Ampache extension for Bans
.
Banshee is a media management and playback application for the GNOME desktop
-Package: banshee-extension-appindicator
-Architecture: all
-Depends: banshee-extensions-common (= ${source:Version}),
- ${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
Enhances: banshee
Architecture: all
@@@ -112,6 -128,16 +112,6 @@@ Description: AWN integration extension
.
Banshee is a media management and playback application for the GNOME desktop.
-Package: banshee-extension-clutterflow
-Architecture: all
-Depends: banshee-extensions-common (= ${source:Version}),
- ${cli:Depends}, ${misc:Depends}
-Description: CoverFlow functionality for Banshee
- This package provides a clone of the CoverFlow functionality for
- Banshee using the Clutter toolkit.
- .
- Banshee is a media management and playback application for the GNOME desktop.
-
Package: banshee-extension-coverwallpaper
Enhances: banshee
Architecture: all
@@@ -173,8 -199,7 +173,7 @@@ Description: LCD display integration ex
Package: banshee-extension-lirc
Architecture: any
- Depends: banshee (>= ${banshee:Version}),
- banshee-extensions-common (= ${source:Version}),
+ Depends: banshee-extensions-common (= ${source:Version}),
lirc,
${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}
Description: LIRC integration extension for Banshee
--
banshee-community-extensions
More information about the Pkg-cli-apps-commits
mailing list