[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/unstable/maverick, updated. ppa/2.3.5-1ubuntu1_hyper1+maverick-14-g51690e0
Chow Loong Jin
hyperair at debian.org
Tue Mar 13 10:38:23 UTC 2012
The following commit has been merged in the ppa/unstable/maverick branch:
commit 8a920cac870591e3fed20b15f8141b09e2b505b9
Merge: e6028ce0c4cbc81e8b6fcc53c7722b0c05e4ce81 0f47f9fd0a550fd3eaa1a064eb1fbfbefe35ee27
Author: Chow Loong Jin <hyperair at debian.org>
Date: Tue Mar 13 16:24:16 2012 +0800
Merge branch 'ppa/unstable/natty' into ppa/unstable/maverick
diff --combined debian/changelog
index ebb9547,858efa3..e614ae9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,47 +1,54 @@@
+ banshee (2.3.6-1ubuntu1~hyper1+natty) natty; urgency=low
+
+ * Backport to Natty
+
+ -- Chow Loong Jin <hyperair at debian.org> Tue, 13 Mar 2012 16:13:36 +0800
+
+ banshee (2.3.6-1ubuntu1~hyper1+oneiric) oneiric; urgency=low
+
+ * Merge from Precise PPA, remaining changes:
+ + [e48edba] Revert "Disable Ubuntu One extension"
+ This reverts commit 84062006bee1d118e40322a1561b88130f67618d.
+ + [3a43003] Revert "Revert "Lower mono-addins build-dep to 0.6-1-2~
+ (0.6.2 not packaged yet)""
+ This reverts commit 2ccd32314aac46bc98fb5400be6595063ad1c7c1.
+
+ -- Chow Loong Jin <hyperair at debian.org> Tue, 13 Mar 2012 16:11:44 +0800
+
+ banshee (2.3.6-1ubuntu1~hyper1+precise) precise; urgency=low
+
+ * Merge from Ubuntu Precise, remaining changes:
+ + Re-enable boo and karma
+ + Drop amazon URL patch
+
+ -- Chow Loong Jin <hyperair at debian.org> Tue, 13 Mar 2012 15:35:12 +0800
+
+ banshee (2.3.6-1ubuntu1) precise; urgency=low
+
+ * Merge from Debian Experimental, remaining changes:
+ + Enable and recommend SoundMenu and Disable NotificationArea by default
+ + Disable boo and karma extensions
+ + Move desktop file for Meego UI to /usr/share/une/applications
+ + Change the url for the Amazon store redirector
+
+ -- Chow Loong Jin <hyperair at debian.org> Sat, 10 Mar 2012 16:48:03 +0800
+
+ banshee (2.3.6-1) experimental; urgency=low
+
+ * [8466386] Drop deprecated cli.make usage
+ * [c53670c] Imported Upstream version 2.3.6:
+ + bgo#548366: Allow primary sources to marked as temporary
+ + bgo#666981: LibraryWatcher: avoid importing incomplete files
+
+ -- Chow Loong Jin <hyperair at debian.org> Thu, 08 Mar 2012 12:57:31 +0800
+
+banshee (2.3.5-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Merge from Natty PPA, remaining changes:
+ + Disable U1MS extension
+
+ -- Chow Loong Jin <hyperair at debian.org> Sun, 19 Feb 2012 14:43:46 +0800
+
banshee (2.3.5-1ubuntu1~hyper1+natty) natty; urgency=low
* Backport to natty
@@@ -68,12 -105,6 +112,12 @@@ banshee (2.3.5-1) experimental; urgency
-- Chow Loong Jin <hyperair at debian.org> Fri, 17 Feb 2012 08:13:32 +0800
+banshee (2.3.4.ds-1ubuntu2~hyper1+maverick) maverick; urgency=low
+
+ * Backport to maverick
+
+ -- Chow Loong Jin <hyperair at debian.org> Sun, 12 Feb 2012 01:56:26 +0800
+
banshee (2.3.4.ds-1ubuntu2~hyper1+natty) natty; urgency=low
* Backport to Natty
@@@ -329,15 -360,6 +373,15 @@@ banshee (2.1.3-1ubuntu1~hyper1+natty) n
-- Chow Loong Jin <hyperair at ubuntu.com> Tue, 30 Aug 2011 02:07:42 +0800
+banshee (2.1.3-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Merge from Natty, remaining changes:
+ - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+ - [c31d919] Revert rename of libwebkit-dev
+ - [1e7ce76] Disable U1MS
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Tue, 30 Aug 2011 02:23:25 +0800
+
banshee (2.1.3-1ubuntu1~hyper1+oneiric) oneiric; urgency=low
* Merge from Ubuntu Oneiric, remaining changes:
@@@ -454,15 -476,6 +498,15 @@@ banshee (2.1.0-1ubuntu1~hyper1+natty) n
-- Chow Loong Jin <hyperair at ubuntu.com> Sat, 14 May 2011 22:34:56 +0800
+banshee (2.1.0-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Merge from Natty, remaining changes:
+ - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+ - [c31d919] Revert rename of libwebkit-dev
+ * [1e7ce76] Disable U1MS
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 15 May 2011 00:52:25 +0800
+
banshee (2.1.0-1) experimental; urgency=low
* [6b1b0d2] New upstream release:
@@@ -649,14 -662,6 +693,14 @@@ banshee (2.0.0-1ubuntu2) natty; urgency
-- Rodney Dawes <rodney.dawes at canonical.com> Fri, 08 Apr 2011 23:37:37 -0400
+banshee (2.0.0-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Merge from Natty, remaining changes:
+ - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+ - [c31d919] Revert rename of libwebkit-dev
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 07 Apr 2011 00:26:15 +0800
+
banshee (2.0.0-1ubuntu1~hyper1+natty) natty; urgency=low
* [ad4cbef] Merge from Ubuntu Natty, remaining changes:
@@@ -697,14 -702,6 +741,14 @@@ banshee (2.0.0-1) unstable; urgency=lo
-- Chow Loong Jin <hyperair at ubuntu.com> Wed, 06 Apr 2011 18:14:27 +0800
+banshee (1.9.6-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Merge from Natty, remaining changes:
+ - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+ - [c31d919] Revert rename of libwebkit-dev
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 25 Mar 2011 22:19:37 +0800
+
banshee (1.9.6-1ubuntu1~hyper1+natty) natty; urgency=low
* [bd79546] Merge from Ubuntu Natty, remaining changes:
@@@ -760,14 -757,6 +804,14 @@@ banshee (1.9.6-1) unstable; urgency=lo
-- Chow Loong Jin <hyperair at ubuntu.com> Sat, 26 Mar 2011 00:48:41 +0800
+banshee (1.9.5-1ubuntu1~hyper1+maverick1) maverick; urgency=low
+
+ * Merge from Natty, remaining changes:
+ - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+ - [c31d919] Revert rename of libwebkit-dev
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 13 Mar 2011 19:50:54 +0800
+
banshee (1.9.5-1ubuntu1~hyper1+natty1) natty; urgency=low
* [a55ea97] Revert "Disable Boo support and remove build dependency"
@@@ -775,14 -764,6 +819,14 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 13 Mar 2011 19:46:33 +0800
+banshee (1.9.5-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Merge from Natty, remaining changes:
+ - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+ - [c31d919] Revert rename of libwebkit-dev
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 11 Mar 2011 01:56:41 +0800
+
banshee (1.9.5-1ubuntu1~hyper1+natty) natty; urgency=low
* Backport to natty
@@@ -827,14 -808,6 +871,14 @@@ banshee (1.9.4-1ubuntu2) natty; urgency
-- Rodney Dawes <rodney.dawes at ubuntu.com> Mon, 28 Feb 2011 14:06:16 -0500
+banshee (1.9.4-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Merge from Natty, remaining changes:
+ - [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+ - [c31d919] Revert rename of libwebkit-dev
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 24 Feb 2011 01:53:11 +0800
+
banshee (1.9.4-1ubuntu1~hyper1+natty) natty; urgency=low
* No change upload to PPA
@@@ -887,13 -860,6 +931,13 @@@ banshee (1.9.3-2) unstable; urgency=lo
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 13 Feb 2011 18:53:16 +0800
+banshee (1.9.3-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * [c20e6c9] Revert "Drop libindicate0.1-cil-dev"
+ * [c31d919] Revert rename of libwebkit-dev
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 03 Feb 2011 23:06:42 +0800
+
banshee (1.9.3-1ubuntu1~hyper1+natty) natty; urgency=low
* No change upload to PPA
@@@ -947,12 -913,6 +991,12 @@@ banshee (1.9.2-1ubuntu1) natty; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Mon, 24 Jan 2011 22:17:31 +0800
+banshee (1.9.2-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * No change backport to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 14 Jan 2011 00:38:09 +0800
+
banshee (1.9.2-1ubuntu1~hyper1+natty) natty; urgency=low
* No change backport to PPA
@@@ -1007,12 -967,6 +1051,12 @@@ banshee (1.9.1-1ubuntu3) natty; urgency
-- Robert Ancell <robert.ancell at canonical.com> Mon, 10 Jan 2011 15:37:55 -0600
+banshee (1.9.1-1ubuntu2~hyper1+maverick) maverick; urgency=low
+
+ * No change backport to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 27 Dec 2010 11:12:33 +0800
+
banshee (1.9.1-1ubuntu2) natty; urgency=low
* [f1bb0cf] Enable SoundMenu by default
@@@ -1025,12 -979,6 +1069,12 @@@ banshee (1.9.1-1ubuntu2~hyper1+natty) n
-- Chow Loong Jin <hyperair at ubuntu.com> Mon, 27 Dec 2010 11:07:40 +0800
+banshee (1.9.1-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * No change backport to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 24 Dec 2010 21:34:25 +0800
+
banshee (1.9.1-1ubuntu1) natty; urgency=low
* Merge from Debian experimental, remaining changes:
@@@ -1146,12 -1094,6 +1190,12 @@@ banshee (1.9.0+git20101121.r1.b13266e-0
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 21 Nov 2010 12:21:02 +0800
+banshee (1.9.0-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * Backport to Maverick
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Nov 2010 01:21:16 +0800
+
banshee (1.9.0-1ubuntu1) natty; urgency=low
* Merge from Debian experimental, remaining changes:
@@@ -1229,12 -1171,6 +1273,12 @@@ banshee (1.8.0-2ubuntu1) natty; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 22 Oct 2010 01:53:21 +0800
+banshee (1.8.0-1ubuntu1~hyper1+maverick) maverick; urgency=low
+
+ * No change upload to Maverick PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 01 Oct 2010 03:40:04 +0800
+
banshee (1.8.0-2) experimental; urgency=low
* Fix duplicates on import (BGO #623441)
@@@ -1401,12 -1337,6 +1445,12 @@@ banshee (1.7.5-0ubuntu1) maverick; urge
-- Iain Lane <laney at ubuntu.com> Mon, 06 Sep 2010 20:05:45 +0100
+banshee (1.7.4-1ubuntu1~maverick1) maverick; urgency=low
+
+ * No change backport to Maverick
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 13 Aug 2010 17:45:50 +0800
+
banshee (1.7.4-1ubuntu1) maverick; urgency=low
* Merge from Debian experimental, remaining changes:
@@@ -1664,12 -1594,6 +1708,12 @@@ banshee (1.7.2-1) experimental; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 02 Jul 2010 02:21:03 +0800
+banshee (1.7.2-1~hyper1+maverick) maverick; urgency=low
+
+ * No change upload to Maverick PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 02 Jul 2010 13:05:01 +0800
+
banshee (1.7.1-1ubuntu1) maverick; urgency=low
* Enhance netbook interface:
@@@ -1724,18 -1648,6 +1768,18 @@@ banshee (1.7.1-1) experimental; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Thu, 27 May 2010 18:14:20 +0800
+banshee (1.7.1-1~hyper1~maverick1) maverick; urgency=low
+
+ * Split MeeGo out into its own package
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 31 May 2010 21:03:52 +0800
+
+banshee (1.7.1-1~hyper1~maverick) maverick; urgency=low
+
+ * No change upload to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 28 May 2010 01:41:45 +0800
+
banshee (1.7.0-1) experimental; urgency=low
* New upstream release:
diff --combined debian/rules
index 758fd47,fb17775..22d42e2
--- a/debian/rules
+++ b/debian/rules
@@@ -1,7 -1,5 +1,5 @@@
#!/usr/bin/make -f
- include /usr/share/cli-common/cli.make
-
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
BANSHEE_API_VERSION = $(shell grep API_VERSION= configure | cut -f2 -d=)
@@@ -38,7 -36,7 +36,7 @@@ CONFFLAGS +=
--enable-boo \
--enable-karma \
--enable-soundmenu \
- --enable-ubuntuone
+ --disable-ubuntuone
else
CONFFLAGS += \
--enable-boo \
@@@ -83,7 -81,8 +81,7 @@@ override_dh_install
debian/banshee/usr/share/dbus-1/services/com.meego*
ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
# Remove U1MS and Sound Menu stuff from banshee
- rm -r debian/banshee/usr/lib/banshee/Extensions/Banshee.SoundMenu.* \
- debian/banshee/usr/lib/banshee/Extensions/Banshee.UbuntuOneMusicStore.*
+ rm -r debian/banshee/usr/lib/banshee/Extensions/Banshee.SoundMenu.*
cd po; intltool-update --pot
for d in $$(find debian/ -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \
@@@ -101,4 -100,4 +99,4 @@@ override_dh_autoreconf
NOCONFIGURE=1 dh_autoreconf --as-needed ./autogen.sh --
%:
- dh $@ --with=autoreconf
+ dh $@ --with=cli,autoreconf
--
banshee
More information about the Pkg-cli-apps-commits
mailing list