[Pkg-mono-svn-commits] rev 2348 - in non-group/banshee: tags tags/0.10.9-1/debian tags/0.10.9-1/debian/patches trunk/debian trunk/debian/patches

Sebastian Dröge slomo-guest at costa.debian.org
Mon Mar 20 17:58:10 UTC 2006


Author: slomo-guest
Date: 2006-03-20 17:58:09 +0000 (Mon, 20 Mar 2006)
New Revision: 2348

Added:
   non-group/banshee/tags/0.10.9-1/
   non-group/banshee/tags/0.10.9-1/debian/patches/01_typefinding.diff
   non-group/banshee/trunk/debian/patches/01_typefinding.diff
Removed:
   non-group/banshee/tags/0.10.9-1/debian/README.Debian
   non-group/banshee/tags/0.10.9-1/debian/patches/01_notification-area-icon-plugin-schema.diff
   non-group/banshee/trunk/debian/README.Debian
   non-group/banshee/trunk/debian/patches/01_notification-area-icon-plugin-schema.diff
Modified:
   non-group/banshee/tags/0.10.9-1/debian/changelog
   non-group/banshee/tags/0.10.9-1/debian/control
   non-group/banshee/tags/0.10.9-1/debian/copyright
   non-group/banshee/trunk/debian/changelog
   non-group/banshee/trunk/debian/control
   non-group/banshee/trunk/debian/copyright
Log:
* updated and tagged banshee to 0.10.9-1


Copied: non-group/banshee/tags/0.10.9-1 (from rev 2340, non-group/banshee/trunk)

