[Pkg-cli-apps-commits] [SCM] bansheelyricsplugin branch, ppa/intrepid, updated. ppa/0.8.1-1.hyper1+jaunty-17-g4cefe1f
Chow Loong Jin
hyperair at gmail.com
Fri Jan 29 05:46:38 UTC 2010
The following commit has been merged in the ppa/intrepid branch:
commit 0849b9012f6f43c3b8e646cf30325a712749b27b
Merge: d382ed550d753dd5adb51fd23253c639909c1b26 53023bd4d7c8f2b9d418ce8bce19c9d3c57c4d59
Author: Chow Loong Jin <hyperair at gmail.com>
Date: Fri Jan 29 10:48:27 2010 +0800
Merge branch 'ppa/jaunty' into ppa/intrepid
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index 2105533,5a4cc07..453167b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,49 +1,58 @@@
- bansheelyricsplugin (0.7-0ubuntu1~hyper1~intrepid1) intrepid; urgency=low
++bansheelyricsplugin (0.8.1-2~hyper1~intrepid) intrepid; urgency=low
+
+ * Merge from Jaunty, remaining changes:
+ + debian/control, debian/rules:
+ - Revert GNOME# 2.24 transition
+ - Revert Mono 2.0 transition
+
- -- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 20:59:38 +0800
++ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 29 Jan 2010 10:48:13 +0800
+
- bansheelyricsplugin (0.7-0ubuntu1~hyper1~jaunty1) jaunty; urgency=low
+ bansheelyricsplugin (0.8.1-2~hyper1~jaunty) jaunty; urgency=low
* Merge from Karmic, remaining changes:
+ debian/control:
- GConf# 2.24 bad ABI bump
+ + debian/rules:
+ - Use csc rather than mono-csc (mono-devel 2.4.2.3 required for this)
+ - Lower mono-devel version requirement to 2.0.1
- -- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 20:49:28 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 29 Jan 2010 10:43:18 +0800
- bansheelyricsplugin (0.7-0ubuntu1~hyper1) karmic; urgency=low
+ bansheelyricsplugin (0.8.1-2~hyper1~karmic) karmic; urgency=low
+
+ * debian/control:
+ + Revert -cil-dev transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 29 Jan 2010 10:30:06 +0800
+
+ bansheelyricsplugin (0.8.1-2) UNRELEASED; urgency=low
+
+ * debian/patches/01_fix-banshee-1.5.3.patch:
+ + Fix compilation with Banshee 1.5.3
+ * debian/(control, rules, README.source:
+ + Quiltify package
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 29 Jan 2010 08:03:00 +0800
+
+ bansheelyricsplugin (0.8.1-1) unstable; urgency=low
+
+ [ Chow Loong Jin ]
+ * New upstream release
+ * debian/control:
+ + Replace libgtkhtml3.14-cil-dev with libwebkit1.0-cil-dev as per upstream
+ change
+ + Update my e-mail address
+ * debian/rules:
+ + Use mono-csc instead of csc for MCS (Closes: #562266)
+ + Bump mono-devel version requirement to 2.4.2.3 for mono-csc
+
+ [ Iain Lane ]
+ * debian/control: Update build-deps to use new gnome# and gnome-desktop#
+ -dev packages.
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 17 Jan 2010 00:46:59 +0800
+
+ bansheelyricsplugin (0.7-1) unstable; urgency=low
* New Upstream Version
* debian/control:
@@@ -26,7 -54,8 +63,8 @@@
anyway.
+ Use DH7.0.50
+ Use banshee >= 0.98, as per configure.ac
- + Drop automake, autoconf, and libtool build-depends, relax pkg-config build-depends
+ + Drop automake, autoconf, and libtool build-depends, relax pkg-config
+ build-depends
* debian/rules:
+ Use debhelper minimal rule style
+ Fix get-orig-source
@@@ -35,34 -64,6 +73,34 @@@
-- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 21:10:40 +0800
+bansheelyricsplugin (0.6-2~hyper1+intrepid2) intrepid; urgency=low
+
+ * debian/rules:
+ + Remove MCS=/usr/bin/csc line
+
+ -- Chow Loong Jin <hyperair at gmail.com> Tue, 24 Mar 2009 01:25:31 +0800
+
+bansheelyricsplugin (0.6-2~hyper1+intrepid1) intrepid; urgency=low
+
+ * Revert GNOME# 2.24 change
+ * Revert Mono 2.0 transition
+
+ -- Chow Loong Jin <hyperair at gmail.com> Thu, 19 Mar 2009 17:38:52 +0800
+
+bansheelyricsplugin (0.6-2~hyper1+intrepid2) intrepid; urgency=low
+
+ * debian/rules:
+ + Remove MCS=/usr/bin/csc line
+
+ -- Chow Loong Jin <hyperair at gmail.com> Tue, 24 Mar 2009 01:25:31 +0800
+
+bansheelyricsplugin (0.6-2~hyper1+intrepid1) intrepid; urgency=low
+
+ * Revert GNOME# 2.24 change
+ * Revert Mono 2.0 transition
+
+ -- Chow Loong Jin <hyperair at gmail.com> Thu, 19 Mar 2009 17:38:52 +0800
+
bansheelyricsplugin (0.6-2~hyper1+jaunty1) jaunty; urgency=low
* Upload to PPA
diff --combined debian/control
index 14bb381,b7a3e11..af57940
--- a/debian/control
+++ b/debian/control
@@@ -2,15 -2,22 +2,22 @@@ Source: bansheelyricsplugi
Section: sound
Priority: optional
Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
- Uploaders: Chow Loong Jin <hyperair at gmail.com>, Sebastian Dröge <slomo at debian.org>
+ Uploaders: Chow Loong Jin <hyperair at ubuntu.com>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 7.0.50),
+ quilt (>= 0.46-7~),
cli-common-dev (>= 0.5.7),
pkg-config (>= 0.9.0),
- mono-devel (>= 2.0.1),
+ mono-gmcs | c-sharp-2.0-compiler,
- banshee (>= 0.98),
- libgtkhtml3.16-cil,
+ banshee (>= 1.5.3),
+ libwebkit1.0-cil,
- libgconf2.24-cil,
+ libgconf2.0-cil
- Standards-Version: 3.8.1
+ libglib2.0-cil,
+ libgtk2.0-cil,
+ libtaglib2.0-cil,
+ libndesk-dbus-glib1.0-cil,
+ libndesk-dbus1.0-cil,
+ libmono-addins0.2-cil
+ Standards-Version: 3.8.3
Homepage: http://bansheelyricsplugin.googlecode.com
Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/bansheelyricsplugin.git
Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/bansheelyricsplugin.git
@@@ -19,7 -26,7 +26,7 @@@ Package: banshee-extension-lyric
Architecture: all
Depends: ${cli:Depends},
${misc:Depends},
- banshee (>= 0.98)
+ banshee (>= 1.5.3)
Description: Lyrics extension for Banshee
Banshee Lyrics Plugin is an extension which shows lyrics of songs played in
Banshee. It supports downloading lyrics from:
@@@ -30,4 -37,3 +37,3 @@@
.
Banshee is a media management and playback application for the GNOME
desktop
-
diff --combined debian/rules
index 765f2ca,7afddf8..e3a5a6b
--- a/debian/rules
+++ b/debian/rules
@@@ -1,6 -1,7 +1,7 @@@
#!/usr/bin/make -f
include /usr/share/cli-common/cli.make
+ include /usr/share/quilt/quilt.make
# some vars for get-orig-source
MAKEFILE = $(firstword $(MAKEFILE_LIST))
@@@ -10,8 -11,8 +11,8 @@@ PACKAGE = $(shell sed -n 's/^Source: //
UPSTREAM_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | \
sed -n 's/-.*$$//; s/^Version: //p')
-override_dh_auto_configure:
- dh_auto_configure -- MCS=/usr/bin/csc
+#override_dh_auto_configure:
+# dh_auto_configure -- MCS=/usr/bin/csc
# don't install upstream changelog, it contains nothing
override_dh_installchangelogs:
@@@ -30,6 -31,6 +31,6 @@@ get-orig-source
--rename
%:
- dh $@
+ dh --with=quilt $@
.PHONY: get-orig-source
--
bansheelyricsplugin
More information about the Pkg-cli-apps-commits
mailing list