[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ppa/unstable/karmic, updated. ppa/1.9.3-1ubuntu1_hyper1+karmic-45-g80b46f2
Chow Loong Jin
hyperair at ubuntu.com
Sat Mar 26 20:41:24 UTC 2011
The following commit has been merged in the ppa/unstable/karmic branch:
commit 22ff9516fd1b602272ac46f0de4faccb7f7d31d0
Merge: 0c40d3ff8bf1b7b02485e7eab7e4df6b02391bba 9e5ab3b08632d34a7c9a0b5eeca52d91f4e57d46
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Sun Mar 27 04:24:24 2011 +0800
Merge branch 'ppa/unstable/lucid' into ppa/unstable/karmic
Conflicts:
debian/banshee-extension-clutterflow.install
diff --combined debian/changelog
index 57b996f,e80fa63..3ff9e6a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,43 +1,52 @@@
+ banshee-community-extensions (1.9.6-1ubuntu1~hyper1+lucid) lucid; urgency=low
+
+ * Backport to lucid
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 27 Mar 2011 04:19:47 +0800
+
+ banshee-community-extensions (1.9.6-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Backport to maverick
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 27 Mar 2011 04:13:59 +0800
+
+ banshee-community-extensions (1.9.6-1ubuntu1~hyper1+natty) natty; urgency=low
+
+ * Backport to natty
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 27 Mar 2011 03:41:18 +0800
+
+ banshee-community-extensions (1.9.6-1ubuntu1) natty; urgency=low
+
+ * [ceb501c] Merge from Debian Unstable, remaining changes:
+ + Enable LIRC and AppIndicator extensions
+
+ -- 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
+
+ * [9bb7ba5] New upstream release:
+ + Enhancements:
+ * Jamendo: Allow cancelling downloads
+ * Karaoke: Use youtubelyric.com for optional scrolling lyrics display
+ + Bugs Fixed:
+ * ClutterFlow: Handle horizontal scrolling properly (bgo#644609)
+ * Streamrecorder: Fix recording of some streams (bgo#642933)
+ * [7075073] Disable dh_makeclilibs in bce
+ * [5f80d8d] Fix URL in debian/watch
+ * [34f0c48] Handle rename of banshee-1 to banshee
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 26 Mar 2011 01:22:16 +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
@@@ -32,7 -63,7 +72,7 @@@ banshee-community-extensions (1.9.5-1ub
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 11 Mar 2011 22:21:22 +0800
- banshee-community-extensions (1.9.5-1) UNRELEASED; urgency=low
+ banshee-community-extensions (1.9.5-1) unstable; urgency=low
* [aea54e9] New upstream release:
+ Enhancements:
@@@ -49,15 -80,6 +89,15 @@@
-- 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
@@@ -103,16 -125,6 +143,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
@@@ -153,15 -165,6 +193,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
@@@ -240,14 -243,6 +280,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:
@@@ -301,14 -296,6 +341,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:
@@@ -353,20 -340,6 +393,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
@@@ -393,22 -366,6 +433,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
@@@ -550,15 -507,6 +590,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/rules
index 2a24ecc,cc757e6..83e4791
--- a/debian/rules
+++ b/debian/rules
@@@ -3,7 -3,7 +3,7 @@@
include /usr/share/cli-common/cli.make
- BANSHEE_VERSION = $(shell pkg-config --modversion banshee-1-thickclient)
+ BANSHEE_VERSION = $(shell pkg-config --modversion banshee-thickclient)
# disable zeitgeistdataprovider and lirc due to dependencies missing
override_dh_auto_configure:
@@@ -13,9 -13,9 +13,9 @@@
--enable-schemas-install \
--enable-alarmclock \
--enable-ampache \
- --enable-appindicator \
+ --disable-appindicator \
--enable-awn \
- --enable-clutterflow \
+ --disable-clutterflow \
--enable-coverwallpaper \
--enable-jamendo \
--enable-karaoke \
@@@ -34,7 -34,7 +34,7 @@@
--enable-zeitgeistdataprovider \
--disable-shave \
--enable-user-help \
- MCS=/usr/bin/mono-csc
+ MCS=/usr/bin/csc
override_dh_gencontrol:
for pkg in `sed -n 's/^Package: //p' debian/control`; do \
@@@ -42,5 -42,8 +42,8 @@@
done
dh_gencontrol
+ override_dh_makeclilibs: # do nothing -- we do not want clilibs to come
+ # from anything, and especially not clutterflow.
+
%:
dh $@
--
banshee-community-extensions
More information about the Pkg-cli-apps-commits
mailing list