Deleted: non-group/banshee/tags/0.10.9-1/debian/README.Debian
===================================================================
--- non-group/banshee/trunk/debian/README.Debian	2006-03-19 19:03:46 UTC (rev 2340)
+++ non-group/banshee/tags/0.10.9-1/debian/README.Debian	2006-03-20 17:58:09 UTC (rev 2348)
@@ -1,8 +0,0 @@
-banshee for Debian
----------------------
-
-* I removed libbanshee/xing/*.{c,h,cpp} from the tarball as these contain the
-  sources of the XING MP3 encoder.
-  
- -- Sebastian Dröge <slomo at ubuntu.com>, Mon, 13 Mar 2006 15:02:21 +0100
-

Modified: non-group/banshee/tags/0.10.9-1/debian/changelog
===================================================================
--- non-group/banshee/trunk/debian/changelog	2006-03-19 19:03:46 UTC (rev 2340)
+++ non-group/banshee/tags/0.10.9-1/debian/changelog	2006-03-20 17:58:09 UTC (rev 2348)
@@ -1,3 +1,30 @@
+banshee (0.10.9-1) unstable; urgency=low
+
+  * New upstream release
+    + Xing MP3 encoder removed upstream, thus we use an unmodified tarball now
+  * Add avahi-daemon to the Depends of banshee-daap
+  * Add gstreamer0.10-gnomevfs to the Depends of banshee
+  * Removed libsqlite3-0 and libmono0 from banshee's Depends as those are
+    finally added where they belong to (libmono-sqlite1.0-cil and mono-jit)
+  * Change Build-Depends:
+    + libavahi-cil -> libavahi1.0-cil: library transition to conform with the
+      latest version of the CLI policy
+    + libdbus* (>= 0.61-3) -> libdbus* (>= 0.60): the broken 0.61-{1,2}
+      disappeared from the pool and only >= 0.60 is required.
+    + Added libmono-sqlite1.0-cil: was in mono-classlib-1.0 before
+    + Added gstreamer0.10-plugins-base-apps, gstreamer0.10-plugins-base, 
+      gstreamer0.10-gnomevfs, gstreamer0.10-plugins-good
+    + *gstreamer* (>= 0.9.7) -> *gstreamer* (>= 0.10.3): Tighten Build-Depends
+      as required by configure
+  * Updated debian/copyright
+  * 01_notification-area-icon-plugin-schema.diff:
+    + Dropped, applied upstream
+  * 01_typefinding.diff:
+    + Re-enable typefinding with gst0.10 and fix the bug that was the cause
+      for it beeing disabled.
+
+ -- Sebastian Dröge <slomo at ubuntu.com>  Mon, 20 Mar 2006 17:42:17 +0100
+
 banshee (0.10.8+dfsg-1) unstable; urgency=low
 
   * New upstream release

Modified: non-group/banshee/tags/0.10.9-1/debian/control
===================================================================
--- non-group/banshee/trunk/debian/control	2006-03-19 19:03:46 UTC (rev 2340)
+++ non-group/banshee/tags/0.10.9-1/debian/control	2006-03-20 17:58:09 UTC (rev 2348)
@@ -2,12 +2,12 @@
 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.61-3), libsqlite3-dev (>= 3.2), libgstreamer0.10-dev (>= 0.9.7), libgstreamer-plugins-base0.10-dev (>= 0.9.7), libglib2.0-dev, libgnome2-dev, libgnomeui-dev, libgconf2-dev, gconf2, libgtk2.0-dev (>= 2.8), libgnomevfs2-dev, libgnome-desktop-dev, libdbus-1-dev (>= 0.61-3), libdbus-glib-1-dev (>= 0.61-3), libhal-dev (>= 0.5.2), libnautilus-burn-dev (>= 2.12.0), libmusicbrainz4-dev (>= 2.1.1), libavahi-cil (>= 0.6), pkg-config, intltool
+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
 
 Package: banshee
 Architecture: any
-Depends: ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}, libsqlite3-0 (>= 3.2), libmono0, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-plugins-ugly
+Depends: ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-plugins-ugly, gstreamer0.10-gnomevfs
 Suggests: banshee-daap
 Description: Audio Management and Playback application
  Banshee is an audio management and playback application for the GNOME
@@ -19,7 +19,7 @@
 
 Package: banshee-daap
 Architecture: all
-Depends: ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}, banshee (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}, banshee (= ${Source-Version}), avahi-daemon
 Replaces: banshee (<< 0.10.5)
 Description: Audio Management and Playback application (DAAP sharing plugin)
  Banshee is an audio management and playback application for the GNOME

Modified: non-group/banshee/tags/0.10.9-1/debian/copyright
===================================================================
--- non-group/banshee/trunk/debian/copyright	2006-03-19 19:03:46 UTC (rev 2340)
+++ non-group/banshee/tags/0.10.9-1/debian/copyright	2006-03-20 17:58:09 UTC (rev 2348)
@@ -6,23 +6,66 @@
 Upstream Authors: Aaron Bockover <aaron at aaronbock.net>
 
 Copyright:
-  Copyright (C) 2005 Novell (for everything not noted below)
-  Copyright 2005 Raphaël Slinckx <raphael at slinckx.net> (for entagged-sharp/*)
-  Copyright 2005 Boris Peterbarg <boris-p at zahav.net.il>
-        (for entagged-sharp/Tracker/Util/TrackerTagReader.cs)
+
+  For everything not explicitily noted below:
+  Copyright (C) 2005-2006 Novell
+
+  For po/ca.po:
+  Copyright (C) 2005-2006 Jordi Mas i Hernàndez, jmas at softcatala.org
+
+  For po/en_CA.po:
+  Copyright (C) 2005-2006 Adam Weinberger and the GNOME Foundation
+
+  For po/en_GB.po:
+  Copyright (C) 2006 The GNOME Foundation
+
+  For po/it.po:
+  Copyright (C) 2006 Alessandro Gervaso
+
+  For po/nb.po:
+  Copyright (C) 2005 Øivind Hoel and the GNOME Foundation
+
+  For src/Banshee.Dap/MassStorage/*:
+  Copyright (C) 2006 Novell and Gabriel Burt
+  
+  For src/Banshee.MediaEngine/Vlc/Vlc.cs:
+  Copyright (C) 2005 Jon Lech Johansen <jon at nanocrew.net>
+  
+  For src/Banshee.Plugins/Daap/daap-sharp/*:
+  Copyright (C) 2005  James Willcox <snorp at snorp.net>
+
+  For src/Banshee.Plugins/Daap/daap-sharp/Hasher.cs:
+  Copyright (C) 2005  James Willcox <snorp at snorp.net>
+  Copyright (C) 2004 David Hammerton <david at crazney.net>
+  Copyright (C) 2005 Jon Lech Johansen <jon at nanocrew.net>
+
+  For src/Banshee.Plugins/NotificationAreaIcon/NotificationArea.cs:
+  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)
+
+  For src/Banshee.Plugins/NotificationAreaIcon/NotificationAreaIconPlugin.cs:
+  Copyright (C) 2005-2006 Novell, Inc. (Aaron Bockover)
+  Copyright (C) 2006 Sebastian Dröge <slomo at ubuntu.com>
+
+  For entagged-sharp/*:
+  Copyright 2005 Raphaël Slinckx <raphael at slinckx.net>
+  
+  For entagged-sharp/Asf/*:
   Copyright 2005 Christian Laireiter <liree at web.de>
-        (for entagged-sharp/Asf/Util/AsfTagReader.cs)
-  Copyright (C) 2005 John McCutchan
-        (for libbanshee/inotify.h)
+  Copyright 2005 Novell, Inc
+
+  For entagged-sharp/Tracker/Util/TrackerTagReader.cs:
   Copyright 2005 Daniel Drake <dsd at gentoo.org>
-	(for entagged-sharp/Tracker/Util/TrackerTagReader.cs
-	 and entagged-sharp/Tracker/TrackerFileReader.cs)
-  Copyright (C) 2004 Tamara Roberson (for src/SignalUtils.cs)
-  Copyright (C) 2005 Todd Berman <tberman at off.net>, Ed Catmur <ed at catmur.co.uk>
-        (for src/Banshee.Widgets/NotificationAreaIcon.cs)
-  Copyright (C) 2005 Jon Lech Johansen (jon at nanocrew.net)
-        (for src/Banshee.MediaEngine/Vlc/Vlc.cs)
+  Copyright 2005 Boris Peterbarg <boris-p at zahav.net.il>
+  
+  For entagged-sharp/Tracker/TrackerFileReader.cs:
+  Copyright 2005 Daniel Drake <dsd at gentoo.org>
 
+  For libbanshee/inotify.h:
+  Copyright (C) 2005 John McCutchan
+
+
   Permission is hereby granted, free of charge, to any person obtaining a
   copy of this software and associated documentation files (the "Software"),
   to deal in the Software without restriction, including without limitation

Deleted: non-group/banshee/tags/0.10.9-1/debian/patches/01_notification-area-icon-plugin-schema.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/01_notification-area-icon-plugin-schema.diff	2006-03-19 19:03:46 UTC (rev 2340)
+++ non-group/banshee/tags/0.10.9-1/debian/patches/01_notification-area-icon-plugin-schema.diff	2006-03-20 17:58:09 UTC (rev 2348)
@@ -1,19 +0,0 @@
---- src/Banshee.Plugins/NotificationAreaIcon/banshee-notificationareaicon.schemas.in.old	2006-03-13 14:47:44.710352808 +0100
-+++ src/Banshee.Plugins/NotificationAreaIcon/banshee-notificationareaicon.schemas.in	2006-03-13 14:48:11.695250480 +0100
-@@ -2,13 +2,13 @@
- <gconfschemafile>
-   <schemalist>
-     <schema>
--      <key>/schemas/apps/Banshee/TrayIcon/Enabled</key>
--      <applyto>/apps/Banshee/TrayIcon/Enabled</applyto>
-+      <key>/schemas/apps/Banshee/NotificationAreaIcon/Enabled</key>
-+      <applyto>/apps/Banshee/NotificationAreaIcon/Enabled</applyto>
-       <owner>banshee</owner>
-       <type>bool</type>
-       <default>true</default>
-       <locale name="C">
--        <short>Enable the Tray Icon plugin</short>
-+        <short>Enable the Notification Area Icon plugin</short>
-         <long></long>
-       </locale>
-     </schema>

Added: non-group/banshee/tags/0.10.9-1/debian/patches/01_typefinding.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/01_typefinding.diff	2006-03-19 19:03:46 UTC (rev 2340)
+++ non-group/banshee/tags/0.10.9-1/debian/patches/01_typefinding.diff	2006-03-20 17:58:09 UTC (rev 2348)
@@ -0,0 +1,71 @@
+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;
+-}
+-
+ gchar *
+ gstreamer_detect_mimetype(const gchar *uri)
+ {
+-    /*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));
+     
+     gst_element_set_state(pipeline, GST_STATE_NULL);
+     gst_object_unref(pipeline);
+         
+-    if(mimetype == (gchar *)-1) {
+-        mimetype = NULL;
+-    }
+-
+-    return mimetype;*/
+-    
+-    return NULL;
++    return mimetype;
+ }

