[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/intrepid, updated. ppa/1.6.1-1.hyper1.intrepid-2-g105bdcc
Chow Loong Jin
hyperair at ubuntu.com
Thu May 27 17:20:29 UTC 2010
The following commit has been merged in the ppa/intrepid branch:
commit 105bdccd8bd7ccc6de827f98e1aad7912a8ef9a3
Merge: 9f498557d15aa2b9876dd3a419e09827c767cdbb 847ef11ff3184aabaf8be735fefcfb6ce2f13236
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Fri May 28 00:40:01 2010 +0800
Merge branch 'ppa/jaunty' into ppa/intrepid
diff --combined debian/changelog
index 2148d44,7688994..5923650
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,11 +1,29 @@@
++banshee (1.6.1-1~hyper1~intrepid1) 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, 28 May 2010 00:41:20 +0800
++
+ banshee (1.6.1-1~hyper1~jaunty1) jaunty; urgency=low
+
+ * debian/(source/format, control, rules)
+ + Revert to source version 1.0, PPA doesn't like it
+ + Re-quiltify package
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 28 May 2010 00:35:38 +0800
+
+banshee (1.6.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, 27 May 2010 19:57:26 +0800
+
banshee (1.6.1-1~hyper1~jaunty) jaunty; urgency=low
* Merge from Karmic, remaining changes:
@@@ -80,15 -79,6 +97,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.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:
@@@ -150,15 -140,6 +167,15 @@@ banshee (1.6.0-1) unstable; urgency=lo
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 02 Apr 2010 03:12:16 +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:
@@@ -232,15 -213,6 +249,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:
@@@ -310,15 -282,6 +327,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:
@@@ -392,15 -355,6 +409,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:
@@@ -537,15 -491,6 +554,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:
@@@ -782,14 -727,6 +799,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:
@@@ -801,12 -738,6 +818,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 1a5b29b,f9302fa..b5feb9f
--- a/debian/control
+++ b/debian/control
@@@ -4,12 -4,12 +4,13 @@@ 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-cairo2.0-cil,
libmono-sqlite2.0-cil,
@@@ -21,8 -21,8 +22,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 95af168,2e80654..e066ef6
--- 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
@@@ -25,7 -26,7 +26,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:
@@@ -38,4 -39,4 +39,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