[Pkg-mono-svn-commits] rev 1848 - in non-group/muine/trunk/debian: . patches

Dave Beckett dajobe@costa.debian.org
Fri, 17 Jun 2005 22:30:48 +0000


Author: dajobe
Date: 2005-06-17 22:30:47 +0000 (Fri, 17 Jun 2005)
New Revision: 1848

Added:
   non-group/muine/trunk/debian/muine-plugin-trayicon.install
   non-group/muine/trunk/debian/muine.dirs
Removed:
   non-group/muine/trunk/debian/patches/00_MonoConventions-2.patch
   non-group/muine/trunk/debian/patches/01_VolumeButton.patch
   non-group/muine/trunk/debian/patches/02_GnomeVfsLoad.patch
   non-group/muine/trunk/debian/patches/03_mono-1.1.1-compat.patch
   non-group/muine/trunk/debian/patches/04_libgstplay.patch
Modified:
   non-group/muine/trunk/debian/changelog
   non-group/muine/trunk/debian/control
   non-group/muine/trunk/debian/muine.install
   non-group/muine/trunk/debian/rules
Log:
Import 0.8.3-4

Modified: non-group/muine/trunk/debian/changelog
===================================================================
--- non-group/muine/trunk/debian/changelog	2005-06-17 22:27:11 UTC (rev 1847)
+++ non-group/muine/trunk/debian/changelog	2005-06-17 22:30:47 UTC (rev 1848)
@@ -1,33 +1,110 @@
-muine (0.6.3-8) unstable; urgency=low
+muine (0.8.3-4) 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.
+  * Rip out muine-dbus and muine-plugin packages
 
- -- Dave Beckett <dajobe@debian.org>  Thu,  7 Apr 2005 13:54:22 +0100
+ -- Dave Beckett <dajobe@debian.org>  Fri, 17 Jun 2005 22:07:49 +0100
 
-muine (0.6.3-7) unstable; urgency=low
+muine (0.8.3-3) unstable; urgency=low
 
