[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/unstable/jaunty, updated. ppa/1.7.1-1.hyper1.jaunty-10-gbabc00f
Chow Loong Jin
hyperair at ubuntu.com
Mon May 31 13:33:08 UTC 2010
The following commit has been merged in the ppa/unstable/jaunty branch:
commit 95684f5a668d188da1fa0463161ed39951ea84e4
Merge: 0b324057a52066cf73eab166387cc03ca79462cc ddc314cfc651f793cc1f348237b8a035229af999
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Mon May 31 21:18:59 2010 +0800
Merge branch 'ppa/unstable/karmic' into ppa/unstable/jaunty
diff --combined debian/changelog
index bfb0643,205d374..b0fc09f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,31 +1,48 @@@
+ banshee (1.7.1-1~hyper1~karmic1) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except libtaglib2.0-cil which was
+ backported)
+ - Use mono-devel 2.4.2.3
+ - Revert gst-plugins-base-dev version bump
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+ + debian/rules:
+ - Disable gapless (gstreamer not new enough)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 31 May 2010 21:10:46 +0800
+
+ banshee (1.7.1-1~hyper1~lucid1) lucid; urgency=low
+
+ * No change upload to PPA
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 31 May 2010 21:08:41 +0800
+
+ banshee (1.7.1-1~hyper1~maverick1) maverick; urgency=low
+
+ * Split MeeGo out into its own package
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 31 May 2010 21:03:52 +0800
+
+banshee (1.7.1-1~hyper1~jaunty) jaunty; urgency=low
+
+ * Merge from Karmic, remaining changes:
+ + debian/control:
+ - libgconf2.0-cil -> libgconf2.24-cil
+ - Lower mono-devel version
+ - Disable clutter support (dependencies not satisfiable)
+ - Re-add libgnome2.24-cil, mono-addins-gui needs it
+ - Drop gdata
+ + debian/rules:
+ - Revert to using csc instead of mono-csc
+ - --disable-youtube
+ + debian/(source/format, control, rules):
+ - Use source version 1.0 and quilt
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 28 May 2010 04:29:28 +0800
+
banshee (1.7.1-1~hyper1~karmic) karmic; urgency=low
* Merge from Lucid, remaining changes:
@@@ -45,6 -56,7 +73,7 @@@ banshee (1.7.1-1~hyper1~maverick) maver
banshee (1.7.1-1) UNRELEASED; urgency=low
+ [ Chow Loong Jin ]
* New upstream release:
+ New Features Since 1.7.0:
- Improvements for Audiobooks support
@@@ -66,29 -78,12 +95,33 @@@
* debian/rules:
+ Enable Moblin integration (--enable-meego)
+ [ Iain Lane ]
+ * debian/(control, rules, banshee-meego.install):
+ + Add new package banshee-meego containing the Moblin integration.
+
-- Chow Loong Jin <hyperair at ubuntu.com> Thu, 27 May 2010 18:14:20 +0800
+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~jaunty) jaunty; urgency=low
+
+ * Merge from Karmic, remaining changes:
+ + debian/control:
+ - libgconf2.0-cil -> libgconf2.24-cil
+ - Lower mono-devel version
+ - Disable clutter support (dependencies not satisfiable)
+ - Re-add libgnome2.24-cil, mono-addins-gui needs it
+ - Drop gdata
+ + debian/rules:
+ - Revert to using csc instead of mono-csc
+ - --disable-youtube
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 08 May 2010 07:37:47 +0800
+
banshee (1.7.0-1~hyper1~karmic) karmic; urgency=low
* Merge from Lucid, remaining changes:
@@@ -135,6 -130,8 +168,6 @@@ banshee (1.7.0-1) experimental; urgency
- 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
@@@ -159,21 -156,6 +192,21 @@@ 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~jaunty) jaunty; urgency=low
+
+ * Merge from Karmic, remaining changes:
+ + debian/control:
+ - libgconf2.0-cil -> libgconf2.24-cil
+ - Lower mono-devel version
+ - Disable clutter support (dependencies not satisfiable)
+ - Re-add libgnome2.24-cil, mono-addins-gui needs it
+ - Drop gdata
+ + debian/rules:
+ - Revert to using csc instead of mono-csc
+ - --disable-youtube
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 02 Apr 2010 04:44:47 +0800
+
banshee (1.6.0-1~hyper1~lucid) lucid; urgency=low
* No change backport to Lucid
@@@ -211,22 -193,6 +244,22 @@@ 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~jaunty) jaunty; urgency=low
+
+ * Merge from Karmic, remaining changes:
+ + debian/control:
+ - libgconf2.0-cil -> libgconf2.24-cil
+ - Lower mono-devel version
+ - Disable clutter support (dependencies not satisfiable)
+ - Re-add libgnome2.24-cil, mono-addins-gui needs it
+ - Drop gdata
+ + debian/rules:
+ - Revert to using csc instead of mono-csc
+ - --disable-clutter
+ - --disable-youtube
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Mon, 22 Mar 2010 21:26:21 +0800
+
banshee (1.5.6-1~hyper1~karmic) karmic; urgency=low
* Merge from Lucid, remaining changes:
@@@ -284,24 -250,6 +317,24 @@@ 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~jaunty) jaunty; urgency=low
+
+ * Merge from Karmic, remaining changes:
+ + debian/control:
+ - libgconf2.0-cil -> libgconf2.24-cil
+ - Lower mono-devel version
+ - Disable clutter support (dependencies not satisfiable)
+ - Re-add libgnome2.24-cil, mono-addins-gui needs it
+ - Drop gdata
+ + debian/rules:
+ - Revert to using csc instead of mono-csc
+ - --disable-clutter
+ - --disable-gdata
+ + debian/patches/01_waitone-override.patch:
+ - Use Compat WaitOne override. Fixes FTBFS with older mono
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Mar 2010 04:08:04 +0800
+
banshee (1.5.5-1~hyper1~karmic) karmic; urgency=low
* Merge from unstable, remaining changes:
@@@ -353,20 -301,6 +386,20 @@@ 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~jaunty) jaunty; urgency=low
+
+ * Merge from Karmic, remaining changes:
+ + debian/control:
+ - libgconf2.0-cil -> libgconf2.24-cil
+ - Lower mono-devel version
+ - Disable clutter support (dependencies not satisfiable)
+ - Re-add libgnome2.24-cil, mono-addins-gui needs it
+ + debian/rules:
+ - Revert to using csc instead of mono-csc
+ - --disable-clutter
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 28 Feb 2010 07:35:46 +0800
+
banshee (1.5.4-1~hyper1~karmic) karmic; urgency=low
* Merge from unstable, remaining changes:
@@@ -426,19 -360,6 +459,19 @@@ 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~jaunty) jaunty; urgency=low
+
+ * Merge from Karmic, remaining changes:
+ + debian/control:
+ - libgconf2.0-cil -> libgconf2.24-cil
+ - Lower mono-devel version
+ - Disable clutter support (dependencies not satisfiable)
+ + debian/rules:
+ - Revert to using csc instead of mono-csc
+ - --disable-clutter
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 29 Jan 2010 03:00:47 +0800
+
banshee (1.5.4~really1.5.3-0ubuntu1~hyper1~karmic) karmic; urgency=low
* Merge from unstable, remaining changes:
@@@ -562,18 -483,6 +595,18 @@@ 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~jaunty) jaunty; urgency=low
+
+ * Merge from Karmic, remaining changes:
+ + debian/control:
+ - libgconf2.0-cil -> libgconf2.24-cil
+ - Lower mono-devel version
+ - Disable clutter support (dependencies not satisfiable)
+ + debian/rules:
+ - Revert to using csc instead of mono-csc
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Thu, 15 Oct 2009 09:36:34 +0800
+
banshee (1.5.1-1) unstable; urgency=low
* New upstream release
@@@ -664,21 -573,6 +697,21 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Wed, 14 Oct 2009 19:21:51 +0800
+banshee (1.5.0-3~hyper1~jaunty1) jaunty; urgency=low
+
+ * Merge from Karmic unstable PPA, remaining changes:
+ + Revert bad GNOME# 2.24 transition
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 15 Aug 2009 02:21:05 +0800
+
+banshee (1.5.0-3~hyper1~karmic1) karmic; urgency=low
+
+ * Upload to PPA
+ * debian/gbp.conf:
+ + Add a gbp.conf to ease git buildpackage work
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 15 Aug 2009 02:10:33 +0800
+
banshee (1.5.0-3) experimental; urgency=low
* debian/patches/03_muinshee-booter.patch,
@@@ -691,6 -585,14 +724,6 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 19 Jul 2009 00:22:34 +0800
-banshee (1.5.0-3~hyper1~karmic1) karmic; urgency=low
-
- * Upload to PPA
- * debian/gbp.conf:
- + Add a gbp.conf to ease git buildpackage work
-
- -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 15 Aug 2009 02:10:33 +0800
-
banshee (1.5.0-2) experimental; urgency=low
* debian/control:
@@@ -709,13 -611,6 +742,13 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Wed, 08 Jul 2009 22:10:27 +0800
+banshee (1.5.0-0ubuntu1~hyper1~jaunty1) jaunty; urgency=low
+
+ * Backport to jaunty
+ * debian/control: Revert bad GNOME# 2.24 transition
+
+ -- Chow Loong Jin <hyperair at gmail.com> Thu, 04 Jun 2009 01:03:53 +0800
+
banshee (1.5.0-1) experimental; urgency=low
[ Chow Loong Jin ]
diff --combined debian/control
index f9302fa,4f107d9..e4a3a64
--- a/debian/control
+++ b/debian/control
@@@ -4,12 -4,11 +4,12 @@@ 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.4.2.3),
+ mono-devel (>= 2.0.1),
boo (>= 0.8.1),
libmono-cairo2.0-cil,
libmono-sqlite2.0-cil,
@@@ -21,18 -20,19 +21,18 @@@
libnotify0.4-cil,
libglib2.0-cil (>= 2.10),
libgtk2.0-cil (>= 2.12),
- libgconf2.0-cil,
+ libgconf2.24-cil,
+ libgnome2.24-cil,
libipod-cil-dev (>= 0.8.5),
libipodui-cil-dev (>= 0.8.5),
libkarma-cil (>= 0.0.5),
libwebkit1.0-cil (>= 0.2),
- libgdata1.4-cil,
monodoc-base (>= 1.1.9),
libsqlite3-dev (>= 3.4),
libmtp-dev (>= 0.2.0),
gconf2,
libglib2.0-dev,
libgtk2.0-dev (>= 2.8),
-# libclutter-1.0-dev (>= 1.0.1),
libx11-dev,
libxrandr-dev (>= 2:1.1.1),
libxxf86vm-dev (>= 1:1.0.1),
@@@ -67,6 -67,22 +67,22 @@@ Description: Media Management and Playb
and other media devices, play and manage video files and burn selections
to a CD.
+ Package: banshee-meego
+ Architecture: any
+ Depends: banshee (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${cli:Depends},
+ ${misc:Depends}
+ Description: Media Management and Playback application - MeeGo extension
+ Banshee is a media management and playback application for the GNOME
+ desktop, allowing users to import audio from CDs, search their library,
+ create playlists of selections of their library, sync music to/from iPods
+ and other media devices, play and manage video files and burn selections
+ to a CD.
+ .
+ This package contains Banshee's MeeGo interface, optimised for running on
+ small devices.
+
Package: banshee-dbg
Section: debug
Priority: extra
diff --combined debian/rules
index a19e3f6,9be5114..45e0f3c
--- a/debian/rules
+++ b/debian/rules
@@@ -1,6 -1,5 +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
@@@ -14,7 -13,7 +14,7 @@@ override_dh_auto_configure
--enable-boo \
--enable-docs \
--enable-webkit \
- --enable-youtube \
+ --disable-youtube \
--disable-moonlight \
--enable-gnome \
--enable-schemas-install \
@@@ -29,7 -28,7 +29,7 @@@
--enable-podcast \
--enable-release \
--disable-shave \
- MCS=/usr/bin/mono-csc LDFLAGS="$(LDFLAGS)"
+ MCS=/usr/bin/csc LDFLAGS="$(LDFLAGS)"
# disable tests
override_dh_auto_test:
@@@ -41,5 -40,8 +41,8 @@@ override_dh_strip
override_dh_clistrip:
dh_clistrip --dbg-package=banshee-dbg
+ override_dh_install:
+ dh_install
+ find $(CURDIR)/debian/banshee -name "*MeeGo*" -delete
%:
- dh $@
+ dh --with=quilt $@
--
banshee
More information about the Pkg-cli-apps-commits
mailing list