[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/unstable/karmic, updated. debian/1.8.0-2ubuntu1-120-g97a7a3d
Chow Loong Jin
hyperair at ubuntu.com
Thu Nov 11 19:52:54 UTC 2010
The following commit has been merged in the ppa/unstable/karmic branch:
commit 97a7a3d5629a7b65adddb1c05cf94c93b63f3e13
Merge: 4a6bdd2aadbb37a86ecf8d284a190a888716308e 01279a8c432a48a03df565ed958f163cf21a5505
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Fri Nov 12 03:42:05 2010 +0800
Merge branch 'ppa/unstable/lucid' into ppa/unstable/karmic
Conflicts:
debian/changelog
diff --combined debian/changelog
index 9801e2a,1ca00e4..bfc76b1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,8 +1,24 @@@
+banshee (1.9.0-1ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
+ gio#, gtk#beans, and libgpod which were 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> Fri, 12 Nov 2010 03:12:44 +0800
+
banshee (1.9.0-1ubuntu1~hyper1+lucid) lucid; urgency=low
- * No change backport to Lucid
+ * Backport to Lucid, changes:
+ + Drop banshee-extension-soundmenu recommends, since Sound Menu is not
+ in Lucid
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 12 Nov 2010 02:14:23 +0800
@@@ -109,22 -95,6 +111,22 @@@ banshee (1.8.0-1ubuntu1~hyper1+lucid) l
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 01 Oct 2010 03:13:46 +0800
+banshee (1.8.0-1ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
+ gio#, gtk#beans, and libgpod which were 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> Fri, 01 Oct 2010 03:28:50 +0800
+
banshee (1.8.0-2) experimental; urgency=low
* Fix duplicates on import (BGO #623441)
@@@ -152,22 -122,6 +154,22 @@@ banshee (1.8.0-1) experimental; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 01 Oct 2010 02:41:41 +0800
+banshee (1.7.6-0ubuntu1~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
+ gio#, gtk#beans, and libgpod which were 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, 20 Sep 2010 04:31:04 +0800
+
banshee (1.7.6-0ubuntu1~hyper1+lucid) lucid; urgency=low
* No change backport to Lucid
@@@ -250,22 -204,6 +252,22 @@@ banshee (1.7.5-1) UNRELEASED; urgency=l
-- Chow Loong Jin <hyperair at ubuntu.com> Sat, 18 Sep 2010 01:47:47 +0800
+banshee (1.7.5-0ubuntu2~hyper1+karmic) karmic; urgency=low
+
+ * Merge from Lucid, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
+ gio#, gtk#beans, and libgpod which were 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> Sat, 11 Sep 2010 23:05:00 +0800
+
banshee (1.7.5-0ubuntu2~hyper1+lucid) lucid; urgency=low
* No change backport to Lucid
@@@ -341,22 -279,6 +343,22 @@@ banshee (1.7.5-0ubuntu1) maverick; urge
-- Iain Lane <laney at ubuntu.com> Mon, 06 Sep 2010 20:05:45 +0100
+banshee (1.7.4-1ubuntu1~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> Fri, 13 Aug 2010 18:08:25 +0800
+
banshee (1.7.4-1ubuntu1~lucid1) lucid; urgency=low
* No change backport to Lucid
@@@ -427,22 -349,6 +429,22 @@@ banshee (1.7.4-1) experimental; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 13 Aug 2010 00:30:24 +0800
+banshee (1.7.3-2ubuntu1~hyper1+karmic) 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> Sat, 24 Jul 2010 22:19:49 +0800
+
banshee (1.7.3-2ubuntu2) maverick; urgency=low
* banshee shipped a generated MIME database (/usr/share/mime/*) breaking the
@@@ -678,22 -584,6 +680,22 @@@ banshee (1.7.1-1ubuntu1) maverick; urge
-- Didier Roche <didrocks at ubuntu.com> Mon, 05 Jul 2010 15:19:53 +0200
+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
@@@ -706,22 -596,6 +708,22 @@@ banshee (1.7.1-1~hyper1~maverick1) mave
-- Chow Loong Jin <hyperair at ubuntu.com> Mon, 31 May 2010 21:03:52 +0800
+banshee (1.7.1-1~hyper1~karmic) 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> Fri, 28 May 2010 04:22:52 +0800
+
banshee (1.7.1-1~hyper1~lucid) lucid; urgency=low
* No change upload to PPA
@@@ -764,22 -638,6 +766,22 @@@ banshee (1.7.1-1) experimental; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Thu, 27 May 2010 18:14:20 +0800
+banshee (1.7.0-1~hyper1~karmic) 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> Sat, 08 May 2010 07:19:03 +0800
+
banshee (1.7.0-1~hyper1~lucid) lucid; urgency=low
* No change upload to lucid
@@@ -820,22 -678,6 +822,22 @@@ banshee (1.7.0-1) experimental; urgency
-- Chow Loong Jin <hyperair at ubuntu.com> Fri, 07 May 2010 23:27:08 +0800
+banshee (1.6.1-1~hyper1~karmic) 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> Thu, 27 May 2010 18:59:09 +0800
+
banshee (1.6.1-1~hyper1~lucid) lucid; urgency=low
* No change backport to Lucid.
@@@ -878,22 -720,6 +880,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.6.0-1~hyper1~karmic) 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> Fri, 02 Apr 2010 00:52:53 +0800
+
banshee (1.6.0-1~hyper1~lucid) lucid; urgency=low
* No change backport to Lucid
@@@ -924,22 -750,6 +926,22 @@@ 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~karmic) 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, 22 Mar 2010 20:33:30 +0800
+
banshee (1.5.6-1~hyper1~lucid) lucid; urgency=low
* No change backport to Lucid
@@@ -981,22 -791,6 +983,22 @@@ 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~karmic) karmic; urgency=low
+
+ * Merge from unstable, 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> Fri, 12 Mar 2010 03:21:19 +0800
+
banshee (1.5.5-1~hyper1~lucid) lucid; urgency=low
* No change backport to Lucid
@@@ -1032,19 -826,6 +1034,19 @@@ 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~karmic) karmic; urgency=low
+
+ * Merge from unstable, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition (except libtaglib2.0-cil which was
+ backported)
+ - Use mono-devel 2.4.2.3
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream and
+ force-enable LibraryWatcher
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 27 Feb 2010 15:54:13 +0800
+
banshee (1.5.4-1) unstable; urgency=low
* New upstream release (Closes: #571734)
@@@ -1091,18 -872,6 +1093,18 @@@
-- Chow Loong Jin <hyperair at ubuntu.com> Sun, 28 Feb 2010 01:14:01 +0800
+banshee (1.5.4~really1.5.3-0ubuntu1~hyper1~karmic) karmic; urgency=low
+
+ * Merge from unstable, remaining changes:
+ + debian/control:
+ - Revert -cil-dev transition
+ - Use mono-devel 2.4.2.3
+ + debian/patches/02_bundle-inotifywatcher.patch:
+ - Revert the InotifyWatcher removal commit from upstream, and
+ force-enable LibraryWatcher
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 29 Jan 2010 00:23:27 +0800
+
banshee (1.5.3-1) unstable; urgency=low
[ Chow Loong Jin ]
@@@ -1316,14 -1085,6 +1318,14 @@@ banshee (1.5.0-3) experimental; urgency
-- 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:
diff --combined debian/control
index d312987,96a23ef..5c2c960
--- a/debian/control
+++ b/debian/control
@@@ -9,26 -9,26 +9,26 @@@ Build-Depends: debhelper (>= 7.0.50)
cli-common-dev (>= 0.5.7),
intltool (>= 0.35),
lsb-release,
- mono-devel (>= 2.4.3),
- libndesk-dbus1.0-cil-dev (>= 0.5),
- libndesk-dbus-glib1.0-cil-dev (>= 0.3),
- libmono-addins-cil-dev (>= 0.3.1),
+ mono-devel (>= 2.4.2.3),
+ libndesk-dbus1.0-cil (>= 0.5),
+ libndesk-dbus-glib1.0-cil (>= 0.3),
+ libmono-addins0.2-cil (>= 0.3.1),
libtaglib-cil-dev (>= 2.0.3.7),
- libmono-zeroconf-cil-dev (>= 0.7.3),
- libnotify-cil-dev,
- libglib2.0-cil-dev (>= 2.10),
- libgtk2.0-cil-dev (>= 2.12),
- libgconf2.0-cil-dev,
+ libmono-zeroconf1.0-cil (>= 0.7.3),
+ libnotify0.4-cil,
+ libglib2.0-cil (>= 2.10),
+ libgtk2.0-cil (>= 2.12),
+ libgconf2.0-cil,
libgudev1.0-cil-dev (>= 0.1),
libgkeyfile-cil-dev (>= 0.1),
libgio2.0-cil-dev (>= 2.22),
libgtk-sharp-beans2.0-cil-dev (>= 2.8),
libgpod-cil-dev (>= 0.7.95),
- libkarma-cil-dev (>= 0.0.5),
+ libkarma-cil (>= 0.0.5),
libwebkit-dev (>= 1.2.2),
libsoup2.4-dev (>= 2.26),
libsoup-gnome2.4-dev (>= 2.26),
- libgdata-cil-dev (>= 1.4),
+ libgdata1.4-cil,
monodoc-base (>= 1.1.9),
libsqlite3-dev (>= 3.4),
libmtp-dev (>= 0.3.0),
@@@ -40,7 -40,7 +40,7 @@@
libxrandr-dev (>= 2:1.1.1),
libxxf86vm-dev (>= 1:1.0.1),
libgstreamer0.10-dev (>= 0.10.12),
- libgstreamer-plugins-base0.10-dev (>= 0.10.25.2),
+ libgstreamer-plugins-base0.10-dev (>= 0.10.12),
gnome-doc-utils (>= 0.17.3)
Standards-Version: 3.9.1
Homepage: http://www.banshee.fm
@@@ -58,8 -58,7 +58,7 @@@ Depends: ${shlibs:Depends}
gnome-icon-theme (>= 2.16)
Recommends: gstreamer0.10-plugins-bad,
brasero,
- avahi-daemon,
- banshee-extension-soundmenu
+ avahi-daemon
Suggests: gstreamer0.10-plugins-ugly,
gstreamer0.10-ffmpeg,
banshee-dbg (=${binary:Version})
--
banshee
More information about the Pkg-cli-apps-commits
mailing list