[Pkg-mono-svn-commits] rev 2547 - in non-group/banshee: tags
tags/0.10.10-1/debian tags/0.10.10-1/debian/patches
trunk/debian trunk/debian/patches
Sebastian Dröge
slomo-guest at costa.debian.org
Fri May 12 11:10:38 UTC 2006
Author: slomo-guest
Date: 2006-05-12 11:10:37 +0000 (Fri, 12 May 2006)
New Revision: 2547
Added:
non-group/banshee/tags/0.10.10-1/
non-group/banshee/tags/0.10.10-1/debian/patches/02_notification-area-transparency.diff
non-group/banshee/tags/0.10.10-1/debian/patches/03_cvs-backports.diff
non-group/banshee/trunk/debian/patches/02_notification-area-transparency.diff
non-group/banshee/trunk/debian/patches/03_cvs-backports.diff
Modified:
non-group/banshee/tags/0.10.10-1/debian/changelog
non-group/banshee/tags/0.10.10-1/debian/control
non-group/banshee/tags/0.10.10-1/debian/patches/01_typefinding.diff
non-group/banshee/tags/0.10.10-1/debian/rules
non-group/banshee/trunk/debian/changelog
non-group/banshee/trunk/debian/control
non-group/banshee/trunk/debian/patches/01_typefinding.diff
non-group/banshee/trunk/debian/rules
Log:
* updated and tagged banshee to 0.10.10-1
Copied: non-group/banshee/tags/0.10.10-1 (from rev 2519, non-group/banshee/trunk)
Modified: non-group/banshee/tags/0.10.10-1/debian/changelog
===================================================================
--- non-group/banshee/trunk/debian/changelog 2006-04-30 13:31:20 UTC (rev 2519)
+++ non-group/banshee/tags/0.10.10-1/debian/changelog 2006-05-12 11:10:37 UTC (rev 2547)
@@ -1,3 +1,30 @@
+banshee (0.10.10-1) unstable; urgency=low
+
+ * New upstream release (Closes: #358780)
+ * debian/patches/01_typefinding.diff:
+ + Updated
+ * debian/patches/02_notification-area-transparency.diff:
+ + Make the background of the notification area icon transparent
+ * debian/patches/03_cvs-backports.diff:
+ A bunch of backports from CVS:
+ - Make 'return' the default action key for dialogs
+ - Add Path.DirectorySeparatorChar to 'StartsWith' check
+ to determine if files should be copied, otherwise
+ 'Music to import' will be treated as 'Music'
+ - properly load files in shallow directories from command line
+ - ctrl+w hides banshee to the tray
+ - Show empty strings instead of 0 for TrackNumber == 0
+ - Don't show 0 KB/Sec for tracks
+ - Use String.Replace() instead of Regex.Replace() as this is much faster
+ * Update Standards-Version to 3.7.2
+ * Build-Depend on cli-common-dev (>= 0.4.0)
+ * Build-Depend on libipod-cil (>= 0.5.16)
+ * Build-Depend on mono-gmcs
+ * Disable building of the NJB plugin as it doesn't work at all for us
+ * Call dh_clideps with -d to prevent duplicated Depends
+
+ -- Sebastian Dröge <slomo at ubuntu.com> Fri, 12 May 2006 12:15:55 +0200
+
banshee (0.10.9-1) unstable; urgency=low
* New upstream release
Modified: non-group/banshee/tags/0.10.10-1/debian/control
===================================================================
--- non-group/banshee/trunk/debian/control 2006-04-30 13:31:20 UTC (rev 2519)
+++ non-group/banshee/tags/0.10.10-1/debian/control 2006-05-12 11:10:37 UTC (rev 2547)
@@ -2,8 +2,8 @@
Section: sound
Priority: optional
Maintainer: Sebastian Dröge <slomo at ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, cli-common (>= 0.2.0), mono-mcs (>= 1.1.10) | c-sharp-compiler, libmono-dev (>= 1.1.10), libgtk2.0-cil (>= 2.8.0), libglib2.0-cil (>= 2.8.0), libgnome2.0-cil (>= 2.8.0), libgconf2.0-cil (>= 2.8.0), libglade2.0-cil (>= 2.8.0), libipod-cil (>= 0.5.15), libnjb-cil (>= 0.2.1), libdbus-1-cil (>= 0.60), libsqlite3-dev (>= 3.2), libmono-sqlite1.0-cil, gstreamer0.10-plugins-base-apps, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-gnomevfs, libgstreamer0.10-dev (>= 0.10.3), libgstreamer-plugins-base0.10-dev (>= 0.10.3), libglib2.0-dev, libgnome2-dev, libgnomeui-dev, libgconf2-dev, gconf2, libgtk2.0-dev (>= 2.8), libgnomevfs2-dev, libgnome-desktop-dev, libdbus-1-dev (>= 0.60), libdbus-glib-1-dev (>= 0.60), libhal-dev (>= 0.5.2), libnautilus-burn-dev (>= 2.12.0), libmusicbrainz4-dev (>= 2.1.1), libavahi1.0-cil (>= 0.6), pkg-config, intltool
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 5), cdbs, cli-common-dev (>= 0.4.0), mono-mcs (>= 1.1.10) | c-sharp-compiler, libmono-dev (>= 1.1.10), libgtk2.0-cil (>= 2.8.0), libglib2.0-cil (>= 2.8.0), libgnome2.0-cil (>= 2.8.0), libgconf2.0-cil (>= 2.8.0), libglade2.0-cil (>= 2.8.0), libipod-cil (>= 0.5.16), libdbus-1-cil (>= 0.60), libsqlite3-dev (>= 3.2), libmono-sqlite1.0-cil, gstreamer0.10-plugins-base-apps, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-gnomevfs, libgstreamer0.10-dev (>= 0.10.3), libgstreamer-plugins-base0.10-dev (>= 0.10.3), libglib2.0-dev, libgnome2-dev, libgnomeui-dev, libgconf2-dev, gconf2, libgtk2.0-dev (>= 2.8), libgnomevfs2-dev, libgnome-desktop-dev, libdbus-1-dev (>= 0.60), libdbus-glib-1-dev (>= 0.60), libhal-dev (>= 0.5.2), libnautilus-burn-dev (>= 2.12.0), libmusicbrainz4-dev (>= 2.1.1), libavahi1.0-cil (>= 0.6), pkg-config, intltool, mono-gmcs
+Standards-Version: 3.7.2
Package: banshee
Architecture: any
Modified: non-group/banshee/tags/0.10.10-1/debian/patches/01_typefinding.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/01_typefinding.diff 2006-04-30 13:31:20 UTC (rev 2519)
+++ non-group/banshee/tags/0.10.10-1/debian/patches/01_typefinding.diff 2006-05-12 11:10:37 UTC (rev 2547)
@@ -1,71 +1,19 @@
-Index: libbanshee/gst-misc-0.10.c
-===================================================================
-RCS file: /cvs/gnome/banshee/libbanshee/gst-misc-0.10.c,v
-retrieving revision 1.5
-diff -u -r1.5 gst-misc-0.10.c
---- libbanshee/gst-misc-0.10.c 20 Mar 2006 09:30:47 -0000 1.5
-+++ libbanshee/gst-misc-0.10.c 20 Mar 2006 16:25:53 -0000
-@@ -75,35 +75,16 @@
- *type = gst_caps_to_string(caps);
- }
-
--static gboolean
--gst_typefind_bus_callback(GstBus *bus, GstMessage *message, gpointer data)
--{
-- gchar **out = data;
--
-- switch(GST_MESSAGE_TYPE(message)) {
-- case GST_MESSAGE_ERROR:
-- case GST_MESSAGE_EOS:
-- *out = (gchar *)-1;
-- break;
-- default:
-- break;
-- }
--
-- return TRUE;
--}
--
+--- libbanshee/gst-misc-0.10.c.old 2006-04-10 21:12:49.110465912 +0200
++++ libbanshee/gst-misc-0.10.c 2006-04-10 21:13:59.189812232 +0200
+@@ -78,8 +78,7 @@
gchar *
gstreamer_detect_mimetype(const gchar *uri)
{
+- return NULL;
- /*GstElement *pipeline;
+ GstElement *pipeline;
GstElement *source;
GstElement *typefind;
GstElement *fakesink;
- gchar *mimetype = NULL;
-
- pipeline = gst_pipeline_new("new");
-- gst_bus_add_watch(gst_pipeline_get_bus(GST_PIPELINE(pipeline)),
-- gst_typefind_bus_callback, &mimetype);
-
- source = gst_element_factory_make("gnomevfssrc", "source");
- typefind = gst_element_factory_make("typefind", "typefind");
-@@ -123,18 +104,17 @@
- gst_element_link(source, typefind);
- gst_element_link(typefind, fakesink);
-
-- gst_element_set_state(pipeline, GST_STATE_PLAYING);
-+ if(gst_element_set_state(pipeline, GST_STATE_PLAYING) == GST_STATE_CHANGE_ASYNC) {
-+ if (gst_element_get_state(pipeline, NULL, NULL, -1) == GST_STATE_CHANGE_FAILURE) {
-+ gst_object_unref(pipeline);
-+ return NULL;
-+ }
-+ }
-
-- while(mimetype == NULL);
-+ while((mimetype == NULL) && (pipeline->current_state == GST_STATE_PLAYING));
-
+@@ -116,5 +115,5 @@
gst_element_set_state(pipeline, GST_STATE_NULL);
gst_object_unref(pipeline);
-- if(mimetype == (gchar *)-1) {
-- mimetype = NULL;
-- }
--
- return mimetype;*/
--
-- return NULL;
+ return mimetype;
}
Added: non-group/banshee/tags/0.10.10-1/debian/patches/02_notification-area-transparency.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/02_notification-area-transparency.diff 2006-04-30 13:31:20 UTC (rev 2519)
+++ non-group/banshee/tags/0.10.10-1/debian/patches/02_notification-area-transparency.diff 2006-05-12 11:10:37 UTC (rev 2547)
@@ -0,0 +1,62 @@
+--- tmp/banshee-0.10.10/src/Banshee.Plugins/NotificationAreaIcon/NotificationArea.cs 2006-04-10 17:12:39.000000000 +0200
++++ banshee-0.10.10/src/Banshee.Plugins/NotificationAreaIcon/NotificationArea.cs 2006-05-09 09:21:34.412000000 +0200
+@@ -4,6 +4,7 @@
+ * Copyright (C) 2005 Todd Berman <tberman at off.net>
+ * Copyright (C) 2005 Ed Catmur <ed at catmur.co.uk>
+ * Copyright (C) 2005 Novell, Inc. (Miguel de Icaza, Aaron Bockover)
++ * Copyright (C) 2006 Sebastian Dröge <slomo at ubuntu.com>
+ ****************************************************************************/
+
+ /* THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW:
+@@ -63,6 +64,43 @@
+ Screen = screen;
+ Init ();
+ }
++
++ public new void Add (Widget widget)
++ {
++ widget.Realized += make_transparent;
++ base.Add (widget);
++ }
++
++ [GLib.ConnectBefore]
++ private void make_transparent (object o, EventArgs args)
++ {
++ try {
++ Gtk.Widget widget = (Gtk.Widget) o;
++ widget.AppPaintable = true;
++ widget.DoubleBuffered = false;
++ widget.GdkWindow.SetBackPixmap (null, true);
++ widget.ExposeEvent += transparent_expose_event;
++ widget.StyleSet += make_transparent_again;
++ } catch (System.InvalidCastException e) {}
++ }
++
++ [GLib.ConnectBefore]
++ private void transparent_expose_event (object o, ExposeEventArgs args)
++ {
++ try {
++ Gtk.Widget widget = (Gtk.Widget) o;
++ Gdk.Rectangle rec = args.Event.Area;
++ widget.GdkWindow.ClearArea (rec.X, rec.Y, rec.Width, rec.Height);
++ } catch (System.InvalidCastException e) {}
++ }
++
++ private void make_transparent_again (object o, StyleSetArgs args)
++ {
++ try {
++ Gtk.Widget widget = (Gtk.Widget) o;
++ widget.GdkWindow.SetBackPixmap (null, true);
++ } catch (System.InvalidCastException e) {}
++ }
+
+ [DllImport ("libc")]
+ private static extern IntPtr memcpy (ref XClientMessageEvent.DataUnion dest, IntPtr src, IntPtr len);
+@@ -123,6 +161,7 @@
+ protected override void OnRealized ()
+ {
+ base.OnRealized ();
++ make_transparent (this, null);
+ Display display = Screen.Display;
+ IntPtr xdisplay = gdk_x11_display_get_xdisplay (display.Handle);
+ selection_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_S" + Screen.Number.ToString (), false);
Added: non-group/banshee/tags/0.10.10-1/debian/patches/03_cvs-backports.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/03_cvs-backports.diff 2006-04-30 13:31:20 UTC (rev 2519)
+++ non-group/banshee/tags/0.10.10-1/debian/patches/03_cvs-backports.diff 2006-05-12 11:10:37 UTC (rev 2547)
@@ -0,0 +1,172 @@
+===================================================================
+RCS file: /cvs/gnome/banshee/src/Banshee.Plugins/NotificationAreaIcon/NotificationAreaIconPlugin.cs,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- src/Banshee.Plugins/NotificationAreaIcon/NotificationAreaIconPlugin.cs 2006/03/20 08:38:40 1.4
++++ src/Banshee.Plugins/NotificationAreaIcon/NotificationAreaIconPlugin.cs 2006/04/14 15:47:34 1.5
+@@ -101,6 +101,10 @@
+ Globals.ActionManager.UI.RemoveUi(ui_manager_id);
+ }
+
++ protected override void InterfaceInitialize() {
++ InterfaceElements.MainWindow.KeyPressEvent += OnKeyPressEvent;
++ }
++
+ private void Init() {
+ notif_area = new NotificationArea(Catalog.GetString("Banshee"));
+ notif_area.DestroyEvent += OnDestroyEvent;
+@@ -121,6 +125,20 @@
+ Init();
+ }
+
++ [GLib.ConnectBefore]
++ private void OnKeyPressEvent(object o, KeyPressEventArgs args)
++ {
++ bool handled = false;
++
++ if (args.Event.Key == Gdk.Key.w && (args.Event.State & Gdk.ModifierType.ControlMask) != 0) {
++ handled = true;
++ InterfaceElements.MainWindow.Visible = !InterfaceElements.MainWindow.Visible;
++ ResizeMoveWindow();
++ }
++
++ args.RetVal = handled;
++ }
++
+ private void OnNotificationAreaIconClick(object o, ButtonPressEventArgs args) {
+ switch(args.Event.Button) {
+ case 1:
+
+===================================================================
+RCS file: /cvs/gnome/banshee/src/PlaylistView.cs,v
+retrieving revision 1.46
+retrieving revision 1.47
+diff -u -r1.46 -r1.47
+--- src/PlaylistView.cs 2006/04/06 14:35:18 1.46
++++ src/PlaylistView.cs 2006/04/14 15:33:43 1.47
+@@ -408,9 +408,9 @@
+ TrackInfo ti = model.IterTrackInfo(iter);
+ if(ti == null) {
+ return;
+- }
+-
+- SetRendererAttributes((CellRendererText)cell, Convert.ToString(ti.TrackNumber), iter);
++ }
++ SetRendererAttributes((CellRendererText)cell,
++ ti.TrackNumber > 0 ? Convert.ToString(ti.TrackNumber) : String.Empty, iter);
+ }
+
+ protected void TrackCellArtist(TreeViewColumn tree_column,
+@@ -479,7 +479,7 @@
+ }
+
+ uint plays = ti.PlayCount;
+- SetRendererAttributes((CellRendererText)cell, plays > 0 ? Convert.ToString(plays) : "", iter);
++ SetRendererAttributes((CellRendererText)cell, plays > 0 ? Convert.ToString(plays) : String.Empty, iter);
+ }
+
+ protected void TrackCellRating(TreeViewColumn tree_column,
+
+===================================================================
+RCS file: /cvs/gnome/banshee/src/TrackProperties.cs,v
+retrieving revision 1.25
+retrieving revision 1.26
+diff -u -r1.25 -r1.26
+--- src/TrackProperties.cs 2006/03/17 04:44:41 1.25
++++ src/TrackProperties.cs 2006/04/09 15:53:39 1.26
+@@ -250,7 +250,7 @@
+ try {
+ Entagged.AudioFile af = new Entagged.AudioFile(track.Uri.LocalPath,
+ Banshee.Gstreamer.Utilities.DetectMimeType(track.Uri));
+- BitRate.Text = (af.Bitrate / 1024).ToString() + " " + Catalog.GetString("KB/Second");
++ BitRate.Text = af.Bitrate.ToString() + " " + Catalog.GetString("KB/Second");
+ SampleRate.Text = String.Format(Catalog.GetString("{0} KHz"), (double)af.SampleRate / 1000.0);
+ Vbr.Text = af.IsVbr ? Catalog.GetString("Yes") : Catalog.GetString("No");
+ Channels.Text = af.Channels.ToString();
+
+===================================================================
+RCS file: /cvs/gnome/banshee/entagged-sharp/Mpc/Util/MpcInfoReader.cs,v
+retrieving revision 1.8
+retrieving revision 1.9
+diff -u -r1.8 -r1.9
+--- entagged-sharp/Mpc/Util/MpcInfoReader.cs 2005/11/30 16:12:52 1.8
++++ entagged-sharp/Mpc/Util/MpcInfoReader.cs 2006/04/09 15:53:40 1.9
+@@ -76,7 +76,7 @@
+ info.SamplingRate = mpcH.SamplingRate;
+ info.EncodingType = mpcH.EncodingType;
+ info.ExtraEncodingInfos = mpcH.EncoderInfo;
+- info.Bitrate = ComputeBitrate( info.Duration.Seconds, raf.Length );
++ info.Bitrate = ComputeBitrate( (int)info.Duration.TotalSeconds, raf.Length );
+
+ return info;
+ }
+
+===================================================================
+RCS file: /cvs/gnome/banshee/src/Banshee.Base/SqlGenerator.cs,v
+retrieving revision 1.3
+diff -u -r1.3 SqlGenerator.cs
+--- src/Banshee.Base/SqlGenerator.cs 13 Feb 2006 22:18:08 -0000 1.3
++++ src/Banshee.Base/SqlGenerator.cs 14 Apr 2006 14:59:52 -0000
+@@ -103,7 +103,7 @@
+
+ public static string EscapeQuotes(string str)
+ {
+- return str == null ? String.Empty : Regex.Replace(str, "'", @"''");
++ return str == null ? String.Empty : str.Replace("'", "''");
+ }
+
+ public static Statement Empty
+
+===================================================================
+RCS file: /cvs/gnome/banshee/src/Banshee.Base/FileTrackInfo.cs,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- src/Banshee.Base/FileTrackInfo.cs 2006/04/09 21:30:23 1.4
++++ src/Banshee.Base/FileTrackInfo.cs 2006/05/07 17:00:45 1.5
+@@ -105,8 +105,8 @@
+ }
+
+ while(path != null && path != String.Empty) {
+- path = Path.GetDirectoryName(path);
+ fileName = Path.GetFileName (path);
++ path = Path.GetDirectoryName(path);
+ if(album == String.Empty) {
+ album = fileName;
+ continue;
+
+===================================================================
+RCS file: /cvs/gnome/banshee/src/Banshee.Widgets/HigMessageDialog.cs,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- src/Banshee.Widgets/HigMessageDialog.cs 2006/02/13 22:18:14 1.2
++++ src/Banshee.Widgets/HigMessageDialog.cs 2006/05/07 17:00:45 1.3
+@@ -159,7 +159,7 @@
+ DefaultResponse = response;
+ button.AddAccelerator ("activate",
+ accel_group,
+- (uint) Gdk.Key.Escape,
++ (uint) Gdk.Key.Return,
+ 0,
+ Gtk.AccelFlags.Visible);
+ }
+
+===================================================================
+RCS file: /cvs/gnome/banshee/src/Banshee.Base/LibraryTrackInfo.cs,v
+retrieving revision 1.10
+retrieving revision 1.11
+diff -u -r1.10 -r1.11
+--- src/Banshee.Base/LibraryTrackInfo.cs 2006/05/01 23:44:50 1.10
++++ src/Banshee.Base/LibraryTrackInfo.cs 2006/05/07 17:00:45 1.11
+@@ -86,7 +86,7 @@
+
+ private string MoveToPlace(string old_filename, bool initial_import)
+ {
+- bool in_library = old_filename.StartsWith (Globals.Library.Location);
++ bool in_library = old_filename.StartsWith (Globals.Library.Location + Path.DirectorySeparatorChar);
+ // Console.WriteLine ("\"{0}\" in \"{1}\": {2}", old_filename, Core.Library.Location, in_library);
+
+ if (initial_import && !in_library) {
+
Modified: non-group/banshee/tags/0.10.10-1/debian/rules
===================================================================
--- non-group/banshee/trunk/debian/rules 2006-04-30 13:31:20 UTC (rev 2519)
+++ non-group/banshee/tags/0.10.10-1/debian/rules 2006-05-12 11:10:37 UTC (rev 2547)
@@ -8,8 +8,9 @@
common-binary-post-install-arch:: list-missing
export MONO_SHARED_DIR=$(CURDIR)
-DEB_CONFIGURE_EXTRA_FLAGS=--disable-static --disable-helix --disable-vlc --disable-xing --disable-docs \
- --with-gstreamer-0-10 --enable-avahi
+DEB_CONFIGURE_EXTRA_FLAGS=--disable-static --disable-helix --disable-vlc \
+ --disable-xing --disable-docs --disable-njb \
+ --enable-gstreamer=0.10 --enable-avahi
install/banshee::
find debian/ -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" -or -name "*.config" | xargs chmod -x
@@ -19,10 +20,10 @@
find debian/ -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" -or -name "*.config" | xargs chmod -x
common-binary-predeb-arch::
- dh_clideps
+ dh_clideps -d
common-binary-predeb-indep::
- dh_clideps
+ dh_clideps -d
clean::
rm -rf $(MONO_SHARED_DIR)/.wapi
Modified: non-group/banshee/trunk/debian/changelog
===================================================================
--- non-group/banshee/trunk/debian/changelog 2006-05-10 19:21:04 UTC (rev 2546)
+++ non-group/banshee/trunk/debian/changelog 2006-05-12 11:10:37 UTC (rev 2547)
@@ -1,3 +1,30 @@
+banshee (0.10.10-1) unstable; urgency=low
+
+ * New upstream release (Closes: #358780)
+ * debian/patches/01_typefinding.diff:
+ + Updated
+ * debian/patches/02_notification-area-transparency.diff:
+ + Make the background of the notification area icon transparent
+ * debian/patches/03_cvs-backports.diff:
+ A bunch of backports from CVS:
+ - Make 'return' the default action key for dialogs
+ - Add Path.DirectorySeparatorChar to 'StartsWith' check
+ to determine if files should be copied, otherwise
+ 'Music to import' will be treated as 'Music'
+ - properly load files in shallow directories from command line
+ - ctrl+w hides banshee to the tray
+ - Show empty strings instead of 0 for TrackNumber == 0
+ - Don't show 0 KB/Sec for tracks
+ - Use String.Replace() instead of Regex.Replace() as this is much faster
+ * Update Standards-Version to 3.7.2
+ * Build-Depend on cli-common-dev (>= 0.4.0)
+ * Build-Depend on libipod-cil (>= 0.5.16)
+ * Build-Depend on mono-gmcs
+ * Disable building of the NJB plugin as it doesn't work at all for us
+ * Call dh_clideps with -d to prevent duplicated Depends
+
+ -- Sebastian Dröge <slomo at ubuntu.com> Fri, 12 May 2006 12:15:55 +0200
+
banshee (0.10.9-1) unstable; urgency=low
* New upstream release
Modified: non-group/banshee/trunk/debian/control
===================================================================
--- non-group/banshee/trunk/debian/control 2006-05-10 19:21:04 UTC (rev 2546)
+++ non-group/banshee/trunk/debian/control 2006-05-12 11:10:37 UTC (rev 2547)
@@ -2,8 +2,8 @@
Section: sound
Priority: optional
Maintainer: Sebastian Dröge <slomo at ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, cli-common (>= 0.2.0), mono-mcs (>= 1.1.10) | c-sharp-compiler, libmono-dev (>= 1.1.10), libgtk2.0-cil (>= 2.8.0), libglib2.0-cil (>= 2.8.0), libgnome2.0-cil (>= 2.8.0), libgconf2.0-cil (>= 2.8.0), libglade2.0-cil (>= 2.8.0), libipod-cil (>= 0.5.15), libnjb-cil (>= 0.2.1), libdbus-1-cil (>= 0.60), libsqlite3-dev (>= 3.2), libmono-sqlite1.0-cil, gstreamer0.10-plugins-base-apps, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-gnomevfs, libgstreamer0.10-dev (>= 0.10.3), libgstreamer-plugins-base0.10-dev (>= 0.10.3), libglib2.0-dev, libgnome2-dev, libgnomeui-dev, libgconf2-dev, gconf2, libgtk2.0-dev (>= 2.8), libgnomevfs2-dev, libgnome-desktop-dev, libdbus-1-dev (>= 0.60), libdbus-glib-1-dev (>= 0.60), libhal-dev (>= 0.5.2), libnautilus-burn-dev (>= 2.12.0), libmusicbrainz4-dev (>= 2.1.1), libavahi1.0-cil (>= 0.6), pkg-config, intltool
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 5), cdbs, cli-common-dev (>= 0.4.0), mono-mcs (>= 1.1.10) | c-sharp-compiler, libmono-dev (>= 1.1.10), libgtk2.0-cil (>= 2.8.0), libglib2.0-cil (>= 2.8.0), libgnome2.0-cil (>= 2.8.0), libgconf2.0-cil (>= 2.8.0), libglade2.0-cil (>= 2.8.0), libipod-cil (>= 0.5.16), libdbus-1-cil (>= 0.60), libsqlite3-dev (>= 3.2), libmono-sqlite1.0-cil, gstreamer0.10-plugins-base-apps, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-gnomevfs, libgstreamer0.10-dev (>= 0.10.3), libgstreamer-plugins-base0.10-dev (>= 0.10.3), libglib2.0-dev, libgnome2-dev, libgnomeui-dev, libgconf2-dev, gconf2, libgtk2.0-dev (>= 2.8), libgnomevfs2-dev, libgnome-desktop-dev, libdbus-1-dev (>= 0.60), libdbus-glib-1-dev (>= 0.60), libhal-dev (>= 0.5.2), libnautilus-burn-dev (>= 2.12.0), libmusicbrainz4-dev (>= 2.1.1), libavahi1.0-cil (>= 0.6), pkg-config, intltool, mono-gmcs
+Standards-Version: 3.7.2
Package: banshee
Architecture: any
Modified: non-group/banshee/trunk/debian/patches/01_typefinding.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/01_typefinding.diff 2006-05-10 19:21:04 UTC (rev 2546)
+++ non-group/banshee/trunk/debian/patches/01_typefinding.diff 2006-05-12 11:10:37 UTC (rev 2547)
@@ -1,71 +1,19 @@
-Index: libbanshee/gst-misc-0.10.c
-===================================================================
-RCS file: /cvs/gnome/banshee/libbanshee/gst-misc-0.10.c,v
-retrieving revision 1.5
-diff -u -r1.5 gst-misc-0.10.c
---- libbanshee/gst-misc-0.10.c 20 Mar 2006 09:30:47 -0000 1.5
-+++ libbanshee/gst-misc-0.10.c 20 Mar 2006 16:25:53 -0000
-@@ -75,35 +75,16 @@
- *type = gst_caps_to_string(caps);
- }
-
--static gboolean
--gst_typefind_bus_callback(GstBus *bus, GstMessage *message, gpointer data)
--{
-- gchar **out = data;
--
-- switch(GST_MESSAGE_TYPE(message)) {
-- case GST_MESSAGE_ERROR:
-- case GST_MESSAGE_EOS:
-- *out = (gchar *)-1;
-- break;
-- default:
-- break;
-- }
--
-- return TRUE;
--}
--
+--- libbanshee/gst-misc-0.10.c.old 2006-04-10 21:12:49.110465912 +0200
++++ libbanshee/gst-misc-0.10.c 2006-04-10 21:13:59.189812232 +0200
+@@ -78,8 +78,7 @@
gchar *
gstreamer_detect_mimetype(const gchar *uri)
{
+- return NULL;
- /*GstElement *pipeline;
+ GstElement *pipeline;
GstElement *source;
GstElement *typefind;
GstElement *fakesink;
- gchar *mimetype = NULL;
-
- pipeline = gst_pipeline_new("new");
-- gst_bus_add_watch(gst_pipeline_get_bus(GST_PIPELINE(pipeline)),
-- gst_typefind_bus_callback, &mimetype);
-
- source = gst_element_factory_make("gnomevfssrc", "source");
- typefind = gst_element_factory_make("typefind", "typefind");
-@@ -123,18 +104,17 @@
- gst_element_link(source, typefind);
- gst_element_link(typefind, fakesink);
-
-- gst_element_set_state(pipeline, GST_STATE_PLAYING);
-+ if(gst_element_set_state(pipeline, GST_STATE_PLAYING) == GST_STATE_CHANGE_ASYNC) {
-+ if (gst_element_get_state(pipeline, NULL, NULL, -1) == GST_STATE_CHANGE_FAILURE) {
-+ gst_object_unref(pipeline);
-+ return NULL;
-+ }
-+ }
-
-- while(mimetype == NULL);
-+ while((mimetype == NULL) && (pipeline->current_state == GST_STATE_PLAYING));
-
+@@ -116,5 +115,5 @@
gst_element_set_state(pipeline, GST_STATE_NULL);
gst_object_unref(pipeline);
-- if(mimetype == (gchar *)-1) {
-- mimetype = NULL;
-- }
--
- return mimetype;*/
--
-- return NULL;
+ return mimetype;
}
Added: non-group/banshee/trunk/debian/patches/02_notification-area-transparency.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/02_notification-area-transparency.diff 2006-05-10 19:21:04 UTC (rev 2546)
+++ non-group/banshee/trunk/debian/patches/02_notification-area-transparency.diff 2006-05-12 11:10:37 UTC (rev 2547)
@@ -0,0 +1,62 @@
+--- tmp/banshee-0.10.10/src/Banshee.Plugins/NotificationAreaIcon/NotificationArea.cs 2006-04-10 17:12:39.000000000 +0200
++++ banshee-0.10.10/src/Banshee.Plugins/NotificationAreaIcon/NotificationArea.cs 2006-05-09 09:21:34.412000000 +0200
+@@ -4,6 +4,7 @@
+ * Copyright (C) 2005 Todd Berman <tberman at off.net>
+ * Copyright (C) 2005 Ed Catmur <ed at catmur.co.uk>
+ * Copyright (C) 2005 Novell, Inc. (Miguel de Icaza, Aaron Bockover)
++ * Copyright (C) 2006 Sebastian Dröge <slomo at ubuntu.com>
+ ****************************************************************************/
+
+ /* THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW:
+@@ -63,6 +64,43 @@
+ Screen = screen;
+ Init ();
+ }
++
++ public new void Add (Widget widget)
++ {
++ widget.Realized += make_transparent;
++ base.Add (widget);
++ }
++
++ [GLib.ConnectBefore]
++ private void make_transparent (object o, EventArgs args)
++ {
++ try {
++ Gtk.Widget widget = (Gtk.Widget) o;
++ widget.AppPaintable = true;
++ widget.DoubleBuffered = false;
++ widget.GdkWindow.SetBackPixmap (null, true);
++ widget.ExposeEvent += transparent_expose_event;
++ widget.StyleSet += make_transparent_again;
++ } catch (System.InvalidCastException e) {}
++ }
++
++ [GLib.ConnectBefore]
++ private void transparent_expose_event (object o, ExposeEventArgs args)
++ {
++ try {
++ Gtk.Widget widget = (Gtk.Widget) o;
++ Gdk.Rectangle rec = args.Event.Area;
++ widget.GdkWindow.ClearArea (rec.X, rec.Y, rec.Width, rec.Height);
++ } catch (System.InvalidCastException e) {}
++ }
++
++ private void make_transparent_again (object o, StyleSetArgs args)
++ {
++ try {
++ Gtk.Widget widget = (Gtk.Widget) o;
++ widget.GdkWindow.SetBackPixmap (null, true);
++ } catch (System.InvalidCastException e) {}
++ }
+
+ [DllImport ("libc")]
+ private static extern IntPtr memcpy (ref XClientMessageEvent.DataUnion dest, IntPtr src, IntPtr len);
+@@ -123,6 +161,7 @@
+ protected override void OnRealized ()
+ {
+ base.OnRealized ();
++ make_transparent (this, null);
+ Display display = Screen.Display;
+ IntPtr xdisplay = gdk_x11_display_get_xdisplay (display.Handle);
+ selection_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_S" + Screen.Number.ToString (), false);
Added: non-group/banshee/trunk/debian/patches/03_cvs-backports.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/03_cvs-backports.diff 2006-05-10 19:21:04 UTC (rev 2546)
+++ non-group/banshee/trunk/debian/patches/03_cvs-backports.diff 2006-05-12 11:10:37 UTC (rev 2547)
@@ -0,0 +1,172 @@
+===================================================================
+RCS file: /cvs/gnome/banshee/src/Banshee.Plugins/NotificationAreaIcon/NotificationAreaIconPlugin.cs,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- src/Banshee.Plugins/NotificationAreaIcon/NotificationAreaIconPlugin.cs 2006/03/20 08:38:40 1.4
++++ src/Banshee.Plugins/NotificationAreaIcon/NotificationAreaIconPlugin.cs 2006/04/14 15:47:34 1.5
+@@ -101,6 +101,10 @@
+ Globals.ActionManager.UI.RemoveUi(ui_manager_id);
+ }
+
++ protected override void InterfaceInitialize() {
++ InterfaceElements.MainWindow.KeyPressEvent += OnKeyPressEvent;
++ }
++
+ private void Init() {
+ notif_area = new NotificationArea(Catalog.GetString("Banshee"));
+ notif_area.DestroyEvent += OnDestroyEvent;
+@@ -121,6 +125,20 @@
+ Init();
+ }
+
++ [GLib.ConnectBefore]
++ private void OnKeyPressEvent(object o, KeyPressEventArgs args)
++ {
++ bool handled = false;
++
++ if (args.Event.Key == Gdk.Key.w && (args.Event.State & Gdk.ModifierType.ControlMask) != 0) {
++ handled = true;
++ InterfaceElements.MainWindow.Visible = !InterfaceElements.MainWindow.Visible;
++ ResizeMoveWindow();
++ }
++
++ args.RetVal = handled;
++ }
++
+ private void OnNotificationAreaIconClick(object o, ButtonPressEventArgs args) {
+ switch(args.Event.Button) {
+ case 1:
+
+===================================================================
+RCS file: /cvs/gnome/banshee/src/PlaylistView.cs,v
+retrieving revision 1.46
+retrieving revision 1.47
+diff -u -r1.46 -r1.47
+--- src/PlaylistView.cs 2006/04/06 14:35:18 1.46
++++ src/PlaylistView.cs 2006/04/14 15:33:43 1.47
+@@ -408,9 +408,9 @@
+ TrackInfo ti = model.IterTrackInfo(iter);
+ if(ti == null) {
+ return;
+- }
+-
+- SetRendererAttributes((CellRendererText)cell, Convert.ToString(ti.TrackNumber), iter);
++ }
++ SetRendererAttributes((CellRendererText)cell,
++ ti.TrackNumber > 0 ? Convert.ToString(ti.TrackNumber) : String.Empty, iter);
+ }
+
+ protected void TrackCellArtist(TreeViewColumn tree_column,
+@@ -479,7 +479,7 @@
+ }
+
+ uint plays = ti.PlayCount;
+- SetRendererAttributes((CellRendererText)cell, plays > 0 ? Convert.ToString(plays) : "", iter);
++ SetRendererAttributes((CellRendererText)cell, plays > 0 ? Convert.ToString(plays) : String.Empty, iter);
+ }
+
+ protected void TrackCellRating(TreeViewColumn tree_column,
+
+===================================================================
+RCS file: /cvs/gnome/banshee/src/TrackProperties.cs,v
+retrieving revision 1.25
+retrieving revision 1.26
+diff -u -r1.25 -r1.26
+--- src/TrackProperties.cs 2006/03/17 04:44:41 1.25
++++ src/TrackProperties.cs 2006/04/09 15:53:39 1.26
+@@ -250,7 +250,7 @@
+ try {
+ Entagged.AudioFile af = new Entagged.AudioFile(track.Uri.LocalPath,
+ Banshee.Gstreamer.Utilities.DetectMimeType(track.Uri));
+- BitRate.Text = (af.Bitrate / 1024).ToString() + " " + Catalog.GetString("KB/Second");
++ BitRate.Text = af.Bitrate.ToString() + " " + Catalog.GetString("KB/Second");
+ SampleRate.Text = String.Format(Catalog.GetString("{0} KHz"), (double)af.SampleRate / 1000.0);
+ Vbr.Text = af.IsVbr ? Catalog.GetString("Yes") : Catalog.GetString("No");
+ Channels.Text = af.Channels.ToString();
+
+===================================================================
+RCS file: /cvs/gnome/banshee/entagged-sharp/Mpc/Util/MpcInfoReader.cs,v
+retrieving revision 1.8
+retrieving revision 1.9
+diff -u -r1.8 -r1.9
+--- entagged-sharp/Mpc/Util/MpcInfoReader.cs 2005/11/30 16:12:52 1.8
++++ entagged-sharp/Mpc/Util/MpcInfoReader.cs 2006/04/09 15:53:40 1.9
+@@ -76,7 +76,7 @@
+ info.SamplingRate = mpcH.SamplingRate;
+ info.EncodingType = mpcH.EncodingType;
+ info.ExtraEncodingInfos = mpcH.EncoderInfo;
+- info.Bitrate = ComputeBitrate( info.Duration.Seconds, raf.Length );
++ info.Bitrate = ComputeBitrate( (int)info.Duration.TotalSeconds, raf.Length );
+
+ return info;
+ }
+
+===================================================================
+RCS file: /cvs/gnome/banshee/src/Banshee.Base/SqlGenerator.cs,v
+retrieving revision 1.3
+diff -u -r1.3 SqlGenerator.cs
+--- src/Banshee.Base/SqlGenerator.cs 13 Feb 2006 22:18:08 -0000 1.3
++++ src/Banshee.Base/SqlGenerator.cs 14 Apr 2006 14:59:52 -0000
+@@ -103,7 +103,7 @@
+
+ public static string EscapeQuotes(string str)
+ {
+- return str == null ? String.Empty : Regex.Replace(str, "'", @"''");
++ return str == null ? String.Empty : str.Replace("'", "''");
+ }
+
+ public static Statement Empty
+
+===================================================================
+RCS file: /cvs/gnome/banshee/src/Banshee.Base/FileTrackInfo.cs,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- src/Banshee.Base/FileTrackInfo.cs 2006/04/09 21:30:23 1.4
++++ src/Banshee.Base/FileTrackInfo.cs 2006/05/07 17:00:45 1.5
+@@ -105,8 +105,8 @@
+ }
+
+ while(path != null && path != String.Empty) {
+- path = Path.GetDirectoryName(path);
+ fileName = Path.GetFileName (path);
++ path = Path.GetDirectoryName(path);
+ if(album == String.Empty) {
+ album = fileName;
+ continue;
+
+===================================================================
+RCS file: /cvs/gnome/banshee/src/Banshee.Widgets/HigMessageDialog.cs,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- src/Banshee.Widgets/HigMessageDialog.cs 2006/02/13 22:18:14 1.2
++++ src/Banshee.Widgets/HigMessageDialog.cs 2006/05/07 17:00:45 1.3
+@@ -159,7 +159,7 @@
+ DefaultResponse = response;
+ button.AddAccelerator ("activate",
+ accel_group,
+- (uint) Gdk.Key.Escape,
++ (uint) Gdk.Key.Return,
+ 0,
+ Gtk.AccelFlags.Visible);
+ }
+
+===================================================================
+RCS file: /cvs/gnome/banshee/src/Banshee.Base/LibraryTrackInfo.cs,v
+retrieving revision 1.10
+retrieving revision 1.11
+diff -u -r1.10 -r1.11
+--- src/Banshee.Base/LibraryTrackInfo.cs 2006/05/01 23:44:50 1.10
++++ src/Banshee.Base/LibraryTrackInfo.cs 2006/05/07 17:00:45 1.11
+@@ -86,7 +86,7 @@
+
+ private string MoveToPlace(string old_filename, bool initial_import)
+ {
+- bool in_library = old_filename.StartsWith (Globals.Library.Location);
++ bool in_library = old_filename.StartsWith (Globals.Library.Location + Path.DirectorySeparatorChar);
+ // Console.WriteLine ("\"{0}\" in \"{1}\": {2}", old_filename, Core.Library.Location, in_library);
+
+ if (initial_import && !in_library) {
+
Modified: non-group/banshee/trunk/debian/rules
===================================================================
--- non-group/banshee/trunk/debian/rules 2006-05-10 19:21:04 UTC (rev 2546)
+++ non-group/banshee/trunk/debian/rules 2006-05-12 11:10:37 UTC (rev 2547)
@@ -8,8 +8,9 @@
common-binary-post-install-arch:: list-missing
export MONO_SHARED_DIR=$(CURDIR)
-DEB_CONFIGURE_EXTRA_FLAGS=--disable-static --disable-helix --disable-vlc --disable-xing --disable-docs \
- --with-gstreamer-0-10 --enable-avahi
+DEB_CONFIGURE_EXTRA_FLAGS=--disable-static --disable-helix --disable-vlc \
+ --disable-xing --disable-docs --disable-njb \
+ --enable-gstreamer=0.10 --enable-avahi
install/banshee::
find debian/ -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" -or -name "*.config" | xargs chmod -x
@@ -19,10 +20,10 @@
find debian/ -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" -or -name "*.config" | xargs chmod -x
common-binary-predeb-arch::
- dh_clideps
+ dh_clideps -d
common-binary-predeb-indep::
- dh_clideps
+ dh_clideps -d
clean::
rm -rf $(MONO_SHARED_DIR)/.wapi
More information about the Pkg-mono-svn-commits
mailing list