[Pkg-mono-svn-commits] rev 1849 - in non-group/muine/tags: . 0.8.3-4/debian 0.8.3-4/debian/patches
Dave Beckett
dajobe@costa.debian.org
Fri, 17 Jun 2005 22:31:31 +0000
Author: dajobe
Date: 2005-06-17 22:31:30 +0000 (Fri, 17 Jun 2005)
New Revision: 1849
Added:
non-group/muine/tags/0.8.3-4/
non-group/muine/tags/0.8.3-4/debian/changelog
non-group/muine/tags/0.8.3-4/debian/control
non-group/muine/tags/0.8.3-4/debian/muine-plugin-trayicon.install
non-group/muine/tags/0.8.3-4/debian/muine.dirs
non-group/muine/tags/0.8.3-4/debian/muine.install
non-group/muine/tags/0.8.3-4/debian/rules
Removed:
non-group/muine/tags/0.8.3-4/debian/changelog
non-group/muine/tags/0.8.3-4/debian/control
non-group/muine/tags/0.8.3-4/debian/muine.install
non-group/muine/tags/0.8.3-4/debian/patches/00_MonoConventions-2.patch
non-group/muine/tags/0.8.3-4/debian/patches/01_VolumeButton.patch
non-group/muine/tags/0.8.3-4/debian/patches/02_GnomeVfsLoad.patch
non-group/muine/tags/0.8.3-4/debian/patches/03_mono-1.1.1-compat.patch
non-group/muine/tags/0.8.3-4/debian/patches/04_libgstplay.patch
non-group/muine/tags/0.8.3-4/debian/rules
Log:
tag 0.8.3-4
Copied: non-group/muine/tags/0.8.3-4 (from rev 1846, non-group/muine/trunk)
Deleted: non-group/muine/tags/0.8.3-4/debian/changelog
===================================================================
--- non-group/muine/trunk/debian/changelog 2005-06-17 22:26:21 UTC (rev 1846)
+++ non-group/muine/tags/0.8.3-4/debian/changelog 2005-06-17 22:31:30 UTC (rev 1849)
@@ -1,272 +0,0 @@
-muine (0.6.3-8) unstable; urgency=low
-
- * Imported patch muine-0.6.3-libgstplay.diff from gentoo to fix muine
- working with newer libgstplay from gentoo. Closes: 300541
- * Imported patch muine-0.6.3-mono-1.1.1-compat.diff from gentoo
- for mono 1.1.1 compatibility.
-
- -- Dave Beckett <dajobe@debian.org> Thu, 7 Apr 2005 13:54:22 +0100
-
-muine (0.6.3-7) unstable; urgency=low
-
- * Remove CDBS config.* patch junk
- * Add gstreamer0.8-gnomevfs to Depends - not found by debhelper programs
- as muine does an indirect run-time load of the library. Closes: 296122
-
- -- Dave Beckett <dajobe@debian.org> Sun, 20 Feb 2005 17:42:29 +0000
-
-muine (0.6.3-6) unstable; urgency=low
-
- * Switch backend to gstreamer rather than xine
-
- -- Dave Beckett <dajobe@debian.org> Tue, 8 Feb 2005 20:29:23 +0000
-
-muine (0.6.3-5) unstable; urgency=low
-
- * patches/00_MonoConventions-2.patch changed to exec mono in wrapper
- script. Closes: 284625
- * Depend on libflac-dev >= 1.1.1-3 for soname transition
-
- -- Dave Beckett <Dave.Beckett@bristol.ac.uk> Fri, 7 Jan 2005 21:28:29 +0000
-
-muine (0.6.3-4) unstable; urgency=low
-
- * Alter Build-Depend for mono runtime to mono-jit (i386 and powerpc
- only) and mono-mint otherwise following requests of mono's upstream.
-
- * Build-Depend on libid3tag >= 0.15.1b-3 to make sure it is a version
- with all symbols present Closes: 270342
-
- * Added patch 01_VolumeButton.patch from Florian Ragwitz to let escape
- restore the initial volume for the volume widget. Closes: 264810
-
- * Added patch 02_GnomeVfsLoad.patch to make muine load libgnomevfs-2.so.0
- from package libgnomevfs2 not libgnomevfs-2.so from libgnomevfs2-dev
- Closes: 267846
-
- * Remove duplicate shlibs dependency made by dh_netdeps
-
- -- Dave Beckett <Dave.Beckett@bristol.ac.uk> Sun, 12 Sep 2004 18:55:35 +0100
-
-muine (0.6.3-3) unstable; urgency=low
-
- * Remove cli-virtual-machine from Build-Depend:
- * Build-Depend: on mono-utils to get dh_netdeps. Use it for calculating
- the dll dependencies
- * Add explicit architectures list i386, powerpc to use mono-jit which
- will hopefully get building working again. Closes: 255863
-
- -- Dave Beckett <Dave.Beckett@bristol.ac.uk> Tue, 3 Aug 2004 22:46:41 +0100
-
-muine (0.6.3-2) unstable; urgency=low
-
- * Rebuild against Mono 1.0 debs (Closes: #256755, #256793, #257042, #257128, #257315, #257377, #257412)
- * Update depends to require Mono 1.0-1 or newer
- * Added MONO_SHARED_DIR to debian/rules for the .wapi dir and cleanup
-
- -- Dave Beckett <Dave.Beckett@bristol.ac.uk> Mon, 5 Jul 2004 17:47:27 +0100
-
-muine (0.6.3-1) unstable; urgency=low
-
- * New upstream release (Closes: #252714)
- - works with Mono 1.0 beta3 and MonoConventions (Closes: #248127)
- - 0.6.x added sorting an artist's albums by year (Closes: #252408)
- * New maintainer with agreement of Link Dupont - thanks.
- * Removed patches/01_escape.patch merged upstream (Closes: #246324)
- * Depend on mono-jit or cli-virtual-machine (Closes: #255863)
- * Build-Depend on libgnome2-dev
- * New minimal muine.1 man page
-
- -- Dave Beckett <Dave.Beckett@bristol.ac.uk> Thu, 24 Jun 2004 11:45:09 +0100
-
-muine (0.6.1-0pre4) experimental; urgency=low
-
- * Removed muine.exe.config from usr/lib/muine
- * Updated debian/muine.links
-
- -- Link Dupont <link@subpop.net> Sun, 23 May 2004 12:58:04 -0700
-
-muine (0.6.1-0pre3) experimental; urgency=low
-
- * Removed really broken postinst that shouldn't be there
-
- -- Link Dupont <link@subpop.net> Thu, 20 May 2004 22:53:29 -0700
-
-muine (0.6.1-0pre2) experimental; urgency=low
-
- * Added move for muine.exe.config to usr/share/dotnet/muine
-
- -- Link Dupont <link@subpop.net> Thu, 20 May 2004 22:50:23 -0700
-
-muine (0.6.1-0pre1) experimental; urgency=low
-
- * New upstream release
- * Reconstructed d/p/00_MonoConventions-2.patch for new upstream version
- * Reconstructed d/p/01_escape.patch for new upstream version
-
- -- Link Dupont <link@subpop.net> Thu, 20 May 2004 22:18:43 -0700
-
-muine (0.5.3-8) unstable; urgency=low
-
- * Fixed useless-call-to-ldconfig warnings
-
- -- Link Dupont <link@subpop.net> Wed, 19 May 2004 14:11:02 -0700
-
-muine (0.5.3-7) unstable; urgency=low
-
- * Removed extra spaces in manpage.
-
- -- Link Dupont <link@subpop.net> Wed, 19 May 2004 10:00:17 -0700
-
-muine (0.5.3-6) unstable; urgency=low
-
- * Regenerated build tree from pristine source tarball.
-
- -- Link Dupont <link@subpop.net> Wed, 19 May 2004 00:51:06 -0700
-
-muine (0.5.3-5) unstable; urgency=low
-
- * Added patch 01_escape.patch (Closes: #246324)
-
- -- Link Dupont <link@subpop.net> Sun, 16 May 2004 21:40:59 -0700
-
-muine (0.5.3-4) unstable; urgency=low
-
- * Fix dependencies again. (Closes: #243389)
-
- -- Link Dupont <link@subpop.net> Mon, 19 Apr 2004 14:28:04 -0700
-
-muine (0.5.3-3) unstable; urgency=low
-
- * Added Homepage to debian/control.
- * Cleaned up debian/control.
- * Now compliant with the Debian Mono Conventions 0.1.2.
-
- -- Link Dupont <link@subpop.net> Fri, 16 Apr 2004 14:49:03 -0700
-
-muine (0.5.3-2) unstable; urgency=low
-
- * Fixed dependencies. Now built in a pbuilder environment (Closes: #243389)
-
- -- Link Dupont <link@subpop.net> Mon, 12 Apr 2004 14:43:54 -0700
-
-muine (0.5.3-1) unstable; urgency=low
-
- * New upstream release
-
- -- Link Dupont <link@subpop.net> Fri, 9 Apr 2004 12:55:59 -0700
-
-muine (0.5.2-1) unstable; urgency=low
-
- * New upstream release (Closes: #238061)
- * Backend changed to xine, so we depend on that now. Gstreamer backend
- requires gstreamer >= 0.8.
- * Updated depends to gtk-sharp, gnome-sharp, gconf-sharp 0.18
-
- -- Link Dupont <link@subpop.net> Thu, 8 Apr 2004 17:12:54 -0700
-
-muine (0.5.0-2) unstable; urgency=low
-
- * Added remove libtool from diff.gz
- * Added strict depends on gtk-sharp 0.17, and no greater.
-
- -- Link Dupont <link@subpop.net> Sun, 14 Mar 2004 14:17:47 -0800
-
-muine (0.5.0-1) unstable; urgency=low
-
- * New upstream release
- * Updated debian/watch to reflect the new website.
- * Added Build-Depends & Depends on gtk-sharp 0.17.
-
- -- Link Dupont <link@subpop.net> Sat, 13 Mar 2004 13:32:20 -0800
-
-muine (0.4.0-8) unstable; urgency=low
-
- * Added quotes to needs & section entries in debian/menu.
- * Cleaned up debian/muine.sgml.
- * Initial upload to unstable (Closes: #232293).
-
- -- Link Dupont <link@subpop.net> Wed, 25 Feb 2004 10:14:46 -0800
-
-muine (0.4.0-7) unstable; urgency=low
-
- * Actually remove the .a & .la files this time.
-
- -- Link Dupont <link@subpop.net> Wed, 18 Feb 2004 11:34:04 -0800
-
-muine (0.4.0-6) unstable; urgency=low
-
- * Removed file in debian/ that shouldn't be there.
-
- -- Link Dupont <link@subpop.net> Wed, 18 Feb 2004 10:59:35 -0800
-
-muine (0.4.0-5) unstable; urgency=low
-
- * Added Depends & Build-Depends on mono-jit & mono-cli, as stated in the
- MonoConventions.
- * Remove libmuine.a & libmuine.la, because they're not needed.
-
- -- Link Dupont <link@subpop.net> Wed, 18 Feb 2004 10:45:24 -0800
-
-muine (0.4.0-4) unstable; urgency=low
-
- * Updated Build-Depends to depend on mono >= 0.30 and gtk-sharp >= 0.16.
- * Added Build-Depends on libgconf2-dev, libgnomevfs2-dev, dockbook-to-man,
- libmono-dev.
- * Made debian/copyright copyright statement more verbose.
-
- -- Link Dupont <link@subpop.net> Mon, 16 Feb 2004 17:29:08 -0800
-
-muine (0.4.0-3) unstable; urgency=low
-
- * Rebuild against mono 0.30.1 pre-release debs
-
- -- Link Dupont <link@subpop.net> Mon, 16 Feb 2004 17:16:33 -0800
-
-muine (0.4.0-2) unstable; urgency=low
-
- * Cleaned up debian/rules a bit
-
- -- Link Dupont <link@subpop.net> Thu, 12 Feb 2004 13:23:52 -0800
-
-muine (0.4.0-1) unstable; urgency=low
-
- * New upstream release
-
- -- Link Dupont <link@subpop.net> Wed, 11 Feb 2004 15:41:05 -0800
-
-muine (0.3.2-5) unstable; urgency=low
-
- * Updated debian/watch to new format
-
- -- Link Dupont <link@subpop.net> Wed, 11 Feb 2004 15:27:11 -0800
-
-muine (0.3.2-4) unstable; urgency=low
-
- * Updated Build-Depends. Removed g++ since its build-essential
- * Updated to Standards version 3.6.1.0
- * Changed Section to gnome
- * Added removal of cleaning the debian/*.debhelper and debian/substvar files
-
- -- Link Dupont <link@subpop.net> Wed, 11 Feb 2004 11:06:30 -0800
-
-muine (0.3.2-3) unstable; urgency=low
-
- * Added Depends: mono, gconf-sharp, gnome-sharp, gtk-sharp
- * Added Build-Depends: cdbs
-
- -- Link Dupont <link@subpop.net> Mon, 9 Feb 2004 13:33:19 -0800
-
-muine (0.3.2-2) unstable; urgency=low
-
- * Cleaned up diff per Ross's instructions.
- * Moved to CDBS.
-
- -- Link Dupont <link@subpop.net> Mon, 9 Feb 2004 10:06:56 -0800
-
-muine (0.3.2-1) unstable; urgency=low
-
- * Initial Release.
-
- -- Link Dupont <link@subpop.net> Thu, 5 Feb 2004 13:44:55 -0800
-
Copied: non-group/muine/tags/0.8.3-4/debian/changelog (from rev 1848, non-group/muine/trunk/debian/changelog)
Deleted: non-group/muine/tags/0.8.3-4/debian/control
===================================================================
--- non-group/muine/trunk/debian/control 2005-06-17 22:26:21 UTC (rev 1846)
+++ non-group/muine/tags/0.8.3-4/debian/control 2005-06-17 22:31:30 UTC (rev 1849)
@@ -1,17 +0,0 @@
-Source: muine
-Section: gnome
-Priority: optional
-Maintainer: Dave Beckett <dajobe@debian.org>
-Build-Depends: debhelper (>= 4.1.87), mono-jit [i386 powerpc], mono-mint [!i386 !powerpc], mono-mcs (>= 1.0) | c-sharp-compiler, mono-utils (>= 1.0-2), libgtk-cil (>= 1.0), libgconf-cil (>= 1.0), libgnome-cil (>= 1.0), libglade-cil (>= 1.0), libgtk2.0-dev (>= 2.2.0), libgdbm-dev (>= 1.8.0), libogg-dev (>= 1.0), libvorbis-dev (>= 1.0), libid3tag0-dev (>= 0.15.1b-3), libflac-dev (>= 1.1.1-3), autotools-dev, cdbs, libmono-dev (>= 1.0), libgconf2-dev (>= 2.4.0), libgnomevfs2-dev (>= 2.4.0), libgnome2-dev (>= 2.4.0), libgstreamer0.8-dev (>= 0.8.0), libgstreamer-gconf0.8-dev (>= 0.8.0), libgstreamer-plugins0.8-dev (>= 0.8.0), intltool
-Standards-Version: 3.6.1.0
-
-Package: muine
-Architecture: any
-Depends: ${shlibs:Depends}, gstreamer0.8-gnomevfs (>= 0.8.0), ${misc:Depends}, ${net:Depends}
-Description: simple playlist based music player
- Muine is an innovative music player with a simple interface designed to
- allow the user to easily construct playlists from albums and/or single songs.
- Its goal is to be simply a music player, not to become a robust music
- management application.
- .
- Homepage: http://muine.gooeylinux.org
Copied: non-group/muine/tags/0.8.3-4/debian/control (from rev 1848, non-group/muine/trunk/debian/control)
Copied: non-group/muine/tags/0.8.3-4/debian/muine-plugin-trayicon.install (from rev 1848, non-group/muine/trunk/debian/muine-plugin-trayicon.install)
Copied: non-group/muine/tags/0.8.3-4/debian/muine.dirs (from rev 1848, non-group/muine/trunk/debian/muine.dirs)
Deleted: non-group/muine/tags/0.8.3-4/debian/muine.install
===================================================================
--- non-group/muine/trunk/debian/muine.install 2005-06-17 22:26:21 UTC (rev 1846)
+++ non-group/muine/tags/0.8.3-4/debian/muine.install 2005-06-17 22:31:30 UTC (rev 1849)
@@ -1,3 +0,0 @@
-debian/muine/usr/lib/muine/muine.exe usr/share/dotnet/muine
-debian/muine/usr/lib/muine/AmazonSearchService.dll usr/share/dotnet/muine
-debian/muine/usr/lib/muine/muine.exe.config usr/share/dotnet/muine
Copied: non-group/muine/tags/0.8.3-4/debian/muine.install (from rev 1848, non-group/muine/trunk/debian/muine.install)
Deleted: non-group/muine/tags/0.8.3-4/debian/patches/00_MonoConventions-2.patch
===================================================================
--- non-group/muine/trunk/debian/patches/00_MonoConventions-2.patch 2005-06-17 22:26:21 UTC (rev 1846)
+++ non-group/muine/tags/0.8.3-4/debian/patches/00_MonoConventions-2.patch 2005-06-17 22:31:30 UTC (rev 1849)
@@ -1,7 +0,0 @@
---- src/muine.in.orig 2004-05-20 22:14:31.000000000 -0700
-+++ src/muine.in 2004-05-20 22:14:40.000000000 -0700
-@@ -1,3 +1,3 @@
- #!/bin/sh
-
--@MONO@ @MONO_FLAGS@ @prefix@/lib/muine/muine.exe "$@"
-+exec @MONO@ @MONO_FLAGS@ @prefix@/share/dotnet/muine/muine.exe "$@"
Deleted: non-group/muine/tags/0.8.3-4/debian/patches/01_VolumeButton.patch
===================================================================
--- non-group/muine/trunk/debian/patches/01_VolumeButton.patch 2005-06-17 22:26:21 UTC (rev 1846)
+++ non-group/muine/tags/0.8.3-4/debian/patches/01_VolumeButton.patch 2005-06-17 22:31:30 UTC (rev 1849)
@@ -1,14 +0,0 @@
---- libmuine/volume-button.orig.c 2004-08-10 15:25:10.766761560 +0200
-+++ libmuine/volume-button.c 2004-08-10 15:24:48.927081696 +0200
-@@ -155,9 +155,8 @@
- case GDK_Escape:
- hide_scale (button);
-
-- g_signal_emit (button, signals[VOLUME_CHANGED], 0,
-- button->revert_volume);
--
-+ volume_button_set_volume(button, button->revert_volume);
-+
- return TRUE;
-
- case GDK_KP_Enter:
Deleted: non-group/muine/tags/0.8.3-4/debian/patches/02_GnomeVfsLoad.patch
===================================================================
--- non-group/muine/trunk/debian/patches/02_GnomeVfsLoad.patch 2005-06-17 22:26:21 UTC (rev 1846)
+++ non-group/muine/tags/0.8.3-4/debian/patches/02_GnomeVfsLoad.patch 2005-06-17 22:31:30 UTC (rev 1849)
@@ -1,21 +0,0 @@
---- src/muine.exe.config.in.orig 2004-06-05 17:48:33.000000000 +0100
-+++ src/muine.exe.config.in 2004-09-12 18:20:54.000000000 +0100
-@@ -1,6 +1,6 @@
- <configuration>
- <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
- <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
-- <dllmap dll="libgnomevfs-2.dll" target="libgnomevfs-2.so"/>
-+ <dllmap dll="libgnomevfs-2.0-0.dll" target="libgnomevfs-2.so.0"/>
- <dllmap dll="libmuine" target="@prefix@/lib/muine/libmuine.so"/>
- </configuration>
---- src/StringUtils.cs.orig 2004-06-05 17:48:43.000000000 +0100
-+++ src/StringUtils.cs 2004-09-12 18:22:54.000000000 +0100
-@@ -99,7 +99,7 @@
- return System.Text.Encoding.UTF8.GetString (data.Data);
- }
-
-- [DllImport ("libgnomevfs-2.dll")]
-+ [DllImport ("libgnomevfs-2.0-0.dll")]
- private static extern IntPtr gnome_vfs_get_local_path_from_uri (string str);
-
- public static string LocalPathFromUri (string uri)
Deleted: non-group/muine/tags/0.8.3-4/debian/patches/03_mono-1.1.1-compat.patch
===================================================================
--- non-group/muine/trunk/debian/patches/03_mono-1.1.1-compat.patch 2005-06-17 22:26:21 UTC (rev 1846)
+++ non-group/muine/tags/0.8.3-4/debian/patches/03_mono-1.1.1-compat.patch 2005-06-17 22:31:30 UTC (rev 1849)
@@ -1,77 +0,0 @@
-diff -aur muine-0.6.3-orig/src/HandleView.cs muine-0.6.3/src/HandleView.cs
---- muine-0.6.3-orig/src/HandleView.cs 2004-05-11 13:50:07.000000000 -0400
-+++ muine-0.6.3/src/HandleView.cs 2004-09-22 21:52:10.000000000 -0400
-@@ -34,15 +34,23 @@
- SignalDelegate cb, IntPtr data,
- IntPtr p, int flags);
-
-+ private SignalDelegate PointerActivatedCB;
-+ private SignalDelegate PointersReorderedCB;
-+ private SignalDelegate SelectionChangedCB;
-+
- public HandleView () : base (IntPtr.Zero)
- {
- Raw = pointer_list_view_new ();
-
-- g_signal_connect_data (Raw, "pointer_activated", new SignalDelegate (PointerActivatedCallback),
-+ PointerActivatedCB = new SignalDelegate (PointerActivatedCallback);
-+ PointersReorderedCB = new SignalDelegate (PointersReorderedCallback);
-+ SelectionChangedCB = new SignalDelegate (SelectionChangedCallback);
-+
-+ g_signal_connect_data (Raw, "pointer_activated", PointerActivatedCB,
- IntPtr.Zero, IntPtr.Zero, 0);
-- g_signal_connect_data (Raw, "pointers_reordered", new SignalDelegate (PointersReorderedCallback),
-+ g_signal_connect_data (Raw, "pointers_reordered", PointersReorderedCB,
- IntPtr.Zero, IntPtr.Zero, 0);
-- g_signal_connect_data (Raw, "selection_changed", new SignalDelegate (SelectionChangedCallback),
-+ g_signal_connect_data (Raw, "selection_changed", SelectionChangedCB,
- IntPtr.Zero, IntPtr.Zero, 0);
- }
-
-diff -aur muine-0.6.3-orig/src/NotificationAreaIcon.cs muine-0.6.3/src/NotificationAreaIcon.cs
---- muine-0.6.3-orig/src/NotificationAreaIcon.cs 2004-06-18 15:14:28.000000000 -0400
-+++ muine-0.6.3/src/NotificationAreaIcon.cs 2004-09-23 10:11:49.521428120 -0400
-@@ -190,8 +190,8 @@
- x = menu_x;
- y = menu_y;
-
-- int monitor = menu.Screen.GetMonitorAtPoint (x, y);
-- Gdk.Rectangle rect = menu.Screen.GetMonitorGeometry (monitor);
-+ int monitor = ((Widget)menu).Screen.GetMonitorAtPoint (x, y);
-+ Gdk.Rectangle rect = ((Widget)menu).Screen.GetMonitorGeometry (monitor);
-
- int space_above = y - rect.Y;
- int space_below = rect.Y + rect.Height - y;
-diff -aur muine-0.6.3-orig/src/Player.cs muine-0.6.3/src/Player.cs
---- muine-0.6.3-orig/src/Player.cs 2004-06-05 09:56:38.000000000 -0400
-+++ muine-0.6.3/src/Player.cs 2004-09-22 21:53:17.000000000 -0400
-@@ -182,6 +182,10 @@
- IntPtr p, int flags);
- }
-
-+ private IntSignalDelegate tick_cb;
-+ private SignalDelegate eos_cb;
-+ private StringSignalDelegate error_cb;
-+
- public Player () : base (IntPtr.Zero)
- {
- IntPtr error_ptr;
-@@ -193,11 +197,15 @@
- throw new Exception (error);
- }
-
-- ConnectInt.g_signal_connect_data (Raw, "tick", new IntSignalDelegate (TickCallback),
-+ tick_cb = new IntSignalDelegate (TickCallback);
-+ eos_cb = new SignalDelegate (EosCallback);
-+ error_cb = new StringSignalDelegate (ErrorCallback);
-+
-+ ConnectInt.g_signal_connect_data (Raw, "tick", tick_cb,
- IntPtr.Zero, IntPtr.Zero, 0);
-- Connect.g_signal_connect_data (Raw, "end_of_stream", new SignalDelegate (EosCallback),
-+ Connect.g_signal_connect_data (Raw, "end_of_stream", eos_cb,
- IntPtr.Zero, IntPtr.Zero, 0);
-- ConnectString.g_signal_connect_data (Raw, "error", new StringSignalDelegate (ErrorCallback),
-+ ConnectString.g_signal_connect_data (Raw, "error", error_cb,
- IntPtr.Zero, IntPtr.Zero, 0);
-
- playing = false;
Deleted: non-group/muine/tags/0.8.3-4/debian/patches/04_libgstplay.patch
===================================================================
--- non-group/muine/trunk/debian/patches/04_libgstplay.patch 2005-06-17 22:26:21 UTC (rev 1846)
+++ non-group/muine/tags/0.8.3-4/debian/patches/04_libgstplay.patch 2005-06-17 22:31:30 UTC (rev 1849)
@@ -1,48 +0,0 @@
---- libmuine/player-gst.c.orig 2004-04-20 20:25:44.000000000 +0100
-+++ libmuine/player-gst.c 2005-03-15 14:14:10.312438632 +0000
-@@ -144,6 +144,7 @@
- player_construct (Player *player, char **error)
- {
- PlayerPriv *priv;
-+ GstElement* tempsink;
-
- gst_init (NULL, NULL);
-
-@@ -168,22 +169,33 @@
-
- gst_play_set_data_src (priv->play, priv->source);
-
-- priv->sink = gst_gconf_get_default_audio_sink ();
-- if (!priv->sink) {
-+ tempsink = gst_gconf_get_default_audio_sink ();
-+ if (!tempsink) {
- *error = g_strdup (_("Could not render default GStreamer audio output sink"));
-
- return;
- }
-
-- gst_play_set_audio_sink (priv->play, priv->sink);
-+
-+
-+ /* gst_play_set_audio_sink (priv->play, priv->sink); */
-
-- priv->volume = gst_bin_get_by_name (GST_BIN (priv->play), "volume");
-+ priv->volume = gst_element_factory_make ("volume", "muinevol");
- if (!priv->volume) {
- *error = g_strdup (_("Could not find the volume element in the GstPlay pipeline"));
-
- return;
- }
-
-+ priv->sink = gst_bin_new ("muineaudiosink");
-+ gst_bin_add_many (GST_BIN(priv->sink), priv->volume, tempsink, NULL);
-+ gst_element_link (priv->volume, tempsink);
-+ gst_element_add_ghost_pad (priv->sink,
-+ gst_element_get_pad (priv->volume, "sink"),
-+ "sink");
-+ gst_play_set_audio_sink (priv->play, priv->sink);
-+
-+ //gst_bin_add (GST_BIN(priv->sink), tempsink);
- g_signal_connect (priv->play,
- "error",
- G_CALLBACK (error_cb),
Deleted: non-group/muine/tags/0.8.3-4/debian/rules
===================================================================
--- non-group/muine/trunk/debian/rules 2005-06-17 22:26:21 UTC (rev 1846)
+++ non-group/muine/tags/0.8.3-4/debian/rules 2005-06-17 22:31:30 UTC (rev 1849)
@@ -1,42 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-export MONO_SHARED_DIR=$(CURDIR)
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/gnome.mk
-
-DEB_INSTALL_MANPAGES_muine := debian/muine.1
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-gstreamer=yes
-DEB_DH_MAKESHLIBS_ARGS := -Xlibmuine
-
-common-configure-indep::
- mkdir -p $(MONO_SHARED_DIR)/.wapi
-
-common-binary-predeb-arch::
- dh_netdeps
- sed -e 's/ libglib2[^,]*,//' -e 's/ libgnomevfs2[^,]*,//' debian/muine.substvars > debian/muine.substvars.new && mv debian/muine.substvars.new debian/muine.substvars
-
-common-binary-post-install-arch::
- chmod 644 debian/muine/usr/share/dotnet/muine/muine.exe
- rm -f debian/muine/usr/lib/muine/muine.exe
- rm -f debian/muine/usr/lib/muine/AmazonSearchService.dll
- rm -f debian/muine/usr/lib/muine/muine.exe.config
-
-install/muine::
- rm -f debian/muine/usr/lib/muine/libmuine.a
- rm -f debian/muine/usr/lib/muine/libmuine.la
-
-clean::
-# rm -f data/muine.desktop data/muine.schemas
- rm -f ./libtool src/AmazonSearchService.cs
- rm -rf $(MONO_SHARED_DIR)/.wapi
- rm -f debian/muine.substvars.new
-# cdbs leaves junk around after patching
- if test -r config.guess.cdbs-orig ; then \
- mv -f config.guess.cdbs-orig config.guess; \
- fi
- if test -r config.sub.cdbs-orig ; then \
- mv -f config.sub.cdbs-orig config.sub; \
- fi
Copied: non-group/muine/tags/0.8.3-4/debian/rules (from rev 1848, non-group/muine/trunk/debian/rules)