Deleted: non-group/banshee/trunk/debian/README.Debian
===================================================================
--- non-group/banshee/trunk/debian/README.Debian	2006-03-19 22:46:37 UTC (rev 2347)
+++ non-group/banshee/trunk/debian/README.Debian	2006-03-20 17:58:09 UTC (rev 2348)
@@ -1,8 +0,0 @@
-banshee for Debian
----------------------
-
-* I removed libbanshee/xing/*.{c,h,cpp} from the tarball as these contain the
-  sources of the XING MP3 encoder.
-  
- -- Sebastian Dröge <slomo at ubuntu.com>, Mon, 13 Mar 2006 15:02:21 +0100
-

Modified: non-group/banshee/trunk/debian/changelog
===================================================================
--- non-group/banshee/trunk/debian/changelog	2006-03-19 22:46:37 UTC (rev 2347)
+++ non-group/banshee/trunk/debian/changelog	2006-03-20 17:58:09 UTC (rev 2348)
@@ -1,3 +1,30 @@
+banshee (0.10.9-1) unstable; urgency=low
+
+  * New upstream release
+    + Xing MP3 encoder removed upstream, thus we use an unmodified tarball now
+  * Add avahi-daemon to the Depends of banshee-daap
+  * Add gstreamer0.10-gnomevfs to the Depends of banshee
+  * Removed libsqlite3-0 and libmono0 from banshee's Depends as those are
+    finally added where they belong to (libmono-sqlite1.0-cil and mono-jit)
+  * Change Build-Depends:
+    + libavahi-cil -> libavahi1.0-cil: library transition to conform with the
+      latest version of the CLI policy
+    + libdbus* (>= 0.61-3) -> libdbus* (>= 0.60): the broken 0.61-{1,2}
+      disappeared from the pool and only >= 0.60 is required.
+    + Added libmono-sqlite1.0-cil: was in mono-classlib-1.0 before
+    + Added gstreamer0.10-plugins-base-apps, gstreamer0.10-plugins-base, 
+      gstreamer0.10-gnomevfs, gstreamer0.10-plugins-good
+    + *gstreamer* (>= 0.9.7) -> *gstreamer* (>= 0.10.3): Tighten Build-Depends
+      as required by configure
+  * Updated debian/copyright
+  * 01_notification-area-icon-plugin-schema.diff:
+    + Dropped, applied upstream
+  * 01_typefinding.diff:
+    + Re-enable typefinding with gst0.10 and fix the bug that was the cause
+      for it beeing disabled.
+
+ -- Sebastian Dröge <slomo at ubuntu.com>  Mon, 20 Mar 2006 17:42:17 +0100
+
 banshee (0.10.8+dfsg-1) unstable; urgency=low
 
   * New upstream release

Modified: non-group/banshee/trunk/debian/control
===================================================================
--- non-group/banshee/trunk/debian/control	2006-03-19 22:46:37 UTC (rev 2347)
+++ non-group/banshee/trunk/debian/control	2006-03-20 17:58:09 UTC (rev 2348)
@@ -2,12 +2,12 @@
 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.61-3), libsqlite3-dev (>= 3.2), libgstreamer0.10-dev (>= 0.9.7), libgstreamer-plugins-base0.10-dev (>= 0.9.7), libglib2.0-dev, libgnome2-dev, libgnomeui-dev, libgconf2-dev, gconf2, libgtk2.0-dev (>= 2.8), libgnomevfs2-dev, libgnome-desktop-dev, libdbus-1-dev (>= 0.61-3), libdbus-glib-1-dev (>= 0.61-3), libhal-dev (>= 0.5.2), libnautilus-burn-dev (>= 2.12.0), libmusicbrainz4-dev (>= 2.1.1), libavahi-cil (>= 0.6), pkg-config, intltool
+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
 
 Package: banshee
 Architecture: any
-Depends: ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}, libsqlite3-0 (>= 3.2), libmono0, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-plugins-ugly
+Depends: ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-plugins-ugly, gstreamer0.10-gnomevfs
 Suggests: banshee-daap
 Description: Audio Management and Playback application
  Banshee is an audio management and playback application for the GNOME
@@ -19,7 +19,7 @@
 
 Package: banshee-daap
 Architecture: all
-Depends: ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}, banshee (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}, banshee (= ${Source-Version}), avahi-daemon
 Replaces: banshee (<< 0.10.5)
 Description: Audio Management and Playback application (DAAP sharing plugin)
  Banshee is an audio management and playback application for the GNOME

Modified: non-group/banshee/trunk/debian/copyright
===================================================================
--- non-group/banshee/trunk/debian/copyright	2006-03-19 22:46:37 UTC (rev 2347)
+++ non-group/banshee/trunk/debian/copyright	2006-03-20 17:58:09 UTC (rev 2348)
@@ -6,23 +6,66 @@
 Upstream Authors: Aaron Bockover <aaron at aaronbock.net>
 
 Copyright:
-  Copyright (C) 2005 Novell (for everything not noted below)
-  Copyright 2005 Raphaël Slinckx <raphael at slinckx.net> (for entagged-sharp/*)
-  Copyright 2005 Boris Peterbarg <boris-p at zahav.net.il>
-        (for entagged-sharp/Tracker/Util/TrackerTagReader.cs)
+
+  For everything not explicitily noted below:
+  Copyright (C) 2005-2006 Novell
+
+  For po/ca.po:
+  Copyright (C) 2005-2006 Jordi Mas i Hernàndez, jmas at softcatala.org
+
+  For po/en_CA.po:
+  Copyright (C) 2005-2006 Adam Weinberger and the GNOME Foundation
+
+  For po/en_GB.po:
+  Copyright (C) 2006 The GNOME Foundation
+
+  For po/it.po:
+  Copyright (C) 2006 Alessandro Gervaso
+
+  For po/nb.po:
+  Copyright (C) 2005 Øivind Hoel and the GNOME Foundation
+
+  For src/Banshee.Dap/MassStorage/*:
+  Copyright (C) 2006 Novell and Gabriel Burt
+  
+  For src/Banshee.MediaEngine/Vlc/Vlc.cs:
+  Copyright (C) 2005 Jon Lech Johansen <jon at nanocrew.net>
+  
+  For src/Banshee.Plugins/Daap/daap-sharp/*:
+  Copyright (C) 2005  James Willcox <snorp at snorp.net>
+
+  For src/Banshee.Plugins/Daap/daap-sharp/Hasher.cs:
+  Copyright (C) 2005  James Willcox <snorp at snorp.net>
+  Copyright (C) 2004 David Hammerton <david at crazney.net>
+  Copyright (C) 2005 Jon Lech Johansen <jon at nanocrew.net>
+
+  For src/Banshee.Plugins/NotificationAreaIcon/NotificationArea.cs:
+  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)
+
+  For src/Banshee.Plugins/NotificationAreaIcon/NotificationAreaIconPlugin.cs:
+  Copyright (C) 2005-2006 Novell, Inc. (Aaron Bockover)
+  Copyright (C) 2006 Sebastian Dröge <slomo at ubuntu.com>
+
+  For entagged-sharp/*:
+  Copyright 2005 Raphaël Slinckx <raphael at slinckx.net>
+  
+  For entagged-sharp/Asf/*:
   Copyright 2005 Christian Laireiter <liree at web.de>
-        (for entagged-sharp/Asf/Util/AsfTagReader.cs)
-  Copyright (C) 2005 John McCutchan
-        (for libbanshee/inotify.h)
+  Copyright 2005 Novell, Inc
+
+  For entagged-sharp/Tracker/Util/TrackerTagReader.cs:
   Copyright 2005 Daniel Drake <dsd at gentoo.org>
-	(for entagged-sharp/Tracker/Util/TrackerTagReader.cs
-	 and entagged-sharp/Tracker/TrackerFileReader.cs)
-  Copyright (C) 2004 Tamara Roberson (for src/SignalUtils.cs)
-  Copyright (C) 2005 Todd Berman <tberman at off.net>, Ed Catmur <ed at catmur.co.uk>
-        (for src/Banshee.Widgets/NotificationAreaIcon.cs)
-  Copyright (C) 2005 Jon Lech Johansen (jon at nanocrew.net)
-        (for src/Banshee.MediaEngine/Vlc/Vlc.cs)
+  Copyright 2005 Boris Peterbarg <boris-p at zahav.net.il>
+  
+  For entagged-sharp/Tracker/TrackerFileReader.cs:
+  Copyright 2005 Daniel Drake <dsd at gentoo.org>
 
+  For libbanshee/inotify.h:
+  Copyright (C) 2005 John McCutchan
+
+
   Permission is hereby granted, free of charge, to any person obtaining a
   copy of this software and associated documentation files (the "Software"),
   to deal in the Software without restriction, including without limitation

Deleted: non-group/banshee/trunk/debian/patches/01_notification-area-icon-plugin-schema.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/01_notification-area-icon-plugin-schema.diff	2006-03-19 22:46:37 UTC (rev 2347)
+++ non-group/banshee/trunk/debian/patches/01_notification-area-icon-plugin-schema.diff	2006-03-20 17:58:09 UTC (rev 2348)
@@ -1,19 +0,0 @@
---- src/Banshee.Plugins/NotificationAreaIcon/banshee-notificationareaicon.schemas.in.old	2006-03-13 14:47:44.710352808 +0100
-+++ src/Banshee.Plugins/NotificationAreaIcon/banshee-notificationareaicon.schemas.in	2006-03-13 14:48:11.695250480 +0100
-@@ -2,13 +2,13 @@
- <gconfschemafile>
-   <schemalist>
-     <schema>
--      <key>/schemas/apps/Banshee/TrayIcon/Enabled</key>
--      <applyto>/apps/Banshee/TrayIcon/Enabled</applyto>
-+      <key>/schemas/apps/Banshee/NotificationAreaIcon/Enabled</key>
-+      <applyto>/apps/Banshee/NotificationAreaIcon/Enabled</applyto>
-       <owner>banshee</owner>
-       <type>bool</type>
-       <default>true</default>
-       <locale name="C">
--        <short>Enable the Tray Icon plugin</short>
-+        <short>Enable the Notification Area Icon plugin</short>
-         <long></long>
-       </locale>
-     </schema>

Added: non-group/banshee/trunk/debian/patches/01_typefinding.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/01_typefinding.diff	2006-03-19 22:46:37 UTC (rev 2347)
+++ non-group/banshee/trunk/debian/patches/01_typefinding.diff	2006-03-20 17:58:09 UTC (rev 2348)
@@ -0,0 +1,71 @@
+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;
+-}
+-
+ gchar *
+ gstreamer_detect_mimetype(const gchar *uri)
+ {
+-    /*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));
+     
+     gst_element_set_state(pipeline, GST_STATE_NULL);
+     gst_object_unref(pipeline);
+         
+-    if(mimetype == (gchar *)-1) {
+-        mimetype = NULL;
+-    }
+-
+-    return mimetype;*/
+-    
+-    return NULL;
++    return mimetype;
+ }




More information about the Pkg-mono-svn-commits mailing list