[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/unstable/intrepid, updated. ppa/1.7.0-1.hyper1.intrepid-4-g38d1c91
Chow Loong Jin
hyperair at ubuntu.com
Sat May 8 00:43:27 UTC 2010
The following commit has been merged in the ppa/unstable/intrepid branch:
commit 37352c3759c63bc74281834503bf7f3f9c0248cb
Merge: 5007db5d4e42f3f050c314ede6cb4dfab47a5f12 e1e18c72639acee5516da31cfeb5e3bda159c526
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Sat May 8 08:40:55 2010 +0800
Merge branch 'ppa/unstable/jaunty' into ppa/unstable/intrepid
diff --combined debian/changelog
index 5a05002,729082f..326b765
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,18 @@@
+ banshee (1.7.0-1~hyper1~jaunty1) jaunty; urgency=low
+
+ * Switch back to 1.0 format
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 08 May 2010 08:38:12 +0800
+
+banshee (1.7.0-1~hyper1~intrepid) intrepid; urgency=low
+
+ * Merge from Jaunty, remaining changes:
+ + debian/control:
+ - Revert GNOME# 2.24 changes
+ - Revert Mono 2 transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 08 May 2010 07:57:52 +0800
+
banshee (1.7.0-1~hyper1~jaunty) jaunty; urgency=low
* Merge from Karmic, remaining changes:
@@@ -68,8 -65,6 +74,6 @@@ banshee (1.7.0-1) UNRELEASED; urgency=l
- Fix crashes related to a11y
- NotificationArea fixes
- Cover art aspect ratio/scaling fixes
- * debian/(control, source/format, rules):
- + Drop quilt and switch to 3.0 (quilt) format
* debian/rules:
+ Add some new compile flags (in-development features):
- --disable-moonlight
@@@ -94,15 -89,6 +98,15 @@@ banshee (1.6.0-1~hyper1~karmic) karmic
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 02 Apr 2010 00:52:53 +0800
+banshee (1.6.0-1~hyper1~intrepid) intrepid; urgency=low
+
+ * Merge from Jaunty, remaining changes:
+ + debian/control:
+ - Revert GNOME# 2.24 changes
+ - Revert Mono 2 transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 02 Apr 2010 04:49:13 +0800
+
banshee (1.6.0-1~hyper1~jaunty) jaunty; urgency=low
* Merge from Karmic, remaining changes:
@@@ -155,15 -141,6 +159,15 @@@ banshee (1.6.0-1~hyper1~lucid1) lucid;
-- Chow Loong Jin <hyperair at ubuntu.com> Sat, 03 Apr 2010 18:44:59 +0800
+banshee (1.5.6-1~hyper1~intrepid) intrepid; urgency=low
+
+ * Merge from Jaunty, remaining changes:
+ + debian/control:
+ - Revert GNOME# 2.24 changes
+ - Revert Mono 2 transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 22 Mar 2010 21:30:49 +0800
+
banshee (1.5.6-1~hyper1~jaunty) jaunty; urgency=low
* Merge from Karmic, remaining changes:
@@@ -237,15 -214,6 +241,15 @@@ banshee (1.5.6-1) unstable; urgency=lo
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 21 Mar 2010 21:22:57 +0800
+banshee (1.5.5-1~hyper1~intrepid) intrepid; urgency=low
+
+ * Merge from Jaunty, remaining changes:
+ + debian/control:
+ - Revert GNOME# 2.24 changes
+ - Revert Mono 2 transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Mar 2010 04:23:55 +0800
+
banshee (1.5.5-1~hyper1~jaunty) jaunty; urgency=low
* Merge from Karmic, remaining changes:
@@@ -315,15 -283,6 +319,15 @@@ banshee (1.5.5-1) unstable; urgency=lo
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Mar 2010 03:13:23 +0800
+banshee (1.5.4-1~hyper1~intrepid) intrepid; urgency=low
+
+ * Merge from Jaunty, remaining changes:
+ + debian/control:
+ - Revert GNOME# 2.24 changes
+ - Revert Mono 2 transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 28 Feb 2010 07:32:20 +0800
+
banshee (1.5.4-1~hyper1~jaunty) jaunty; urgency=low
* Merge from Karmic, remaining changes:
@@@ -397,15 -356,6 +401,15 @@@ banshee (1.5.4-1) unstable; urgency=lo
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 28 Feb 2010 01:14:01 +0800
+banshee (1.5.3-0ubuntu1~hyper1~intrepid) intrepid; urgency=low
+
+ * Merge from Jaunty, remaining changes:
+ + debian/control:
+ - Revert GNOME# 2.24 changes
+ - Revert Mono 2 transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 29 Jan 2010 03:08:40 +0800
+
banshee (1.5.3-0ubuntu1~hyper1~jaunty) jaunty; urgency=low
* Merge from Karmic, remaining changes:
@@@ -542,15 -492,6 +546,15 @@@ banshee (1.5.2-1) unstable; urgency=lo
-- Chow Loong Jin <hyperair at ubuntu.com> Thu, 21 Jan 2010 13:19:04 +0800
+banshee (1.5.1-1~hyper1~intrepid) intrepid; urgency=low
+
+ * Merge from Jaunty, remaining changes:
+ + debian/control:
+ - Revert GNOME# 2.24 changes
+ - Revert Mono 2 transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 15 Oct 2009 10:21:18 +0800
+
banshee (1.5.1-1~hyper1~jaunty) jaunty; urgency=low
* Merge from Karmic, remaining changes:
@@@ -660,17 -601,6 +664,17 @@@ banshee (1.5.0-3~hyper1~jaunty1) jaunty
-- Chow Loong Jin <hyperair at ubuntu.com> Sat, 15 Aug 2009 02:21:05 +0800
+banshee (1.5.0-3~hyper1~intrepid1) intrepid; urgency=low
+
+ * Merge from Jaunty unstable PPA, remaining changes:
+ + Mono 2.0 transition
+ + Revert GNOME# 2.24 transition
+ * debian/patches/series,
+ debian/patches/04_no-auto-test.patch:
+ + Don't run tests by default.
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 15 Aug 2009 02:40:01 +0800
+
banshee (1.5.0-3~hyper1~karmic1) karmic; urgency=low
* Upload to PPA
@@@ -716,13 -646,6 +720,13 @@@ banshee (1.5.0-0ubuntu1~hyper1~jaunty1
-- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 01:03:53 +0800
+banshee (1.5.0-0ubuntu1~hyper1~intrepid1) intrepid; urgency=low
+
+ * Backport to intrepid
+ * debian/control: Revert GNOME# 2.24 transition
+
+ -- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 01:11:49 +0800
+
banshee (1.5.0-1) experimental; urgency=low
[ Chow Loong Jin ]
@@@ -805,14 -728,6 +809,14 @@@ banshee (1.4.3-5) unstable; urgency=lo
-- Chow Loong Jin <hyperair at gmail.com> Mon, 25 May 2009 20:02:35 +0800
+banshee (1.4.3-4~hyper1+intrepid1) intrepid; urgency=low
+
+ * Merge from Jaunty, remaining changes:
+ + debian/control:
+ - GNOME# 2.24
+
+ -- Chow Loong Jin <hyperair at gmail.com> Tue, 21 Apr 2009 19:11:52 +0800
+
banshee (1.4.3-4) unstable; urgency=low
* debian/control:
@@@ -824,12 -739,6 +828,12 @@@
+ Bump Standards-Version
-- Chow Loong Jin <hyperair at gmail.com> Thu, 16 Apr 2009 18:26:25 +0800
+banshee (1.4.3-3~hyper1+intrepid1) intrepid; urgency=low
+
+ * Merge from Debian, remaining changes:
+ + Revert Mono 2.0 transition
+
+ -- Chow Loong Jin <hyperair at gmail.com> Sun, 22 Mar 2009 13:37:56 +0800
banshee (1.4.3-3) unstable; urgency=low
diff --combined debian/control
index 54b2d35,f9302fa..1f7d396
--- a/debian/control
+++ b/debian/control
@@@ -4,15 -4,13 +4,16 @@@ Priority: optiona
Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
Uploaders: Sebastian Dröge <slomo at debian.org>, Chow Loong Jin <hyperair at ubuntu.com>
Build-Depends: debhelper (>= 7.0.50),
+ quilt (>= 0.46-7~),
autotools-dev,
cli-common-dev (>= 0.5.7),
intltool (>= 0.35),
lsb-release,
- mono-devel (>= 2.0.1),
+ mono-gmcs | c-sharp-2.0-compiler,
+ libmono-dev (>= 1.9.1),
boo (>= 0.8.1),
+ libmono-dev,
+ mono-2.0-devel,
libmono-cairo2.0-cil,
libmono-sqlite2.0-cil,
libndesk-dbus1.0-cil (>= 0.5),
@@@ -23,8 -21,8 +24,8 @@@
libnotify0.4-cil,
libglib2.0-cil (>= 2.10),
libgtk2.0-cil (>= 2.12),
- libgconf2.24-cil,
- libgnome2.24-cil,
+ libgconf2.0-cil (>= 2.10),
+ libgnome2.0-cil,
libipod-cil-dev (>= 0.8.5),
libipodui-cil-dev (>= 0.8.5),
libkarma-cil (>= 0.0.5),
diff --combined debian/rules
index 97df399,c23f325..2773740
--- a/debian/rules
+++ b/debian/rules
@@@ -1,5 -1,6 +1,6 @@@
#!/usr/bin/make -f
+ include /usr/share/quilt/quilt.make
include /usr/share/cli-common/cli.make
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
@@@ -28,7 -29,7 +29,7 @@@ override_dh_auto_configure
--enable-podcast \
--enable-release \
--disable-shave \
- MCS=/usr/bin/csc LDFLAGS="$(LDFLAGS)"
+ LDFLAGS="$(LDFLAGS)"
# disable tests
override_dh_auto_test:
@@@ -41,4 -42,4 +42,4 @@@ override_dh_clistrip
dh_clistrip --dbg-package=banshee-dbg
%:
- dh $@
+ dh --with=quilt $@
--
banshee
More information about the Pkg-cli-apps-commits
mailing list