[Pkg-cli-apps-commits] [SCM] bansheelyricsplugin branch, ppa/intrepid, updated. upstream/0.6-24-g182d44e
Chow Loong Jin
hyperair at gmail.com
Thu Jun 4 13:18:50 UTC 2009
The following commit has been merged in the ppa/intrepid branch:
commit 46d4c35b867c9c5853581ae4e6415c2206ff114b
Merge: 34be0c7920a8f777ed6a87774b1f2c32ffbca6d1 9a9ab3d9821c4d750deaea424dae9f51ebeb6082
Author: Chow Loong Jin <hyperair at gmail.com>
Date: Thu Jun 4 21:05:23 2009 +0800
Merge branch 'ppa/jaunty' into ppa/intrepid
Conflicts:
debian/changelog
debian/control
debian/rules
diff --combined debian/changelog
index 2df600f,deff755..0b658a9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,30 +1,94 @@@
+ bansheelyricsplugin (0.7-0ubuntu1~hyper1~jaunty1) jaunty; urgency=low
+
+ * Merge from Karmic, remaining changes:
+ + debian/control:
+ - GConf# 2.24 bad ABI bump
+
+ -- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 20:49:28 +0800
+
+ bansheelyricsplugin (0.7-0ubuntu1~hyper1) karmic; urgency=low
+
+ * New Upstream Version
+ * debian/control:
+ + Changed Vcs-* fields to git addresses
+ + Bump Standards-Version
+ + Fix grammatical error "an media" to "a media"
+ + Combined Build-Depends-Indep into Build-Depends; there is only one package
+ anyway.
+ + Use DH7.0.50
+ + Use banshee >= 0.98, as per configure.ac
+ * debian/rules:
+ + Use debhelper minimal rule style
+ + Fix get-orig-source
+ * debian/watch:
+ + Updated to track new url as well
+
+ -- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 20:45:16 +0800
+
++bansheelyricsplugin (0.7-0ubuntu1~hyper1~intrepid1) 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
++
++bansheelyricsplugin (0.7-0ubuntu1~hyper1~jaunty1) jaunty; urgency=low
++
++ * Merge from Karmic, remaining changes:
++ + debian/control:
++ - GConf# 2.24 bad ABI bump
++
++ -- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 20:49:28 +0800
++
++bansheelyricsplugin (0.7-0ubuntu1~hyper1) karmic; urgency=low
++
++ * New Upstream Version
++ * debian/control:
++ + Changed Vcs-* fields to git addresses
++ + Bump Standards-Version
++ + Fix grammatical error "an media" to "a media"
++ + Combined Build-Depends-Indep into Build-Depends; there is only one package
++ anyway.
++ + Use DH7.0.50
++ + Use banshee >= 0.98, as per configure.ac
++ * debian/rules:
++ + Use debhelper minimal rule style
++ + Fix get-orig-source
++ * debian/watch:
++ + Updated to track new url as well
++
++ -- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 20:45:16 +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 ff21bfc,f2a47a0..0a20c56
--- a/debian/control
+++ b/debian/control
@@@ -3,27 -3,26 +3,26 @@@ Section: soun
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>
- Build-Depends: cdbs,
- debhelper (>= 7)
- Build-Depends-Indep: cli-common-dev (>= 0.5.7),
- automake (>= 1.9),
- autoconf (>= 2.53),
- libtool,
- pkg-config (>= 0.14.0),
- mono-gmcs | c-sharp-2.0-compiler,
- banshee (>= 1.4.1),
- libgtkhtml3.16-cil,
- libgconf2.0-cil
- Standards-Version: 3.8.0
+ Build-Depends: debhelper (>= 7.0.50),
+ cli-common-dev (>= 0.5.7),
+ automake (>= 1.9),
+ autoconf (>= 2.53),
+ libtool,
+ pkg-config (>= 0.14.0),
- mono-devel (>= 2.0.1),
++ mono-gmcs | c-sharp-2.0-compiler,
+ banshee (>= 0.98),
+ libgtkhtml3.16-cil,
- libgconf2.24-cil
++ libgconf2.0-cil
+ Standards-Version: 3.8.1
Homepage: http://bansheelyricsplugin.googlecode.com
- Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/bansheelyricsplugin/trunk/
- Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/bansheelyricsplugin/trunk/?rev=0&c=0
+ 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
Package: banshee-extension-lyrics
Architecture: all
Depends: ${cli:Depends},
${misc:Depends},
- banshee (>= 1.4.1)
+ banshee (>= 0.98)
Description: Lyrics extension for Banshee
Banshee Lyrics Plugin is an extension which shows lyrics of songs played in
Banshee. It supports downloading lyrics from:
@@@ -32,6 -31,6 +31,6 @@@
* http://lyricwiki.org
* http://www.autolyrics.com
.
- Banshee is an media management and playback application for the GNOME
+ Banshee is a media management and playback application for the GNOME
desktop
diff --combined debian/rules
index fd94a2d,94f586a..765f2ca
--- a/debian/rules
+++ b/debian/rules
@@@ -1,42 -1,35 +1,35 @@@
#!/usr/bin/make -f
- include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/class/autotools.mk
+ include /usr/share/cli-common/cli.make
- export MONO_SHARED_DIR=$(CURDIR)
+ # some vars for get-orig-source
+ MAKEFILE = $(firstword $(MAKEFILE_LIST))
+ DEBIAN_DIR = $(dir $(MAKEFILE))
+ SOURCE_DIR = $(DEBIAN_DIR)/..
+ PACKAGE = $(shell sed -n 's/^Source: //p' $(DEBIAN_DIR)/control)
+ UPSTREAM_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | \
+ sed -n 's/-.*$$//; s/^Version: //p')
- # set MCS to csc
- #DEB_CONFIGURE_EXTRA_FLAGS = MCS=/usr/bin/csc
-override_dh_auto_configure:
- dh_auto_configure -- MCS=/usr/bin/csc
++#override_dh_auto_configure:
++# dh_auto_configure -- MCS=/usr/bin/csc
- # Path to the debian directory
- DEBIAN_DIR := $(dir $(firstword $(MAKEFILE_LIST)))
- SOURCE_DIR := $(DEBIAN_DIR)/..
- UPSTREAM_VERSION ?= $(shell uscan --dehs $(SOURCE_DIR) | \
- sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
+ # don't install upstream changelog, it contains nothing
+ override_dh_installchangelogs:
+ dh_installchangelogs -XChangeLog
- # get orig .tar.bz2, repack into .tar.gz, removing .svn in the process
get-orig-source:
- rm -f $(SOURCE_DIR)/../bansheelyricsplugin_$(UPSTREAM_VERSION).orig.*
- uscan --force-download $(SOURCE_DIR)
- tar -xjf $(SOURCE_DIR)/../BansheeLyricsPlugin$(UPSTREAM_VERSION).tar.bz2
- mv BansheeLyricsPlugin bansheelyricsplugin-$(UPSTREAM_VERSION).orig
- GZIP=-9fn tar --exclude=.svn --exclude=autom4te.cache --exclude=*.mdb -czf \
- bansheelyricsplugin_$(UPSTREAM_VERSION).orig.tar.gz \
- bansheelyricsplugin-$(UPSTREAM_VERSION).orig
- rm -rf bansheelyricsplugin-$(UPSTREAM_VERSION).orig \
- $(SOURCE_DIR)/../BansheeLyricsPlugin$(UPSTREAM_VERSION).tar.bz2 \
- $(SOURCE_DIR)/../bansheelyricsplugin_$(UPSTREAM_VERSION).orig.tar.bz2 \
- *.cdbs-config_list
-
- makebuilddir/banshee-extension-lyrics::
- autoreconf
-
- common-binary-predeb-indep::
- dh_clifixperms
- dh_clideps -d
- dh_clistrip
-
- clean::
- rm -rf $(MONO_SHARED_DIR)/.wapi
+ uscan \
+ --force-download \
+ --download \
+ --upstream-version $(UPSTREAM_VERSION) \
+ --package $(PACKAGE) \
+ --watchfile $(DEBIAN_DIR)/watch \
+ --destdir . \
+ --rename \
+ --repack \
+ --rename
+
+ %:
+ dh $@
.PHONY: get-orig-source
--
bansheelyricsplugin
More information about the Pkg-cli-apps-commits
mailing list