-  * Remove CDBS config.* patch junk
+  * Upload to unstable now that dbus mono bindings are in unstable.
+  * Split into muine, muine-dbus and muine-plugin packages
+  * Added plugin package for muine-plugin-trayicon (Closes: #311365)
+  * Build-Depend on mono-jit only to allow amd64 builds (Closes: #311957)
+
+ -- Dave Beckett <dajobe@debian.org>  Wed, 15 Jun 2005 20:26:00 +0100
+
+muine (0.8.3-2) experimental; urgency=low
+
+  * Depend on the libdbus-cil in experimental (Closes: 311364)
+
+ -- Dave Beckett <dajobe@debian.org>  Tue, 31 May 2005 17:04:28 +0100
+
+muine (0.8.3-1) experimental; urgency=low
+
+  * New upstream release (Closes: 287333)
+  * Install below /usr/lib/muine not /usr/share/dotnet - remove all patches
+  * Require mono 1.1.6+
+
+ -- Dave Beckett <dajobe@debian.org>  Sun, 29 May 2005 16:00:19 +0100
+
+muine (0.8.2-8) experimental; urgency=low
+
+  * Rebuild against mono 1.1 experimental debs
+  * Require 0.23.4-1.2 also rebuild against same experimental mono 1.1
+
+ -- Dave Beckett <dajobe@debian.org>  Fri, 15 Apr 2005 23:09:01 +0100
+
+muine (0.8.2-7) experimental; urgency=low
+
+  * Rebuild against gtk-sharp2-unstable
+
+ -- Dave Beckett <dajobe@debian.org>  Sat, 26 Feb 2005 22:17:16 +0000
+
+muine (0.8.2-6) experimental; urgency=low
+
+  * Rebuild against dbus 0.23.2-2.1 and gtk-sharp-unstable 1.9.2-3
+  * Add mono-gac, lib*2.0-cil and gnome-icon-them to Build-Depends
+
+ -- Dave Beckett <dajobe@debian.org>  Sat, 26 Feb 2005 19:05:35 +0000
+
+muine (0.8.2-5) experimental; urgency=low
+
   * Add gstreamer0.8-gnomevfs to Depends - not found by debhelper programs
-    as muine does an indirect run-time load of the library.  Closes: 296122
+    as muine does an indirect run-time load of the library.
 
- -- Dave Beckett <dajobe@debian.org>  Sun, 20 Feb 2005 17:42:29 +0000
+ -- Dave Beckett <dajobe@debian.org>  Sun, 20 Feb 2005 18:19:13 +0000
 
-muine (0.6.3-6) unstable; urgency=low
+muine (0.8.2-4) unstable; urgency=low
 
-  * Switch backend to gstreamer rather than xine
+  * debian/rules - conditionally restore cdbs config.* debris
 
- -- Dave Beckett <dajobe@debian.org>  Tue,  8 Feb 2005 20:29:23 +0000
+ -- Dave Beckett <dajobe@debian.org>  Fri, 18 Feb 2005 22:29:38 +0000
 
+muine (0.8.2-3) unstable; urgency=low
+
+  * Build against dbus 0.23.1-1.1 I just made
+
+ -- Dave Beckett <dajobe@debian.org>  Fri, 18 Feb 2005 00:38:04 +0000
+
+muine (0.8.2-2) unstable; urgency=low
+
+  * Build against dbus-cil that I made not the one stuck in NEW
+
+ -- Dave Beckett <dajobe@debian.org>  Fri, 18 Feb 2005 00:07:36 +0000
+
+muine (0.8.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Require gtk-sharp 1.9.2
+  * Run dh_makenetlibs to build versions for muine-dbus and muine-plugin
+  * Restore config.guess and config.sub to pristine after cdbs fails to do it.
+
+ -- Dave Beckett <dajobe@debian.org>  Fri, 11 Feb 2005 23:16:04 +0000
+
+muine (0.8.1-0.1) unstable; urgency=low
+
+  * New upstream release
+  * Requires dbus-cil not yet in Debian archive
+  
+ -- Dave Beckett <Dave.Beckett@bristol.ac.uk>  Fri,  4 Feb 2005 00:01:21 +0000
+
+muine (0.7.1-0.1) unstable; urgency=low
+
+  * New upstream release
+  * Requires libgtk2.0-cil not yet in Debian archive
+  * Consequently this is not going to be uploaded
+  * Switch to use gstreamer0.8 instead of xine
+  * Deleted patch 02_GnomeVfsLoad.patch merged upstream.
+  * Deleted patch 01_VolumeButton.patch no longer usable
+
+ -- Dave Beckett <Dave.Beckett@bristol.ac.uk>  Mon,  3 Jan 2005 14:31:43 +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
+    script (Closes: 284625)
 
- -- Dave Beckett <Dave.Beckett@bristol.ac.uk>  Fri,  7 Jan 2005 21:28:29 +0000
+ -- Dave Beckett <Dave.Beckett@bristol.ac.uk>  Tue,  7 Dec 2004 15:58:04 +0000
 
 muine (0.6.3-4) unstable; urgency=low
 

Modified: non-group/muine/trunk/debian/control
===================================================================
--- non-group/muine/trunk/debian/control	2005-06-17 22:27:11 UTC (rev 1847)
+++ non-group/muine/trunk/debian/control	2005-06-17 22:30:47 UTC (rev 1848)
@@ -2,16 +2,31 @@
 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
+Build-Depends: debhelper (>= 4.1.87), mono-jit, mono-mcs (>= 1.1.6) | c-sharp-compiler, mono-utils (>= 1.1.6), mono-gac, libgtk-cil (>= 1.0), libgconf-cil (>= 1.0), libgnome-cil (>= 1.0), libglade-cil (>= 1.0), libgtk2.0-dev (>= 2.4.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.1.6), 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), intltool, libgtk2.0-cil (>= 1.9.2), libgnome2.0-cil (>= 1.9.2), libglade2.0-cil (>= 1.9.2), libgconf2.0-cil (>= 1.9.2), libdbus-cil (>= 0.23.4), gnome-icon-theme (>= 2.8.0), cli-common (>= 0.1.3)
 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 
+Depends: ${shlibs:Depends}, gstreamer0.8-gnomevfs (>= 0.8.0), ${misc:Depends}, ${cli:Depends}
+Description: Simple playlist based music player
+ Muine is an innovative music player. It has 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.
+ management application.  It includes a plugin interface.
  .
+ The package includes the CIL assemblies to access the D-BUS interface
+ to Muine and to compile plugins for Muine.
+ .
  Homepage: http://muine.gooeylinux.org
+
+Package: muine-plugin-trayicon
+Architecture: all
+Depends: ${cli:Depends}
+Description: TrayIcon Plugin for the Muine music player
+ This package provides a system tray icon and control for the Muine music
+ player to allow playing, pausing of music, skipping tracks and displaying
+ of current playing artist song information.
+ .
+ This functionality was previously available as a core part of muine 0.8.2
+ and earlier versions.
+

Added: non-group/muine/trunk/debian/muine-plugin-trayicon.install
===================================================================
--- non-group/muine/trunk/debian/muine-plugin-trayicon.install	2005-06-17 22:27:11 UTC (rev 1847)
+++ non-group/muine/trunk/debian/muine-plugin-trayicon.install	2005-06-17 22:30:47 UTC (rev 1848)
@@ -0,0 +1 @@
+plugins/TrayIcon.dll /usr/lib/muine/plugins/

Added: non-group/muine/trunk/debian/muine.dirs
===================================================================
--- non-group/muine/trunk/debian/muine.dirs	2005-06-17 22:27:11 UTC (rev 1847)
+++ non-group/muine/trunk/debian/muine.dirs	2005-06-17 22:30:47 UTC (rev 1848)
@@ -0,0 +1 @@
+usr/lib/mono/muine/plugins

Modified: non-group/muine/trunk/debian/muine.install
===================================================================
--- non-group/muine/trunk/debian/muine.install	2005-06-17 22:27:11 UTC (rev 1847)
+++ non-group/muine/trunk/debian/muine.install	2005-06-17 22:30:47 UTC (rev 1848)
@@ -1,3 +1,11 @@
-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
+debian/tmp/etc/gconf/schemas/muine.schemas
+debian/tmp/usr/bin/muine
+debian/tmp/usr/lib/dbus-1.0/services/*
+debian/tmp/usr/lib/mono/gac/*
+debian/tmp/usr/lib/mono/muine/*
+debian/tmp/usr/lib/monodoc/sources/*
+debian/tmp/usr/lib/muine/*
+debian/tmp/usr/lib/pkgconfig/*
+debian/tmp/usr/share/applications/muine.desktop
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/pixmaps/muine.png

Deleted: non-group/muine/trunk/debian/patches/00_MonoConventions-2.patch
===================================================================
--- non-group/muine/trunk/debian/patches/00_MonoConventions-2.patch	2005-06-17 22:27:11 UTC (rev 1847)
+++ non-group/muine/trunk/debian/patches/00_MonoConventions-2.patch	2005-06-17 22:30:47 UTC (rev 1848)
@@ -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/trunk/debian/patches/01_VolumeButton.patch
===================================================================
--- non-group/muine/trunk/debian/patches/01_VolumeButton.patch	2005-06-17 22:27:11 UTC (rev 1847)
+++ non-group/muine/trunk/debian/patches/01_VolumeButton.patch	2005-06-17 22:30:47 UTC (rev 1848)
@@ -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/trunk/debian/patches/02_GnomeVfsLoad.patch
===================================================================
--- non-group/muine/trunk/debian/patches/02_GnomeVfsLoad.patch	2005-06-17 22:27:11 UTC (rev 1847)
+++ non-group/muine/trunk/debian/patches/02_GnomeVfsLoad.patch	2005-06-17 22:30:47 UTC (rev 1848)
@@ -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/trunk/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:27:11 UTC (rev 1847)
+++ non-group/muine/trunk/debian/patches/03_mono-1.1.1-compat.patch	2005-06-17 22:30:47 UTC (rev 1848)
@@ -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/trunk/debian/patches/04_libgstplay.patch
===================================================================
--- non-group/muine/trunk/debian/patches/04_libgstplay.patch	2005-06-17 22:27:11 UTC (rev 1847)
+++ non-group/muine/trunk/debian/patches/04_libgstplay.patch	2005-06-17 22:30:47 UTC (rev 1848)
@@ -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),

Modified: non-group/muine/trunk/debian/rules
===================================================================
--- non-group/muine/trunk/debian/rules	2005-06-17 22:27:11 UTC (rev 1847)
+++ non-group/muine/trunk/debian/rules	2005-06-17 22:30:47 UTC (rev 1848)
@@ -10,29 +10,34 @@
 DEB_INSTALL_MANPAGES_muine := debian/muine.1
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-gstreamer=yes
 DEB_DH_MAKESHLIBS_ARGS := -Xlibmuine
+#DEB_MAKE_ENVVARS := 
 
 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
+binary-predeb/muine::
+	rm debian/muine/usr/lib/muine/libmuine.a
+	rm debian/muine/usr/lib/muine/libmuine.la
 
-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
+	dh_makeclilibs -V
+	dh_clideps
+	sed -e 's/ libglib2[^,]*,//' -e 's/ libgnomevfs2[^,]*,//' -e 's/ libgtk2.0[^,]*,//' debian/muine.substvars > debian/muine.substvars.new && mv debian/muine.substvars.new debian/muine.substvars
 
-install/muine::
-	rm -f debian/muine/usr/lib/muine/libmuine.a
-	rm -f debian/muine/usr/lib/muine/libmuine.la
+binary-post-install/muine::
+	chmod 644 debian/muine/usr/lib/muine/muine.exe
+	find debian -name \*.dll -exec chmod 644 {} \;
 
+common-binary-predeb-indep::
+	find debian -name \*.dll -exec chmod 644 {} \;
+	dh_makeclilibs
+	dh_clideps
+
 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; \