[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/unstable/intrepid, updated. debian/1.5.0-3-19-ge80001a
Chow Loong Jin
hyperair at gmail.com
Fri Aug 14 20:10:50 UTC 2009
The following commit has been merged in the ppa/unstable/intrepid branch:
commit 792493b60a93139d6869336c10ea40a8aad4bd8b
Merge: dd67e2ba83f0aca9dd03eaa917fef3b53b16a39c 79b68c9b63b0df4c93b76e4b978881ab2a47d916
Author: Chow Loong Jin <hyperair at gmail.com>
Date: Sat Aug 15 02:26:19 2009 +0800
Merge branch 'ppa/unstable/jaunty' into ppa/unstable/intrepid
Conflicts:
debian/changelog
diff --combined debian/changelog
index cbff9de,aacb6bb..6e2d164
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,38 -1,48 +1,63 @@@
- banshee (1.5.0-0ubuntu1~hyper2~intrepid1) intrepid; urgency=low
++banshee (1.5.0-3~hyper1~intrepid1) intrepid; urgency=low
+
- * Merge from Jaunty, remaining changes:
- + Mono 2.0
- + GNOME# 2.0
++ * Merge from Jaunty unstable PPA, remaining changes:
++ + Mono 2.0 transition
++ + Revert GNOME# 2.24 transition
+
- -- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 16:36:00 +0800
++ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 15 Aug 2009 02:25:00 +0800
+
- banshee (1.5.0-0ubuntu1~hyper2~jaunty1) jaunty; urgency=low
+ banshee (1.5.0-3~hyper1~jaunty1) jaunty; urgency=low
- * Merge from Karmic, remaining changes:
- + GNOME# 2.24
+ * Merge from Karmic unstable PPA, remaining changes:
+ + Revert bad GNOME# 2.24 transition
- -- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 16:23:34 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 15 Aug 2009 02:21:05 +0800
- banshee (1.5.0-0ubuntu1~hyper2) karmic; urgency=low
+ banshee (1.5.0-3~hyper1~karmic1) karmic; urgency=low
- [ Chow Loong Jin ]
- * debian/control:
- + Set quilt's version to 0.46-7~ instead of 0.46-7 for backportability
+ * Upload to PPA
+ * debian/gbp.conf:
+ + Add a gbp.conf to ease git buildpackage work
- [ Iain Lane ]
- * debian/banshee.{1,manpages} Add manpage. This was initially generated by
- help2man from `banshee --help-all' and then edited a bit to be more
- readable and standard. (Closes: #384557)
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 15 Aug 2009 02:10:33 +0800
+
+ banshee (1.5.0-3) experimental; urgency=low
- -- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 16:16:23 +0800
+ * debian/patches/03_muinshee-booter.patch,
+ debian/banshee.links,
+ debian/banshee.1:
+ + Patch banshee booter script to autodetect whether to use Banshee or
+ Muinshee interface based on the file name
+ + Make /usr/bin/muinshee a symlink of /usr/bin/banshee-1
+ + Update banshee.1 manpage and link it to muinshee.1
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 19 Jul 2009 00:22:34 +0800
+
+ banshee (1.5.0-2) experimental; urgency=low
+
+ * debian/control:
+ + Replace gstreamer0.10-plugins-ffmpeg with gstreamer0.10-ffmpeg
+ + Change of my email address
+ + Bump Standards-Version to 3.8.2
+ * debian/rules:
+ + Drop dh_installchangelogs override. We don't want ChangeLog installed
+ any more.
+ * debian/banshee.links:
+ + Updated to symlink the banshee manpage to banshee-1
+ * debian/patches/01_dispose-sqlite-cmd.patch:
+ + Fix for BGO #586498, where Banshee leaks memory while rescanning library
+ * debian/patches/01_remove-bash-dep.patch:
+ + Delete it for good
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Wed, 08 Jul 2009 22:10:27 +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-0ubuntu1~hyper1~jaunty1) jaunty; urgency=low
* Backport to jaunty
@@@ -40,11 -50,17 +65,17 @@@
-- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 01:03:53 +0800
- banshee (1.5.0-0ubuntu1~hyper1) karmic; urgency=low
+ banshee (1.5.0-1) experimental; urgency=low
+ [ Chow Loong Jin ]
* New Upstream Version
* debian/control:
+ Fix grammatical error "an media" to "a media"
+ + Set quilt's version to 0.46-7~ instead of 0.46-7 for backportability
+ + Replace gstreamer0.10-plugins-ffmpeg with gstreamer0.10-ffmpeg
+ + Change of my email address
+ + Bump Standards-Version to 3.8.2
+ + Drop unnecessary build dependencies
* debian/watch:
+ Updated to include changes in directory structure
* debian/patches:
@@@ -52,7 -68,20 +83,20 @@@
+ 03_fix-lastfm.patch: dropped, applied upstream
+ 20_check_notification_support.patch: dropped, applied upstream
- -- Chow Loong Jin <hyperair at gmail.com> Tue, 02 Jun 2009 13:21:30 +0800
+ [ Iain Lane ]
+ * debian/banshee.{1,manpages} Add manpage. This was initially generated by
+ help2man from `banshee --help-all' and then edited a bit to be more
+ readable and standard. (Closes: #384557)
+
+ [ Iulian Udrea ]
+ * debian/compat:
+ - Bump to 7.
+
+ [ Sebastian Dröge ]
+ * debian/control:
+ + Update/remove some build dependencies for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org> Thu, 04 Jun 2009 20:01:25 +0200
banshee (1.4.3-5) unstable; urgency=low
@@@ -70,14 -99,6 +114,14 @@@
-- 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:
@@@ -89,12 -110,6 +133,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 8c3b3cf,bde9e24..03280c3
--- a/debian/control
+++ b/debian/control
@@@ -2,25 -2,19 +2,19 @@@ Source: banshe
Section: sound
Priority: optional
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 gmail.com>
+ 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,
boo (>= 0.8.1),
- libmono-dev (>= 1.2.4),
- libmono-system-data2.0-cil,
- libmono-system-web2.0-cil,
libmono-cairo2.0-cil,
libmono-sqlite2.0-cil,
- libmono2.0-cil,
- libmono-sharpzip2.84-cil,
libndesk-dbus1.0-cil (>= 0.5),
libndesk-dbus-glib1.0-cil (>= 0.3),
- libmono-addins0.2-cil (>= 0.3),
libmono-addins-gui0.2-cil (>= 0.3),
libtaglib2.0-cil (>= 2.0.3.2),
libmono-zeroconf1.0-cil (>= 0.7.3),
@@@ -28,8 -22,8 +22,8 @@@
libglib2.0-cil (>= 2.10),
libgtk2.0-cil (>= 2.10),
libglade2.0-cil (>= 2.10),
- libgconf2.24-cil,
- libgnome2.24-cil,
+ libgconf2.0-cil (>= 2.10),
+ libgnome2.0-cil (>= 2.10),
libipod-cil (>= 0.8.2),
libipodui-cil (>= 0.8.2),
libkarma-cil (>= 0.0.5),
@@@ -42,10 -36,9 +36,9 @@@
libx11-dev,
libxrandr-dev (>= 2:1.1.1),
libxxf86vm-dev (>= 1:1.0.1),
- libgnomevfs2-dev,
libgstreamer0.10-dev (>= 0.10.3),
libgstreamer-plugins-base0.10-dev (>= 0.10.12)
- Standards-Version: 3.8.1
+ Standards-Version: 3.8.2
Homepage: http://www.banshee-project.org
Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/banshee.git
Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/banshee.git
@@@ -65,7 -58,7 +58,7 @@@ Recommends: gstreamer0.10-plugins-bad
brasero,
avahi-daemon
Suggests: gstreamer0.10-plugins-ugly,
- gstreamer0.10-plugins-ffmpeg,
+ gstreamer0.10-ffmpeg,
banshee-dbg (=${binary:Version})
Description: Media Management and Playback application
Banshee is a media management and playback application for the GNOME
diff --combined debian/rules
index 085eff6,e29ffc7..0bc9767
--- a/debian/rules
+++ b/debian/rules
@@@ -8,11 -8,8 +8,8 @@@ LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as
override_dh_auto_configure:
dh_auto_configure -- --disable-static --enable-release \
--with-vendor-build-id="`lsb_release -ds`" \
- MCS=/usr/bin/csc LDFLAGS="$(LDFLAGS)"
+ LDFLAGS="$(LDFLAGS)"
- override_dh_installchangelogs:
- dh_installchangelogs ChangeLog
-
# disable tests
override_dh_auto_test:
--
banshee
More information about the Pkg-cli-apps-commits
mailing list