[Pkg-cli-apps-commits] [banshee] 03/12: Revert packaging to 2.6.1-2ubuntu1
Chow Loong Jin
hyperair at debian.org
Mon Feb 24 18:50:29 UTC 2014
This is an automated email from the git hooks/post-receive script.
hyperair pushed a commit to branch ubuntu/trusty
in repository banshee.
commit 22de4402b2846957f1523dc5bf1f38d2799c4e0c
Author: Chow Loong Jin <hyperair at debian.org>
Date: Sun Feb 9 22:59:11 2014 +0800
Revert packaging to 2.6.1-2ubuntu1
---
debian/banshee-meego.install | 3 +
debian/control | 46 +++++++++----
debian/gbp.conf | 2 +-
debian/patches/Initial-port-to-GStreamer-1.0.patch | 20 +++---
...build-time-enable-gapless-playback-option.patch | 24 +++----
...orkManager-Cache-null-artwork-for-fast-lo.patch | 78 ++++++++++++++++++++++
...Fix-certificate-validation-with-libsoup-2.patch | 2 +-
debian/patches/series | 5 +-
debian/rules | 11 ++-
9 files changed, 146 insertions(+), 45 deletions(-)
diff --git a/debian/banshee-meego.install b/debian/banshee-meego.install
new file mode 100644
index 0000000..0a36958
--- /dev/null
+++ b/debian/banshee-meego.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/banshee/MeeGo.exe
+debian/tmp/usr/lib/banshee/Extensions/Banshee.MeeGo.dll*
+debian/tmp/usr/share/mutter-meego/panels/banshee.desktop usr/share/une/applications
diff --git a/debian/control b/debian/control
index 698d065..1331632 100644
--- a/debian/control
+++ b/debian/control
@@ -11,32 +11,33 @@ Build-Depends: debhelper (>= 9),
cli-common-dev (>= 0.5.7),
intltool (>= 0.35),
lsb-release,
- mono-devel (>= 2.8.2),
- libdbus2.0-cil-dev (>= 0.7),
- libdbus-glib2.0-cil-dev (>= 0.5),
+ mono-devel (>= 2.4.3),
+ libdbus1.0-cil-dev (>= 0.7),
+ libdbus-glib1.0-cil-dev (>= 0.5),
libmono-addins-cil-dev (>= 0.6.2),
libtaglib-cil-dev (>= 2.0.3.7),
libmono-zeroconf-cil-dev (>= 0.7.3),
- libnotify3.0-cil-dev,
- libglib3.0-cil-dev (>= 2.99.1),
- libgtk3.0-cil-dev (>= 2.99.1),
+ libnotify-cil-dev,
+ libglib2.0-cil-dev (>= 2.12.10),
+ libgtk2.0-cil-dev (>= 2.12),
libgconf2.0-cil-dev,
- libgudev3.0-cil-dev (>= 3.0) [linux-any],
+ libgudev1.0-cil-dev (>= 0.1) [linux-any],
libgkeyfile-cil-dev (>= 0.1),
- libgio3.0-cil-dev (>= 2.99),
- libgpod-cil-dev (>= 0.8.3-2~),
-# libwebkitgtk-3.0-dev (>= 1.2.2),
+ libgio2.0-cil-dev (>= 2.22.3-1~),
+ libgtk-sharp-beans2.0-cil-dev (>= 2.8),
+ libgpod-cil-dev (>= 0.8.2-7~),
+ libwebkitgtk-dev (>= 1.2.2) | libwebkit-dev (>= 1.2.2),
libsoup2.4-dev (>= 2.26),
libsoup-gnome2.4-dev (>= 2.26),
libgdata-cil-dev (>= 1.7),
monodoc-base (>= 1.1.9),
libsqlite3-dev (>= 3.4),
- libmtp-dev (>= 1.1.0),
+ libmtp-dev (>= 0.3.0),
gconf2,
libgconf2-dev,
- libglib2.0-dev (>= 2.22),
+ libglib2.0-dev,
libwnck-dev,
- libgtk-3-dev (>= 3.0),
+ libgtk2.0-dev (>= 2.12.10),
# libclutter-1.0-dev (>= 1.0.1),
libx11-dev,
libxrandr-dev (>= 2:1.1.1),
@@ -72,7 +73,7 @@ Suggests: gstreamer1.0-plugins-bad,
banshee-dbg (=${binary:Version})
Provides: banshee-api-${banshee:API},
banshee-asm-${banshee:ASM}
-Breaks: banshee-extensions-common (<< 2.9.0)
+Breaks: banshee-extensions-common (<< 2.0.1-2~)
Description: Media Management and Playback application
Banshee is a media management and playback application for the GNOME
desktop, allowing users to import audio from CDs, search their library,
@@ -96,6 +97,22 @@ Description: Media Management and Playback application - sound menu extension
.
This package contains Banshee's support for the Sound Menu
+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
@@ -126,3 +143,4 @@ Description: Media Management and Playback application (developer documentation)
to a CD.
.
This package contains the developer documentation for Banshee.
+
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 9ac3a9f..688e50b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,3 @@
[DEFAULT]
-debian-branch = ubuntu/trusty
+debian-branch = ubuntu/saucy
upstream-branch = upstream
diff --git a/debian/patches/Initial-port-to-GStreamer-1.0.patch b/debian/patches/Initial-port-to-GStreamer-1.0.patch
index e3dcf19..7475bcb 100644
--- a/debian/patches/Initial-port-to-GStreamer-1.0.patch
+++ b/debian/patches/Initial-port-to-GStreamer-1.0.patch
@@ -205,7 +205,7 @@ index a496ada..0cbb3b7 100644
band = gst_child_proxy_get_child_by_index (GST_CHILD_PROXY (player->equalizer), i);
g_object_get (G_OBJECT (band), "freq", &(*freq)[i], NULL);
diff --git a/libbanshee/banshee-player-missing-elements.c b/libbanshee/banshee-player-missing-elements.c
-index 825c8ef..392137a 100644
+index 20804c4..30118c5 100644
--- a/libbanshee/banshee-player-missing-elements.c
+++ b/libbanshee/banshee-player-missing-elements.c
@@ -170,7 +170,7 @@ _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old,
@@ -218,7 +218,7 @@ index 825c8ef..392137a 100644
if (install_return != GST_INSTALL_PLUGINS_STARTED_OK) {
diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
-index 4dae104..018bcd2 100644
+index ed845f3..6c2af35 100644
--- a/libbanshee/banshee-player-pipeline.c
+++ b/libbanshee/banshee-player-pipeline.c
@@ -76,7 +76,7 @@ playbin_stream_changed_cb (GstElement * element, BansheePlayer *player)
@@ -290,7 +290,7 @@ index 4dae104..018bcd2 100644
});
}
bp_debug ("Audiosink has volume: %s",
-@@ -386,7 +385,7 @@ _bp_pipeline_construct (BansheePlayer *player)
+@@ -383,7 +382,7 @@ _bp_pipeline_construct (BansheePlayer *player)
}
// Ghost pad the audio bin so audio is passed from the bin into the tee
@@ -299,7 +299,7 @@ index 4dae104..018bcd2 100644
gst_element_add_pad (player->audiobin, gst_ghost_pad_new ("sink", teepad));
gst_object_unref (teepad);
-@@ -414,8 +413,8 @@ _bp_pipeline_construct (BansheePlayer *player)
+@@ -411,8 +410,8 @@ _bp_pipeline_construct (BansheePlayer *player)
gst_bus_add_watch (bus, bp_pipeline_bus_callback, player);
// Link the first tee pad to the primary audio sink queue
@@ -816,10 +816,10 @@ index 5787c87..7e7dc78 100644
player->vis_enabled = cb != NULL;
}
diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c
-index 673a81d..8f2d176 100644
+index c655a72..b8f98b8 100644
--- a/libbanshee/banshee-player.c
+++ b/libbanshee/banshee-player.c
-@@ -255,12 +255,11 @@ bp_set_position (BansheePlayer *player, guint64 time_ms, gboolean accurate_seek)
+@@ -250,12 +250,11 @@ bp_set_position (BansheePlayer *player, guint64 time_ms)
P_INVOKE guint64
bp_get_position (BansheePlayer *player)
{
@@ -833,7 +833,7 @@ index 673a81d..8f2d176 100644
return position / GST_MSECOND;
}
-@@ -270,12 +269,11 @@ bp_get_position (BansheePlayer *player)
+@@ -265,12 +264,11 @@ bp_get_position (BansheePlayer *player)
P_INVOKE guint64
bp_get_duration (BansheePlayer *player)
{
@@ -847,7 +847,7 @@ index 673a81d..8f2d176 100644
return duration / GST_MSECOND;
}
-@@ -451,7 +449,6 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
+@@ -446,7 +444,6 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
g_return_if_fail (IS_BANSHEE_PLAYER (player));
gint64 pos = -1;
GstState state;
@@ -855,7 +855,7 @@ index 673a81d..8f2d176 100644
gboolean paused = FALSE;
// Gstreamer playbin do not support to set suburi during playback
-@@ -459,7 +456,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
+@@ -454,7 +451,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
gst_element_get_state (player->playbin, &state, NULL, 0);
paused = (state == GST_STATE_PAUSED);
if (state >= GST_STATE_PAUSED) {
@@ -864,7 +864,7 @@ index 673a81d..8f2d176 100644
gst_element_set_state (player->playbin, GST_STATE_READY);
// Force to wait asynch operation
gst_element_get_state (player->playbin, &state, NULL, -1);
-@@ -472,7 +469,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
+@@ -467,7 +464,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
gst_element_get_state (player->playbin, &state, NULL, -1);
if (pos != -1) {
diff --git a/debian/patches/Remove-build-time-enable-gapless-playback-option.patch b/debian/patches/Remove-build-time-enable-gapless-playback-option.patch
index f9a6f71..c6d4f51 100644
--- a/debian/patches/Remove-build-time-enable-gapless-playback-option.patch
+++ b/debian/patches/Remove-build-time-enable-gapless-playback-option.patch
@@ -16,12 +16,12 @@ the conditionals.
7 files changed, 10 insertions(+), 63 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 6c91fb9..02cb201 100644
+index f36063e..f698ccd 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -170,21 +170,6 @@ BANSHEE_CHECK_UBUNTUONE
- dnl Boo (optional)
- BANSHEE_CHECK_BOO
+@@ -171,21 +171,6 @@ BANSHEE_CHECK_SOUNDMENU
+ dnl Ubuntu One Music Store (optional)
+ BANSHEE_CHECK_UBUNTUONE
-dnl Gapless, if we have a new-enough playbin2
-ENABLE_GAPLESS="no"
@@ -57,7 +57,7 @@ index 6ed369a..a05c492 100644
bansheelib_LTLIBRARIES = libbanshee.la
diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
-index 018bcd2..28bae33 100644
+index 6c2af35..d4977e1 100644
--- a/libbanshee/banshee-player-pipeline.c
+++ b/libbanshee/banshee-player-pipeline.c
@@ -239,7 +239,6 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata)
@@ -90,10 +90,10 @@ index 018bcd2..28bae33 100644
g_return_val_if_fail (player->playbin != NULL, FALSE);
diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c
-index 8f2d176..aa9aa74 100644
+index b8f98b8..08c4f94 100644
--- a/libbanshee/banshee-player.c
+++ b/libbanshee/banshee-player.c
-@@ -308,16 +308,6 @@ bp_can_seek (BansheePlayer *player)
+@@ -303,16 +303,6 @@ bp_can_seek (BansheePlayer *player)
}
P_INVOKE gboolean
@@ -111,10 +111,10 @@ index 8f2d176..aa9aa74 100644
{
g_return_val_if_fail (IS_BANSHEE_PLAYER (player), FALSE);
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
-index b60e155..dbcbe9d 100644
+index 278ff51..05b1905 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
-@@ -750,16 +750,11 @@ namespace Banshee.GStreamer
+@@ -747,16 +747,11 @@ namespace Banshee.GStreamer
get { return gapless_enabled; }
set
{
@@ -135,7 +135,7 @@ index b60e155..dbcbe9d 100644
}
}
}
-@@ -884,13 +879,11 @@ namespace Banshee.GStreamer
+@@ -881,13 +876,11 @@ namespace Banshee.GStreamer
Catalog.GetString ("For tracks that have ReplayGain data, automatically scale (normalize) playback volume"),
delegate { ReplayGainEnabled = ReplayGainEnabledSchema.Get (); }
));
@@ -154,7 +154,7 @@ index b60e155..dbcbe9d 100644
}
private void UninstallPreferences ()
-@@ -901,9 +894,7 @@ namespace Banshee.GStreamer
+@@ -898,9 +891,7 @@ namespace Banshee.GStreamer
}
service["general"]["misc"].Remove (replaygain_preference);
@@ -165,7 +165,7 @@ index b60e155..dbcbe9d 100644
replaygain_preference = null;
gapless_preference = null;
}
-@@ -972,9 +963,6 @@ namespace Banshee.GStreamer
+@@ -969,9 +960,6 @@ namespace Banshee.GStreamer
BansheePlayerAboutToFinishCallback cb);
[DllImport ("libbanshee.dll")]
diff --git a/debian/patches/Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch b/debian/patches/Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
new file mode 100644
index 0000000..d22eb05
--- /dev/null
+++ b/debian/patches/Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
@@ -0,0 +1,78 @@
+From: Chow Loong Jin <hyperair at ubuntu.com>
+Date: Mon, 22 Nov 2010 04:36:40 +0800
+Subject: Revert "[ArtworkManager] Cache null artwork for fast lookup"
+
+This reverts commit 768c76da611a990054ff0921f24d566de86ac749.
+---
+ .../Banshee.Collection.Gui/ArtworkManager.cs | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
+index 6e1aa47..fe5f25e 100644
+--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
++++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
+@@ -50,7 +50,6 @@ namespace Banshee.Collection.Gui
+ {
+ private Dictionary<int, SurfaceCache> scale_caches = new Dictionary<int, SurfaceCache> ();
+ private HashSet<int> cacheable_cover_sizes = new HashSet<int> ();
+- private HashSet<string> null_artwork_ids = new HashSet<string> ();
+
+ private class SurfaceCache : LruCache<string, Cairo.ImageSurface>
+ {
+@@ -122,13 +121,8 @@ namespace Banshee.Collection.Gui
+ return surface;
+ }
+
+- if (null_artwork_ids.Contains (id)) {
+- return null;
+- }
+-
+ Pixbuf pixbuf = LookupScalePixbuf (id, size);
+ if (pixbuf == null || pixbuf.Handle == IntPtr.Zero) {
+- null_artwork_ids.Add (id);
+ return null;
+ }
+
+@@ -168,17 +162,12 @@ namespace Banshee.Collection.Gui
+ return null;
+ }
+
+- if (null_artwork_ids.Contains (id)) {
+- return null;
+- }
+-
+ // Find the scaled, cached file
+ string path = CoverArtSpec.GetPathForSize (id, size);
+ if (File.Exists (new SafeUri (path))) {
+ try {
+ return new Pixbuf (path);
+ } catch {
+- null_artwork_ids.Add (id);
+ return null;
+ }
+ }
+@@ -195,7 +184,6 @@ namespace Banshee.Collection.Gui
+ Pixbuf pixbuf = new Pixbuf (unconverted_path);
+ if (pixbuf.Width < 50 || pixbuf.Height < 50) {
+ Hyena.Log.DebugFormat ("Ignoring cover art {0} because less than 50x50", unconverted_path);
+- null_artwork_ids.Add (id);
+ return null;
+ }
+
+@@ -236,7 +224,6 @@ namespace Banshee.Collection.Gui
+ } catch {}
+ }
+
+- null_artwork_ids.Add (id);
+ return null;
+ }
+
+@@ -256,8 +243,6 @@ namespace Banshee.Collection.Gui
+ scale_caches[size].Remove (id);
+ }
+
+- null_artwork_ids.Remove (id);
+-
+ if (inMemoryCacheOnly) {
+ return;
+ }
diff --git a/debian/patches/libossifer-Fix-certificate-validation-with-libsoup-2.patch b/debian/patches/libossifer-Fix-certificate-validation-with-libsoup-2.patch
index f7b8596..4d84eb4 100644
--- a/debian/patches/libossifer-Fix-certificate-validation-with-libsoup-2.patch
+++ b/debian/patches/libossifer-Fix-certificate-validation-with-libsoup-2.patch
@@ -13,7 +13,7 @@ Origin: commit:a5c94f2efee425320847d10748410fe9c3ff9311
2 files changed, 13 insertions(+)
diff --git a/build/m4/banshee/libwebkit.m4 b/build/m4/banshee/libwebkit.m4
-index b5f0637..7590345 100644
+index d1f81c8..9a6f7f5 100644
--- a/build/m4/banshee/libwebkit.m4
+++ b/build/m4/banshee/libwebkit.m4
@@ -23,6 +23,13 @@ AC_DEFUN([BANSHEE_CHECK_LIBWEBKIT],
diff --git a/debian/patches/series b/debian/patches/series
index 362d9ae..8b9f8fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,16 +5,13 @@ Enable-switching-between-the-2-interfaces.patch
Add-Meego-desktop-file.patch
Enable-MPRIS-extension-by-default.patch
Remove-irrelevant-media.patch
+Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
libossifer-Fix-certificate-validation-with-libsoup-2.patch
Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch
Initial-port-to-GStreamer-1.0.patch
Remove-build-time-enable-gapless-playback-option.patch
Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch
Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch
-Use-notify-sharp-3.0-to-match-Gtk-3.0.patch
-Use-dbus-2.patch
-libbnpx11-Don-t-use-non-existent-macros.patch
-Fix-ambiguity-in-DateTime-class.patch
Disable-Notification-area-extension-by-default.patch
Enable-sound-menu-extension-by-default.patch
Change-Amazon-redirect-url.patch
diff --git a/debian/rules b/debian/rules
index 6473cea..da625d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,6 @@ CONFFLAGS = \
--disable-static \
--disable-tests \
--with-vendor-build-id="`lsb_release -ds`" \
- --with-system-notify-sharp \
--disable-clutter \
--disable-gst-sharp \
--enable-user-help \
@@ -27,9 +26,9 @@ CONFFLAGS = \
--enable-daap \
--disable-remote-audio \
--disable-torrent \
- --disable-meego \
+ --enable-meego \
--enable-gapless-playback \
- --disable-webkit \
+ --enable-webkit \
--enable-release \
--disable-shave \
MCS=/usr/bin/mono-csc LDFLAGS="$(LDFLAGS)"
@@ -72,6 +71,7 @@ override_dh_makeclilibs:
override_dh_clideps:
dh_clideps \
+ --exclude-moduleref=libmeego-panel \
--exclude-moduleref=winmm \
--exclude-moduleref=libbanshee \
--exclude-moduleref=libbnpx11
@@ -83,6 +83,11 @@ override_dh_install:
find debian/tmp -name '*.la' -delete
rm -f debian/tmp/usr/share/applications/mimeinfo.cache
dh_install
+ # Remove MeeGo stuff from banshee binary package
+ rm -r debian/banshee/usr/share/mutter-meego/ \
+ debian/banshee/usr/lib/banshee/MeeGo.exe \
+ debian/banshee/usr/lib/banshee/Extensions/Banshee.MeeGo.dll* \
+ debian/banshee/usr/share/dbus-1/services/com.meego*
ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
# Remove U1MS and Sound Menu stuff from banshee
rm -r debian/banshee/usr/lib/banshee/Extensions/Banshee.SoundMenu.*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git
More information about the Pkg-cli-apps-commits
mailing list