[Pkg-utopia-commits] r249 - in packages/experimental/gnome-volume-manager/debian: . patches

Sjoerd Simons sjoerd at costa.debian.org
Mon May 1 17:56:06 UTC 2006


Author: sjoerd
Date: 2005-06-22 10:32:28 +0000 (Wed, 22 Jun 2005)
New Revision: 249

Added:
   packages/experimental/gnome-volume-manager/debian/patches/01_browse_fixup.patch
   packages/experimental/gnome-volume-manager/debian/patches/02_pmount.patch
   packages/experimental/gnome-volume-manager/debian/patches/03_kernel_hint.patch
   packages/experimental/gnome-volume-manager/debian/patches/04_reconnect_on_dbus_exit.patch
   packages/experimental/gnome-volume-manager/debian/patches/05_mount_at_start.patch
   packages/experimental/gnome-volume-manager/debian/patches/06_pmount_crypt.patch
   packages/experimental/gnome-volume-manager/debian/patches/07_dialogs_info.patch
   packages/experimental/gnome-volume-manager/debian/patches/08_photographss_typo.patch
   packages/experimental/gnome-volume-manager/debian/patches/09_nautilus_path.patch
   packages/experimental/gnome-volume-manager/debian/patches/10_improve_mounting.patch
   packages/experimental/gnome-volume-manager/debian/patches/11_track_cdrom_changes.patch
   packages/experimental/gnome-volume-manager/debian/patches/12_no_autorun.patch
Removed:
   packages/experimental/gnome-volume-manager/debian/patches/03_browse_fixup.patch
   packages/experimental/gnome-volume-manager/debian/patches/06_mount_at_start.patch
   packages/experimental/gnome-volume-manager/debian/patches/11_dbus_reconnect_on_bus_exit.patch
   packages/experimental/gnome-volume-manager/debian/patches/13_dont_set_capabilities.patch
   packages/experimental/gnome-volume-manager/debian/patches/20_specify_programs.patch
   packages/experimental/gnome-volume-manager/debian/patches/25_improve_mounting.patch
   packages/experimental/gnome-volume-manager/debian/patches/30_26_kernel_hint.patch
   packages/experimental/gnome-volume-manager/debian/patches/33_track_cdrom_changes.patch
   packages/experimental/gnome-volume-manager/debian/patches/34_compiler_warnings.patch
   packages/experimental/gnome-volume-manager/debian/patches/40_no_autorun.patch
Modified:
   packages/experimental/gnome-volume-manager/debian/changelog
   packages/experimental/gnome-volume-manager/debian/control
Log:
 * Move patches around to follow the same numbering as the ubuntu package
 * Add new cool ubuntu patches
 * Updated changelog
 * TODO: Adopt some patches to the current upstream version



Modified: packages/experimental/gnome-volume-manager/debian/changelog
===================================================================
--- packages/experimental/gnome-volume-manager/debian/changelog	2005-06-22 09:47:31 UTC (rev 248)
+++ packages/experimental/gnome-volume-manager/debian/changelog	2005-06-22 10:32:28 UTC (rev 249)
@@ -1,3 +1,37 @@
+gnome-volume-manager (1.3.1-1) experimental; urgency=low
+
+  * New upstream release 
+  * Based on Ubuntu's gnome-volume 1.3.1 package by Martin Pitt.
+  * Patches adapted for new upstream
+    + debian/patches/00_set_defaults.patch
+    + debian/patches/03_browse_fixup.patch (renamed to 01_browse_fixup.patch)
+    + debian/patches/30_26_kernel_hint.patch (renamed to 03_kernel_hint.patch)
+    + debian/patches/06_mount_at_start.patch 
+      (renamed to 05_mount_at_start.patch)
+    + debian/patches/25_improve_mounting.patch 
+      (renamed to 10_improve_mounting.patch)
+    + debian/patches/33_track_cdrom_changes.patch
+      (renamed to 11_track_cdrom_changes.patch)
+    + debian/patches/40_no_autorun.patch
+      (renamed to 12_no_autorun.patch)
+  * debian/paches/20_specify_programs.patch replaced by
+    debian/paches/02_pmount.patch and debian/paches/09_nautilus_path.patch. 
+    Which is are simpler patches that just hardcodes pmount and the nautilus
+    path. (Patches from Martin Pitt)
+  * debian/patches/13_dont_set_capabilities.patch
+    + Dropped. Only surpresses a debug message, not really needed.
+  * debian/patches/34_compiler_warnings.patch
+    + Dropped. Fixed upstream
+  * debian/patches/06_mount_crypt.patch
+    + When an encrypted volume is inserted ask for the password and mount it
+      using pmount. (Needs cryptsetup with luks patches)
+  * debian/patches/07_dialogs_info.patch
+    + Added. Change the dialogs to be info instead of warning. 
+  * debian/patches/08_photographss_typo.patch
+    + Added. Fix typo "photographss" in src/manager.c and all translations.
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed, 22 Jun 2005 11:00:14 +0200
+
 gnome-volume-manager (1.2.1-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/experimental/gnome-volume-manager/debian/control
===================================================================
--- packages/experimental/gnome-volume-manager/debian/control	2005-06-22 09:47:31 UTC (rev 248)
+++ packages/experimental/gnome-volume-manager/debian/control	2005-06-22 10:32:28 UTC (rev 249)
@@ -2,13 +2,13 @@
 Section: gnome
 Priority: optional
 Maintainer: Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: cdbs, dbus-glib-1-dev, libhal-dev (>=0.2.97), libglade2-dev, libgnomeui-dev, debhelper (>= 4.2.21), libxml-parser-perl, libgtk2.0-dev (>= 2.6.0)
+Build-Depends: cdbs, libdbus-glib-1-dev, libhal-dev (>=0.5.2), libglade2-dev, libgnomeui-dev, debhelper (>= 4.2.21), libxml-parser-perl, libgtk2.0-dev (>= 2.6.0)
 Standards-Version: 3.6.1
 
 Package: gnome-volume-manager
 Architecture: any
 Conflicts: magicdev
-Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.4.1), pmount (>= 0.4.3)
+Depends: ${shlibs:Depends}, ${misc:Depends}, hal, pmount
 Recommends: nautilus-cd-burner, totem, gnome-media, gthumb
 Description: GNOME daemon to auto-mount and manage media devices
  gnome-volume-manager is a GNOME daemon that acts as a policy agent in

Copied: packages/experimental/gnome-volume-manager/debian/patches/01_browse_fixup.patch (from rev 241, packages/experimental/gnome-volume-manager/debian/patches/03_browse_fixup.patch)
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/03_browse_fixup.patch	2005-06-22 08:06:14 UTC (rev 241)
+++ packages/experimental/gnome-volume-manager/debian/patches/01_browse_fixup.patch	2005-06-22 10:32:28 UTC (rev 249)
@@ -0,0 +1,70 @@
+diff -ruN gnome-volume-manager-1.3.1-old/src/manager.c gnome-volume-manager-1.3.1/src/manager.c
+--- gnome-volume-manager-1.3.1-old/src/manager.c	2005-03-31 18:27:07.000000000 +0200
++++ gnome-volume-manager-1.3.1/src/manager.c	2005-04-13 14:08:36.049442384 +0200
+@@ -257,31 +257,32 @@
+ /*
+  * gvm_check_dvd - is this a Video DVD?  If so, do something about it.
+  *
+- * Returns TRUE if this was a Video DVD and FALSE otherwise.
++ * Returns TRUE if the Video DVD action was taken and FALSE otherwise.
+  */
+ static gboolean
+ gvm_check_dvd (const char *device, const char *mount_point, const char *udi)
+ {
+ 	char *path;
+-	gboolean retval;
++	gboolean isdvd;
+ 
+ 	path = g_build_path (G_DIR_SEPARATOR_S, mount_point, "video_ts", NULL);
+-	retval = g_file_test (path, G_FILE_TEST_IS_DIR);
++	isdvd = g_file_test (path, G_FILE_TEST_IS_DIR);
+ 	g_free (path);
+ 
+ 	/* try the other name, if needed */
+-	if (retval == FALSE) {
++	if (isdvd == FALSE) {
+ 		path = g_build_path (G_DIR_SEPARATOR_S, mount_point,
+ 				     "VIDEO_TS", NULL);
+-		retval = g_file_test (path, G_FILE_TEST_IS_DIR);
++		isdvd = g_file_test (path, G_FILE_TEST_IS_DIR);
+ 		g_free (path);
+ 	}
+ 
+-	if (retval && config.autoplay_dvd)
++	if (isdvd && config.autoplay_dvd) {
+ 		gvm_run_command (device, config.autoplay_dvd_command,
+ 				 mount_point, udi);
+-
+-	return retval;
++    return TRUE;
++  }
++  return FALSE;
+ }
+ 
+ /*
+@@ -289,7 +290,8 @@
+  * unit from a digital camera (e.g., a compact flash card).  If it is, then
+  * ask the user if he wants to import the photos.
+  *
+- * Returns TRUE if there were photos on this device, FALSE otherwise
++ * Returns TRUE if there were photos on this device were imported, 
++ * FALSE otherwise
+  *
+  * FIXME: Should probably not prompt the user and just do it automatically.
+  *        This now makes sense, as gphoto added an import mode.
+@@ -308,7 +310,6 @@
+ 	if (!g_file_test (dcim_path, G_FILE_TEST_IS_DIR))
+ 		goto out;
+ 
+-	retval = TRUE;
+ 	dbg ("Photos detected: %s\n", dcim_path);
+ 
+ 	/* add the "content.photos" capability to this device */
+@@ -322,6 +323,7 @@
+ 	}
+ 
+ 	if (config.autophoto) {
++		retval=TRUE;
+ 		askme = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING,
+ 						GTK_BUTTONS_NONE,
+ 						_("Import photos from device?"));

Copied: packages/experimental/gnome-volume-manager/debian/patches/02_pmount.patch (from rev 248, packages/unstable/gnome-volume-manager/debian/patches/02_pmount.patch)

Deleted: packages/experimental/gnome-volume-manager/debian/patches/03_browse_fixup.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/03_browse_fixup.patch	2005-06-22 09:47:31 UTC (rev 248)
+++ packages/experimental/gnome-volume-manager/debian/patches/03_browse_fixup.patch	2005-06-22 10:32:28 UTC (rev 249)
@@ -1,70 +0,0 @@
-diff -ruN gnome-volume-manager-1.1.3-old/src/manager.c gnome-volume-manager-1.1.3/src/manager.c
---- gnome-volume-manager-1.1.3-old/src/manager.c	2005-02-01 07:01:05.000000000 +0100
-+++ gnome-volume-manager-1.1.3/src/manager.c	2005-02-08 13:13:08.139265849 +0100
-@@ -256,31 +256,32 @@
- /*
-  * gvm_check_dvd - is this a Video DVD?  If so, do something about it.
-  *
-- * Returns TRUE if this was a Video DVD and FALSE otherwise.
-+ * Returns TRUE if the Video DVD action was taken and FALSE otherwise.
-  */
- static gboolean
- gvm_check_dvd (const char *device, const char *mount_point, const char *udi)
- {
- 	char *path;
--	gboolean retval;
-+	gboolean isdvd;
- 
- 	path = g_build_path (G_DIR_SEPARATOR_S, mount_point, "video_ts", NULL);
--	retval = g_file_test (path, G_FILE_TEST_IS_DIR);
-+	isdvd = g_file_test (path, G_FILE_TEST_IS_DIR);
- 	g_free (path);
- 
- 	/* try the other name, if needed */
--	if (retval == FALSE) {
-+	if (isdvd == FALSE) {
- 		path = g_build_path (G_DIR_SEPARATOR_S, mount_point,
- 				     "VIDEO_TS", NULL);
--		retval = g_file_test (path, G_FILE_TEST_IS_DIR);
-+		isdvd = g_file_test (path, G_FILE_TEST_IS_DIR);
- 		g_free (path);
- 	}
- 
--	if (retval && config.autoplay_dvd)
-+	if (isdvd && config.autoplay_dvd) {
- 		gvm_run_command (device, config.autoplay_dvd_command,
- 				 mount_point, udi);
--
--	return retval;
-+    return TRUE;
-+  }
-+  return FALSE;
- }
- 
- /*
-@@ -288,7 +289,8 @@
-  * unit from a digital camera (e.g., a compact flash card).  If it is, then
-  * ask the user if he wants to import the photos.
-  *
-- * Returns TRUE if there were photos on this device, FALSE otherwise
-+ * Returns TRUE if there were photos on this device were imported, 
-+ * FALSE otherwise
-  *
-  * FIXME: Should probably not prompt the user and just do it automatically.
-  *        This now makes sense, as gphoto added an import mode.
-@@ -306,7 +308,6 @@
- 	if (!g_file_test (dcim_path, G_FILE_TEST_IS_DIR))
- 		goto out;
- 
--	retval = TRUE;
- 	dbg ("Photos detected: %s\n", dcim_path);
- 
- 	/* add the "content.photos" capability to this device */
-@@ -314,6 +315,7 @@
- 		warn ("failed to set content.photos on %s\n", device);
- 
- 	if (config.autophoto) {
-+		retval=TRUE;
- 		askme = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING,
- 						GTK_BUTTONS_NONE,
- 						_("Import photos from device?"));

Copied: packages/experimental/gnome-volume-manager/debian/patches/03_kernel_hint.patch (from rev 248, packages/unstable/gnome-volume-manager/debian/patches/03_kernel_hint.patch)

Copied: packages/experimental/gnome-volume-manager/debian/patches/04_reconnect_on_dbus_exit.patch (from rev 248, packages/unstable/gnome-volume-manager/debian/patches/04_reconnect_on_dbus_exit.patch)

Copied: packages/experimental/gnome-volume-manager/debian/patches/05_mount_at_start.patch (from rev 248, packages/unstable/gnome-volume-manager/debian/patches/05_mount_at_start.patch)

Deleted: packages/experimental/gnome-volume-manager/debian/patches/06_mount_at_start.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/06_mount_at_start.patch	2005-06-22 09:47:31 UTC (rev 248)
+++ packages/experimental/gnome-volume-manager/debian/patches/06_mount_at_start.patch	2005-06-22 10:32:28 UTC (rev 249)
@@ -1,37 +0,0 @@
-diff -ruN gnome-volume-manager-1.2.1-old/src/manager.c gnome-volume-manager-1.2.1/src/manager.c
---- gnome-volume-manager-1.2.1-old/src/manager.c	2005-05-02 10:29:54.000000000 +0200
-+++ gnome-volume-manager-1.2.1/src/manager.c	2005-05-02 10:32:40.000000000 +0200
-@@ -971,9 +971,8 @@
- 	char **volumes;
- 	char *udi;
- 	char *device_file;
--
--	if (!config.automount_media)
--		return;
-+  char *drive_udi = NULL;
-+  gboolean do_mount;
- 
- 	volumes = hal_find_device_by_capability (ctx, "volume", &num_volumes);
- 	for (i = 0; i < num_volumes; i++) {
-@@ -994,6 +993,21 @@
- 			    "filesystem") != 0)
- 			continue;
- 
-+    drive_udi = hal_device_get_property_string(ctx, udi, "info.parent");
-+
-+		do_mount = TRUE;
-+		if (hal_device_property_exists(ctx, drive_udi, "storage.hotpluggable") &&
-+	      hal_device_get_property_bool(ctx, drive_udi, "storage.hotpluggable")) {
-+			do_mount = config.automount_drives;
-+		} else if (
-+        hal_device_property_exists(ctx, drive_udi, "storage.removable") &&
-+			  hal_device_get_property_bool(ctx, drive_udi, "storage.removable")) {
-+			do_mount = config.automount_media;
-+		} 
-+    hal_free_string(drive_udi);
-+    
-+    if (!do_mount) continue;
-+
- 		device_file = hal_device_get_property_string (ctx, udi,
- 							      "block.device");
- 

Copied: packages/experimental/gnome-volume-manager/debian/patches/06_pmount_crypt.patch (from rev 248, packages/unstable/gnome-volume-manager/debian/patches/06_pmount_crypt.patch)

Copied: packages/experimental/gnome-volume-manager/debian/patches/07_dialogs_info.patch (from rev 248, packages/unstable/gnome-volume-manager/debian/patches/07_dialogs_info.patch)

Copied: packages/experimental/gnome-volume-manager/debian/patches/08_photographss_typo.patch (from rev 248, packages/unstable/gnome-volume-manager/debian/patches/08_photographss_typo.patch)

Copied: packages/experimental/gnome-volume-manager/debian/patches/09_nautilus_path.patch (from rev 248, packages/unstable/gnome-volume-manager/debian/patches/09_nautilus_path.patch)

Copied: packages/experimental/gnome-volume-manager/debian/patches/10_improve_mounting.patch (from rev 241, packages/experimental/gnome-volume-manager/debian/patches/25_improve_mounting.patch)

Deleted: packages/experimental/gnome-volume-manager/debian/patches/11_dbus_reconnect_on_bus_exit.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/11_dbus_reconnect_on_bus_exit.patch	2005-06-22 09:47:31 UTC (rev 248)
+++ packages/experimental/gnome-volume-manager/debian/patches/11_dbus_reconnect_on_bus_exit.patch	2005-06-22 10:32:28 UTC (rev 249)
@@ -1,149 +0,0 @@
-Files gnome-volume-manager-1.2.0-old/src/.swp and gnome-volume-manager-1.2.0/src/.swp differ
-diff -ruN gnome-volume-manager-1.2.0-old/src/manager.c gnome-volume-manager-1.2.0/src/manager.c
---- gnome-volume-manager-1.2.0-old/src/manager.c	2005-04-11 21:17:39.000000000 +0200
-+++ gnome-volume-manager-1.2.0/src/manager.c	2005-04-11 21:40:57.000000000 +0200
-@@ -51,6 +51,7 @@
- 
- static struct gvm_configuration config;
- static LibHalContext *hal_ctx;
-+static DBusConnection *dbus_ctx;
- 
- /** List of UDI's for volumes mounted by g-v-m that we need to apply policy to*/
- static GSList *mounted_volumes_policy_queue = NULL;
-@@ -58,6 +59,9 @@
- /** List of UDI's of all volumes mounted during the lifetime of the program */
- static GSList *all_mounted_volumes = NULL;
- 
-+static LibHalFunctions * gvm_return_hal_functions ();
-+static LibHalContext * gvm_do_hal_init (LibHalFunctions *functions);
-+
- /*
-  * gvm_load_config - synchronize gconf => config structure
-  */
-@@ -899,6 +903,59 @@
- {
- }
- 
-+/** Invoked by GLib in response to a D-BUS disconnect event.
-+ *
-+ * @param  data                 Context pointer
-+ */
-+static gboolean
-+gvm_reconnect_to_hal (gpointer data __attribute__((__unused__)))
-+{
-+	static unsigned int retries = 0;
-+
-+	g_message ("Trying a reconnect ...");
-+	hal_ctx = gvm_do_hal_init (gvm_return_hal_functions ());
-+	if (hal_ctx != NULL) {
-+		g_message ("Reconnected OK.");
-+		retries = 0;
-+		return FALSE;
-+	}
-+
-+	/* Retry later if it failed. */
-+	if (retries++ < 100)
-+		return TRUE;
-+
-+	/* Too many retries; clean up and bail. */
-+	gtk_main_quit ();
-+	return FALSE;
-+}
-+
-+/** Invoked by D-BUS to filter messages.
-+ *
-+ * @param  connection  D-BUS connection
-+ * @param  message     D-BUS message
-+ * @param  user_data   Context pointer
-+ */
-+static DBusHandlerResult
-+gvm_do_filter_dbus_msg (DBusConnection *connection __attribute__((__unused__)),
-+                        DBusMessage *message,
-+                        void *user_data __attribute__((__unused__)))
-+{
-+	if (dbus_message_is_signal (message,
-+	                            DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
-+	                            "Disconnected")) {
-+		g_timeout_add(500, gvm_reconnect_to_hal, NULL);
-+		if (hal_ctx) {
-+		  hal_shutdown (hal_ctx);
-+		}
-+		hal_ctx = NULL;
-+		dbus_connection_unref (dbus_ctx);
-+		dbus_ctx = NULL;
-+		return DBUS_HANDLER_RESULT_HANDLED;
-+	}
-+	else
-+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-+}
-+
- /** Invoked by libhal for integration with our mainloop. 
-  *
-  *  @param  ctx                 LibHal context
-@@ -908,7 +965,12 @@
- hal_mainloop_integration (LibHalContext *ctx __attribute__((__unused__)),
- 			  DBusConnection * dbus_connection)
- {
-+	dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE);
- 	dbus_connection_setup_with_g_main (dbus_connection, NULL);
-+
-+	dbus_ctx = dbus_connection;
-+	dbus_connection_add_filter (dbus_connection, gvm_do_filter_dbus_msg,
-+	                            NULL, NULL);
- }
- 
- /** Internal HAL initialization function
-@@ -1029,7 +1091,12 @@
- 	char *device_file;
- 	char *udi;
- 
--	dbg ("unmounting all volumes that we saw mounted in our life\n");
-+  if (ctx == NULL) {
-+    dbg("No hal connection! can't unmount volumes");
-+    return;
-+  } else {
-+	  dbg ("unmounting all volumes that we saw mounted in our life\n");
-+  }
- 
- 	for (i = all_mounted_volumes; i != NULL; i = g_slist_next (i)) {
- 
-@@ -1101,17 +1168,23 @@
- 	gtk_main_quit ();
- }
- 
-+static LibHalFunctions *
-+gvm_return_hal_functions ()
-+{
-+	static LibHalFunctions hf = { hal_mainloop_integration,
-+	                              hal_device_added,
-+	                              hal_device_removed,
-+	                              hal_device_new_capability,
-+	                              hal_device_lost_capability,
-+	                              hal_property_modified,
-+	                              hal_device_condition };
-+	return &hf;
-+}
-+
- int
- main (int argc, char *argv[])
- {
- 	GnomeClient *client;
--	LibHalFunctions hal_functions = { hal_mainloop_integration,
--					  hal_device_added,
--					  hal_device_removed,
--					  hal_device_new_capability,
--					  hal_device_lost_capability,
--					  hal_property_modified,
--					  hal_device_condition };
- 
- 	gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE,
- 			    argc, argv, GNOME_PARAM_NONE);
-@@ -1132,7 +1205,7 @@
- 	gtk_signal_connect (GTK_OBJECT (client), "die",
- 			    GTK_SIGNAL_FUNC (gvm_die), NULL);
- 
--	hal_ctx = gvm_do_hal_init (&hal_functions);
-+	hal_ctx = gvm_do_hal_init (gvm_return_hal_functions ());
- 	if (!hal_ctx)
- 		return 1;
- 

Copied: packages/experimental/gnome-volume-manager/debian/patches/11_track_cdrom_changes.patch (from rev 241, packages/experimental/gnome-volume-manager/debian/patches/33_track_cdrom_changes.patch)

Copied: packages/experimental/gnome-volume-manager/debian/patches/12_no_autorun.patch (from rev 241, packages/experimental/gnome-volume-manager/debian/patches/40_no_autorun.patch)

Deleted: packages/experimental/gnome-volume-manager/debian/patches/13_dont_set_capabilities.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/13_dont_set_capabilities.patch	2005-06-22 09:47:31 UTC (rev 248)
+++ packages/experimental/gnome-volume-manager/debian/patches/13_dont_set_capabilities.patch	2005-06-22 10:32:28 UTC (rev 249)
@@ -1,14 +0,0 @@
-diff -ruN gnome-volume-manager-old/src/manager.c gnome-volume-manager/src/manager.c
---- gnome-volume-manager-old/src/manager.c	2004-11-18 15:05:44.994094000 +0100
-+++ gnome-volume-manager/src/manager.c	2004-11-18 15:05:45.414120123 +0100
-@@ -328,10 +328,6 @@
- 
- 	dbg ("Photos detected: %s\n", dcim_path);
- 
--	/* add the "content.photos" capability to this device */
--	if (!hal_device_add_capability (hal_ctx, udi, "content.photos"))
--		warn ("failed to set content.photos on %s\n", device);
--
- 	if (config.autophoto) {
- 	  retval = TRUE;
- 		askme = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_QUESTION,

Deleted: packages/experimental/gnome-volume-manager/debian/patches/20_specify_programs.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/20_specify_programs.patch	2005-06-22 09:47:31 UTC (rev 248)
+++ packages/experimental/gnome-volume-manager/debian/patches/20_specify_programs.patch	2005-06-22 10:32:28 UTC (rev 249)
@@ -1,719 +0,0 @@
-diff -ruN gnome-volume-manager-1.2.1-old/configure gnome-volume-manager-1.2.1/configure
---- gnome-volume-manager-1.2.1-old/configure	2005-03-30 23:54:30.000000000 +0200
-+++ gnome-volume-manager-1.2.1/configure	2005-04-29 12:38:02.000000000 +0200
-@@ -309,7 +309,7 @@
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE mount_path umount_path nautilus_path ALL_LINGUAS GETTEXT_PACKAGE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT CPP EGREP USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB PKG_CONFIG GVM_CFLAGS GVM_LIBS CAPPLET_CFLAGS CAPPLET_LIBS GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE mount_program umount_program nautilus_path ALL_LINGUAS GETTEXT_PACKAGE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT CPP EGREP USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB PKG_CONFIG GVM_CFLAGS GVM_LIBS CAPPLET_CFLAGS CAPPLET_LIBS GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -854,6 +854,9 @@
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-+  --with-mount-program=program Program to run to mount a device
-+  --with-umount-program=program Program to run to umount a device
-+  --with-nautilus=path Path to nautilus
-   --with-gconf-source=sourceaddress      Config database for installing schema files.
-   --with-gconf-schema-file-dir=dir        Directory for installing schema files.
- 
-@@ -957,7 +960,7 @@
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi
--    cd $ac_popdir
-+    cd "$ac_popdir"
-   done
- fi
- 
-@@ -2323,8 +2326,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2382,8 +2384,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2499,8 +2500,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2554,8 +2554,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2600,8 +2599,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2645,8 +2643,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2865,12 +2862,12 @@
- set dummy mount; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_mount_path+set}" = set; then
-+if test "${ac_cv_path_mount_program+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  case $mount_path in
-+  case $mount_program in
-   [\\/]* | ?:[\\/]*)
--  ac_cv_path_mount_path="$mount_path" # Let the user override the test with a path.
-+  ac_cv_path_mount_program="$mount_program" # Let the user override the test with a path.
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2880,37 +2877,38 @@
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_mount_path="$as_dir/$ac_word$ac_exec_ext"
-+    ac_cv_path_mount_program="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
- 
--  test -z "$ac_cv_path_mount_path" && ac_cv_path_mount_path="no"
-+  test -z "$ac_cv_path_mount_program" && ac_cv_path_mount_program="no"
-   ;;
- esac
- fi
--mount_path=$ac_cv_path_mount_path
-+mount_program=$ac_cv_path_mount_program
- 
--if test -n "$mount_path"; then
--  echo "$as_me:$LINENO: result: $mount_path" >&5
--echo "${ECHO_T}$mount_path" >&6
-+if test -n "$mount_program"; then
-+  echo "$as_me:$LINENO: result: $mount_program" >&5
-+echo "${ECHO_T}$mount_program" >&6
- else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-+mount_program="${mount_program} %d"
- # Extract the first word of "umount", so it can be a program name with args.
- set dummy umount; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_umount_path+set}" = set; then
-+if test "${ac_cv_path_umount_program+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  case $umount_path in
-+  case $umount_program in
-   [\\/]* | ?:[\\/]*)
--  ac_cv_path_umount_path="$umount_path" # Let the user override the test with a path.
-+  ac_cv_path_umount_program="$umount_program" # Let the user override the test with a path.
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2920,27 +2918,28 @@
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_umount_path="$as_dir/$ac_word$ac_exec_ext"
-+    ac_cv_path_umount_program="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
- 
--  test -z "$ac_cv_path_umount_path" && ac_cv_path_umount_path="no"
-+  test -z "$ac_cv_path_umount_program" && ac_cv_path_umount_program="no"
-   ;;
- esac
- fi
--umount_path=$ac_cv_path_umount_path
-+umount_program=$ac_cv_path_umount_program
- 
--if test -n "$umount_path"; then
--  echo "$as_me:$LINENO: result: $umount_path" >&5
--echo "${ECHO_T}$umount_path" >&6
-+if test -n "$umount_program"; then
-+  echo "$as_me:$LINENO: result: $umount_program" >&5
-+echo "${ECHO_T}$umount_program" >&6
- else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-+umount_program="${umount_program} %d"
- # Extract the first word of "nautilus", so it can be a program name with args.
- set dummy nautilus; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -2983,13 +2982,33 @@
- 
- 
- 
-+# Check whether --with-mount-program or --without-mount-program was given.
-+if test "${with_mount_program+set}" = set; then
-+  withval="$with_mount_program"
-+  mount_program="$withval"
-+fi;
-+
-+# Check whether --with-umount-program or --without-umount-program was given.
-+if test "${with_umount_program+set}" = set; then
-+  withval="$with_umount_program"
-+  umount_program="$withval"
-+fi;
-+
-+# Check whether --with-nautilus or --without-nautilus was given.
-+if test "${with_nautilus+set}" = set; then
-+  withval="$with_nautilus"
-+  nautilus_path="$withval"
-+fi;
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
--#define BIN_MOUNT "${mount_path}"
-+#define BIN_MOUNT "${mount_program}"
- _ACEOF
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define BIN_UMOUNT "${umount_path}"
-+#define BIN_UMOUNT "${umount_program}"
- _ACEOF
- 
- 
-@@ -3678,8 +3697,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3849,8 +3867,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3918,8 +3935,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4064,8 +4080,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4136,8 +4151,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4281,8 +4295,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4340,8 +4353,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4438,8 +4450,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4518,8 +4529,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4583,8 +4593,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4648,8 +4657,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4726,8 +4734,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4791,8 +4798,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4908,8 +4914,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5076,8 +5081,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5210,8 +5214,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5296,8 +5299,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6442,8 +6444,8 @@
- s, at CCDEPMODE@,$CCDEPMODE,;t t
- s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
- s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
--s, at mount_path@,$mount_path,;t t
--s, at umount_path@,$umount_path,;t t
-+s, at mount_program@,$mount_program,;t t
-+s, at umount_program@,$umount_program,;t t
- s, at nautilus_path@,$nautilus_path,;t t
- s, at ALL_LINGUAS@,$ALL_LINGUAS,;t t
- s, at GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
-@@ -6666,11 +6668,6 @@
-   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-   esac
- 
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-@@ -6709,6 +6706,12 @@
- 	 fi;;
-       esac
-     done` || { (exit 1); exit 1; }
-+
-+  if test x"$ac_file" != x-; then
-+    { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    rm -f "$ac_file"
-+  fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
-diff -ruN gnome-volume-manager-1.2.1-old/configure.in gnome-volume-manager-1.2.1/configure.in
---- gnome-volume-manager-1.2.1-old/configure.in	2005-03-30 23:52:42.000000000 +0200
-+++ gnome-volume-manager-1.2.1/configure.in	2005-04-29 12:32:32.000000000 +0200
-@@ -8,12 +8,25 @@
- AC_PROG_CC
- 
- 
--AC_PATH_PROG(mount_path, mount, no)
--AC_PATH_PROG(umount_path, umount, no)
-+AC_PATH_PROG(mount_program, mount, no)
-+mount_program="${mount_program} %d"
-+AC_PATH_PROG(umount_program, umount, no)
-+umount_program="${umount_program} %d"
- AC_PATH_PROG(nautilus_path, nautilus, no)
- 
--AC_DEFINE_UNQUOTED([BIN_MOUNT], ["${mount_path}"], [path to mount])
--AC_DEFINE_UNQUOTED([BIN_UMOUNT], ["${umount_path}"], [path to umount])
-+AC_ARG_WITH(mount-program, 
-+            [  --with-mount-program=program Program to run to mount a device],
-+            mount_program="$withval",)
-+AC_ARG_WITH(umount-program, 
-+            [  --with-umount-program=program Program to run to umount a device],
-+            umount_program="$withval",)
-+AC_ARG_WITH(nautilus, 
-+            [  --with-nautilus=path Path to nautilus],
-+            nautilus_path="$withval",)
-+
-+
-+AC_DEFINE_UNQUOTED([BIN_MOUNT], ["${mount_program}"], [mount program])
-+AC_DEFINE_UNQUOTED([BIN_UMOUNT], ["${umount_program}"], [umount program])
- AC_DEFINE_UNQUOTED([BIN_NAUTILUS], ["${nautilus_path}"], [nautilus command])
- 
- 
-diff -ruN gnome-volume-manager-1.2.1-old/src/manager.c gnome-volume-manager-1.2.1/src/manager.c
---- gnome-volume-manager-1.2.1-old/src/manager.c	2005-04-29 12:32:32.000000000 +0200
-+++ gnome-volume-manager-1.2.1/src/manager.c	2005-04-29 12:32:32.000000000 +0200
-@@ -145,20 +145,20 @@
- 				 gvm_config_changed, NULL, NULL, NULL);
- }
- 
--/*
-- * gvm_run_command - run the given command, replacing %d with the device node,
-- * %h with the HAL UDI and %m with the given path. Bails out if the command
-- * requires a given %d,%h or %m and this is NULL.
-+/* parses the given command into a command string. It replaces %d with the 
-+ * device node, * %h with the HAL UDI and %m with the given path. 
-+ *
-+ * Returns NULL f the command * requires a given %d,%h or %m and this is NULL.
-  */
--static void
--gvm_run_command (const char *device, const char *command, 
--		 const char *path, const char *udi)
--{
--	char *argv[4];
-+
-+static gchar *
-+gvm_parse_command(const char *device, const char *command, 
-+                  const char *path, const char *udi) {
- 	gchar *new_command;
- 	GError *error = NULL;
- 	GString *exec = g_string_new (NULL);
- 	char *p, *q;
-+  gchar *result, *tmp;
- 
- 	/* perform s/%d/device/, s/%m/path/ and s/%h/udi/ */
- 	new_command = g_strdup (command);
-@@ -170,7 +170,9 @@
- 				goto error;
- 			*p = '\0';
- 			g_string_append (exec, q);
--			g_string_append (exec, device);
-+      tmp = g_shell_quote(device);
-+			g_string_append (exec, tmp);
-+      g_free(tmp);
- 			q = p + 2;
- 			p = p + 2;
- 		} else if (*(p + 1) == 'm') {
-@@ -178,7 +180,9 @@
- 				goto error;
- 			*p = '\0';
- 			g_string_append (exec, q);
--			g_string_append (exec, path);
-+      tmp = g_shell_quote(path);
-+			g_string_append (exec, tmp);
-+      g_free(tmp);
- 			q = p + 2;
- 			p = p + 2;
- 		} else if (*(p + 1) == 'h') {
-@@ -186,34 +190,77 @@
- 				goto error;
- 			*p = '\0';
- 			g_string_append (exec, q);
--			g_string_append (exec, "\"");
--			g_string_append (exec, udi);
--			g_string_append (exec, "\"");
-+      tmp = g_shell_quote(udi);
-+			g_string_append (exec, tmp);
-+      g_free(tmp);
- 			q = p + 2;
- 			p = p + 2;
- 		}
- 	}
- 	g_string_append (exec, q);
-+  result = exec->str;
- 
--	argv[0] = "/bin/sh";
--	argv[1] = "-c";
--	argv[2] = exec->str;
--	argv[3] = NULL;
--
--	g_spawn_async (g_get_home_dir (), argv, NULL, 0, NULL, NULL,
--		       NULL, &error);
--	if (error)
--		warn ("failed to exec %s: %s\n", exec->str, error->message);
--
--	g_string_free (exec, TRUE);
-+	g_string_free (exec, FALSE);
- 	g_free (new_command);
--	return;
-+	return result;
- 
- error:
- 	warn ("command '%s' required unavailable parameter; " 
- 	      "%%d='%s' %%m='%s' %%h='%s'\n", command, device, path, udi);
- 	g_string_free (exec, TRUE);
- 	g_free (new_command);	
-+  return NULL;
-+}
-+
-+/*
-+ * gvm_run_command - run the given command, replacing %d with the device node,
-+ * %h with the HAL UDI and %m with the given path. Bails out if the command
-+ * requires a given %d,%h or %m and this is NULL.
-+ */
-+static void
-+gvm_run_command (const char *device, const char *command, 
-+		 const char *path, const char *udi)
-+{
-+  char *cmd;
-+  GError *error = NULL;
-+
-+  cmd = gvm_parse_command(device, command, path, udi);
-+  if (cmd == NULL) {
-+    return;
-+  }
-+	if (!g_spawn_command_line_async (cmd, &error)) 
-+		warn ("failed to exec %s: %s\n", cmd, error->message);
-+
-+	g_free (cmd);
-+	return;
-+}
-+
-+/*
-+ * gvm_run_command_sync - run the given command, replacing %d with the device
-+ * node, %h with the HAL UDI and %m with the given path. Bails out if the
-+ * command requires a given %d,%h or %m and this is NULL.
-+ *
-+ * Returns the exitcode of the command if run and -1 if failed
-+ */
-+static gint 
-+gvm_run_command_sync (const char *device, const char *command, 
-+		 const char *path, const char *udi)
-+{
-+  char *cmd;
-+  gint exit_status;
-+  GError *error = NULL;
-+
-+  cmd = gvm_parse_command(device, command, path, udi);
-+  if (cmd == NULL) {
-+    return -1;
-+  }
-+	if (!g_spawn_command_line_sync (cmd, NULL, NULL, &exit_status, &error)) {
-+		warn ("failed to exec %s: %s\n", cmd, error->message);
-+	  g_free (cmd);
-+    return -1;
-+  }
-+	g_free (cmd);
-+  return exit_status;
- }
- 
- /*
-@@ -473,23 +520,9 @@
-  * @return TRUE iff the mount was succesful
-  */
- static gboolean
--gvm_device_mount (char *device)
-+gvm_device_mount (const char *udi, const char *device)
- {
--	char *argv[3];
--	GError *error = NULL;
--	gint exit_status;
--
--	argv[0] = BIN_MOUNT;
--	argv[1] = device;
--	argv[2] = NULL;
--
--	if (!g_spawn_sync (g_get_home_dir (), argv, NULL, 0, NULL,
--			   NULL, NULL, NULL, &exit_status, &error)) {
--		warn ("failed to exec " BIN_MOUNT ": %s\n", error->message);
--		return FALSE;
--	}
--
--	return (exit_status == 0);
-+  return (gvm_run_command_sync(device , BIN_MOUNT, NULL, udi) == 0);
- }
- 
- /*
-@@ -501,23 +534,8 @@
-  * @return TRUE iff the mount was succesful
-  */
- static gboolean
--gvm_device_unmount (char *device)
--{
--	char *argv[3];
--	GError *error = NULL;
--	gint exit_status;
--
--	argv[0] = BIN_UMOUNT;
--	argv[1] = device;
--	argv[2] = NULL;
--
--	if (!g_spawn_sync (g_get_home_dir (), argv, NULL, 0, NULL,
--			   NULL, NULL, NULL, &exit_status, &error)) {
--		warn ("failed to exec " BIN_MOUNT ": %s\n", error->message);
--		return FALSE;
--	}
--
--	return (exit_status == 0);
-+gvm_device_unmount (const char *udi, const char *device) {
-+  return (gvm_run_command_sync(device, BIN_UMOUNT, NULL, udi) == 0);
- }
- 
- /*
-@@ -579,7 +597,7 @@
- 
- 	switch (action) {
- 	case MOUNT:
--		gvm_device_mount (device);
-+		gvm_device_mount (udi, device);
- 		mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
- 		break;
- 	case PLAY:
-@@ -656,7 +674,7 @@
- 		gvm_ask_mixed (udi);
- 	} else if (has_data) {
- 		if (config.automount_media) {
--			gvm_device_mount (device);
-+			gvm_device_mount (udi, device);
- 			mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
- 		}
- 	} else if (is_blank) {
-@@ -713,7 +731,7 @@
- 		dbg ("Added: %s\n", device);
- 		
- 		if (config.automount_drives) {
--			gvm_device_mount (device);
-+			gvm_device_mount (udi, device);
- 			mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
- 		}
- 	}
-@@ -777,7 +795,7 @@
- 	dbg ("Added: %s\n", device);
- 	
- 	if (config.automount_drives) {
--		gvm_device_mount (device);
-+		gvm_device_mount (udi, device);
- 		mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
- 	}
- 	
-@@ -1072,7 +1090,7 @@
- 
- 			dbg ("mount_all: mounting %s\n", device_file);
- 
--			gvm_device_mount (device_file);
-+			gvm_device_mount (udi, device_file);
- 
- 			hal_free_string (device_file);
- 		} else
-@@ -1111,7 +1129,7 @@
- 
- 			dbg ("unmount_all: unmounting %s\n", device_file);
- 
--			gvm_device_unmount (device_file);
-+			gvm_device_unmount (udi, device_file);
- 			hal_free_string (device_file);
- 		} else {
- 			warn ("no device_file for udi=%s\n", udi);

Deleted: packages/experimental/gnome-volume-manager/debian/patches/25_improve_mounting.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/25_improve_mounting.patch	2005-06-22 09:47:31 UTC (rev 248)
+++ packages/experimental/gnome-volume-manager/debian/patches/25_improve_mounting.patch	2005-06-22 10:32:28 UTC (rev 249)
@@ -1,164 +0,0 @@
-diff -ruN gnome-volume-manager-old/src/manager.c gnome-volume-manager/src/manager.c
---- gnome-volume-manager-old/src/manager.c	2004-11-19 13:27:47.299259000 +0100
-+++ gnome-volume-manager/src/manager.c	2004-11-19 14:11:09.564039480 +0100
-@@ -491,6 +491,27 @@
- 	hal_free_string (mount_point);
- }
- 
-+/* Returns true if the storage policy indicates this should be manually 
-+ * mounted */
-+static gboolean
-+gvm_is_manual_mount(LibHalContext *ctx, const char *udi) {
-+  gchar *parent;
-+  gboolean ret = FALSE;
-+
-+  parent = hal_device_get_property_string(ctx, udi, "info.parent");
-+  if (hal_device_property_exists (hal_ctx, parent, 
-+                                  "storage.automount_enabled_hint")) {
-+      ret = !hal_device_get_property_bool (hal_ctx, parent,
-+                                          "storage.automount_enabled_hint");
-+  }
-+  if (hal_device_property_exists (hal_ctx, udi, 
-+                                  "storage.automount_enabled_hint")) {
-+      ret = !hal_device_get_property_bool (hal_ctx, udi,
-+                                          "storage.automount_enabled_hint");
-+  }
-+  return ret;
-+}
-+
- /*
-  * gvm_device_mount - use BIN_MOUNT to mount the given device node.
-  *
-@@ -500,9 +521,47 @@
-  * @return TRUE iff the mount was succesful
-  */
- static gboolean
--gvm_device_mount (const char *udi, const char *device)
-+gvm_device_mount (const char *udi, const char *device, gboolean run_policy)
- {
--  return (gvm_run_command_sync(device , BIN_MOUNT, NULL, udi) == 0);
-+    gboolean ret = FALSE;
-+    /* don't attempt to mount if the automount_hint is false */
-+    if (gvm_is_manual_mount(hal_ctx, udi)) {
-+      dbg("%s has storage.automount_enabled_hint == false, not mounting\n"
-+          , udi);
-+      return FALSE;
-+    }
-+		/* don't attempt to mount already mounted volumes */
-+		if (!hal_device_property_exists (hal_ctx, udi, 
-+						"volume.is_mounted") ||
-+		    hal_device_get_property_bool (hal_ctx, udi, 
-+						  "volume.is_mounted")) {
-+        dbg("%s already mounted, not mounting again\n", udi);
-+			return FALSE;
-+    }
-+
-+		/* only mount if the block device got a sensible filesystem 
-+     * or when hal couldn't detect the filesystem */
-+		if (!hal_device_property_exists (hal_ctx, udi, 
-+						"volume.fsusage") ||
-+		    (strcmp (hal_device_get_property_string (hal_ctx, udi, 
-+							    "volume.fsusage"), "filesystem") != 0 
-+         && strcmp (hal_device_get_property_string (hal_ctx, udi,
-+                               "volume.fsusage"), "") != 0)) {
-+        dbg("%s isn't a filesystem\n", udi);
-+      return FALSE;
-+    }
-+
-+    ret = (gvm_run_command_sync(device , BIN_MOUNT, NULL, udi) == 0);
-+    if (ret) {
-+  		/* add to list of all volumes mounted during lifetime */
-+  		all_mounted_volumes = 
-+         g_slist_append (all_mounted_volumes, g_strdup (udi));
-+    }
-+    if (ret && run_policy) {
-+		  mounted_volumes_policy_queue = 
-+        g_slist_append (mounted_volumes_policy_queue, g_strdup(udi));
-+    }
-+    return ret;
- }
- 
- /*
-@@ -572,8 +631,7 @@
- 
- 	switch (action) {
- 	case MOUNT:
--		gvm_device_mount (udi, device);
--		mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
-+		gvm_device_mount (udi, device, TRUE);
- 		break;
- 	case PLAY:
- 		gvm_run_cdplayer (device, device, udi);
-@@ -649,8 +707,7 @@
- 		gvm_ask_mixed (udi);
- 	} else if (has_data) {
- 		if (config.automount_media) {
--			gvm_device_mount (udi, device);
--			mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
-+			gvm_device_mount (udi, device, TRUE);
- 		}
- 	} else if (is_blank) {
- 		if (gvm_device_is_writer (drive_udi))
-@@ -707,8 +764,7 @@
- 		dbg ("Added: %s\n", device);
- 		
- 		if (config.automount_drives) {
--			gvm_device_mount (udi, device);
--			mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
-+			gvm_device_mount (udi, device, TRUE);
- 		}
- 	}
- 
-@@ -771,8 +827,7 @@
- 	dbg ("Added: %s\n", device);
- 	
- 	if (config.automount_drives) {
--		gvm_device_mount (udi, device);
--		mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
-+		gvm_device_mount (udi, device, TRUE);
- 	}
- 	
- out:
-@@ -845,10 +900,6 @@
- 
- 		dbg ("Mounted: %s\n", udi);
- 
--		/* add to list of all volumes mounted during lifetime */
--		all_mounted_volumes = g_slist_append (all_mounted_volumes,
--						      g_strdup (udi));
--
- 		policy_udi = g_slist_find_custom (mounted_volumes_policy_queue, 
- 						  udi, 
- 						  (GCompareFunc)g_ascii_strcasecmp);
-@@ -1022,22 +1073,6 @@
- 	volumes = hal_find_device_by_capability (ctx, "volume", &num_volumes);
- 	for (i = 0; i < num_volumes; i++) {
- 		udi = volumes [i];
--
--		/* don't attempt to mount already mounted volumes */
--		if (!hal_device_property_exists (ctx, udi, 
--						"volume.is_mounted") ||
--		    hal_device_get_property_bool (ctx, udi, 
--						  "volume.is_mounted"))
--			continue;
--
--		/* only mount if the block device got a sensible filesystem */
--		if (!hal_device_property_exists (ctx, udi, 
--						"volume.fsusage") ||
--		    strcmp (hal_device_get_property_string (ctx, udi, 
--							    "volume.fsusage"), 
--			    "filesystem") != 0)
--			continue;
--
-     drive_udi = hal_device_get_property_string(ctx, udi, "info.parent");
- 
- 		if (hal_device_property_exists(ctx, drive_udi, "storage.hotpluggable") &&
-@@ -1059,7 +1094,7 @@
- 
- 			dbg ("mount_all: mounting %s\n", device_file);
- 
--			gvm_device_mount (udi, device_file);
-+			gvm_device_mount (udi, device_file, FALSE);
- 
- 			hal_free_string (device_file);
- 		} else

Deleted: packages/experimental/gnome-volume-manager/debian/patches/30_26_kernel_hint.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/30_26_kernel_hint.patch	2005-06-22 09:47:31 UTC (rev 248)
+++ packages/experimental/gnome-volume-manager/debian/patches/30_26_kernel_hint.patch	2005-06-22 10:32:28 UTC (rev 249)
@@ -1,13 +0,0 @@
-diff -ruN gnome-volume-manager-1.1.3-old/src/properties.c gnome-volume-manager-1.1.3/src/properties.c
---- gnome-volume-manager-1.1.3-old/src/properties.c	2005-01-23 23:11:02.000000000 +0100
-+++ gnome-volume-manager-1.1.3/src/properties.c	2005-02-08 13:27:04.838032975 +0100
-@@ -376,7 +376,8 @@
- 		gtk_message_dialog_format_secondary_text (GTK_DIALOG (dialog),
- 							  _("The \"hald\" service is required but not currently "
- 							    "running. Enable the service and rerun this applet, "
--							    "or contact your system administrator."));
-+							    "or contact your system administrator. Note: You "
-+							    "need Linux kernel 2.6 for volume management to work."));
- 
- 		gtk_dialog_run (GTK_DIALOG (dialog));
- 		gtk_widget_destroy (dialog);

Deleted: packages/experimental/gnome-volume-manager/debian/patches/33_track_cdrom_changes.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/33_track_cdrom_changes.patch	2005-06-22 09:47:31 UTC (rev 248)
+++ packages/experimental/gnome-volume-manager/debian/patches/33_track_cdrom_changes.patch	2005-06-22 10:32:28 UTC (rev 249)
@@ -1,64 +0,0 @@
-diff -ruN gnome-volume-manager-1.1.3-old/src/manager.c gnome-volume-manager-1.1.3/src/manager.c
---- gnome-volume-manager-1.1.3-old/src/manager.c	2005-02-23 15:54:46.000000000 +0100
-+++ gnome-volume-manager-1.1.3/src/manager.c	2005-02-23 15:55:55.000000000 +0100
-@@ -678,11 +678,9 @@
-     }
- 
-     ret = (gvm_run_command_sync(device , BIN_MOUNT, NULL, udi) == 0);
--    if (ret) {
-   		/* add to list of all volumes mounted during lifetime */
-   		all_mounted_volumes = 
-          g_slist_append (all_mounted_volumes, g_strdup (udi));
--    }
-     if (ret && run_policy) {
- 		  mounted_volumes_policy_queue = 
-         g_slist_append (mounted_volumes_policy_queue, g_strdup(udi));
-@@ -815,6 +813,7 @@
- 	dbus_bool_t has_audio;
- 	dbus_bool_t has_data;
- 	dbus_bool_t is_blank;
-+	GSList *i;
- 
- 	has_audio = hal_device_get_property_bool (hal_ctx, udi,
- 						  "volume.disc.has_audio");
-@@ -831,6 +830,17 @@
- 		goto out;
- 	}
- 
-+        /* check whether we already saw the insertion/change of this device
-+         * without a removal; this happens on HAL restarts */
-+        for (i=all_mounted_volumes; i != NULL; i = g_slist_next (i))
-+                if (strcmp (udi, (const char *)i->data) == 0) {
-+                    dbg ("Detected change event on already handled device, probably due to a hald restart\n");
-+                    goto out;
-+                }
-+
-+        /* add to the list of mounted volumes */
-+        all_mounted_volumes = g_slist_append (all_mounted_volumes, g_strdup (udi));
-+
- 	if (has_audio && (!has_data)) {
- 		gvm_run_cdplayer (device, device, udi);
- 	} else if (has_audio && has_data) {
-@@ -974,7 +984,22 @@
- hal_device_removed (LibHalContext *ctx __attribute__((__unused__)), 
- 		    const char *udi)
- {
-+	GSList *i;
-+	GSList *next;
-+
- 	dbg ("Device removed: %s\n", udi);
-+        /* remove from list of all volumes mounted during lifetime */
-+
-+        for (i=all_mounted_volumes; i != NULL; i = next) {
-+                next = g_slist_next (i);
-+                if (strcmp (udi, (const char *)i->data) == 0) {
-+                        g_free (i->data);
-+                        all_mounted_volumes = 
-+                                g_slist_delete_link (
-+                                        all_mounted_volumes, i);
-+                        break;
-+                }
-+        }
- }
- 
- /** Invoked when device in the Global Device List acquires a new capability.

Deleted: packages/experimental/gnome-volume-manager/debian/patches/34_compiler_warnings.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/34_compiler_warnings.patch	2005-06-22 09:47:31 UTC (rev 248)
+++ packages/experimental/gnome-volume-manager/debian/patches/34_compiler_warnings.patch	2005-06-22 10:32:28 UTC (rev 249)
@@ -1,29 +0,0 @@
-diff -ruN gnome-volume-manager-1.2.1-old/src/manager.c gnome-volume-manager-1.2.1/src/manager.c
---- gnome-volume-manager-1.2.1-old/src/manager.c	2005-04-29 12:39:34.000000000 +0200
-+++ gnome-volume-manager-1.2.1/src/manager.c	2005-04-29 12:48:20.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <gdk/gdkx.h>
- #include <dbus/dbus.h>
- #include <dbus/dbus-glib.h>
-+#include <dbus/dbus-glib-lowlevel.h>
- #include <libhal.h>
- #include <signal.h>
- 
-@@ -155,7 +156,6 @@
- gvm_parse_command(const char *device, const char *command, 
-                   const char *path, const char *udi) {
- 	gchar *new_command;
--	GError *error = NULL;
- 	GString *exec = g_string_new (NULL);
- 	char *p, *q;
-   gchar *result, *tmp;
-@@ -279,8 +279,7 @@
- 					GTK_BUTTONS_NONE,
- 					_("Run command from inserted media?"));
- 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (askme),
--						  "%s", _("Do you want to run "
--						  "the file \"%s?\""));
-+						  _("Do you want to run the file \"%s?\""), path);
- 	gtk_dialog_add_buttons (GTK_DIALOG (askme),
- 				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
- 				_("_Run Command"), GTK_RESPONSE_ACCEPT,

Deleted: packages/experimental/gnome-volume-manager/debian/patches/40_no_autorun.patch
===================================================================
--- packages/experimental/gnome-volume-manager/debian/patches/40_no_autorun.patch	2005-06-22 09:47:31 UTC (rev 248)
+++ packages/experimental/gnome-volume-manager/debian/patches/40_no_autorun.patch	2005-06-22 10:32:28 UTC (rev 249)
@@ -1,212 +0,0 @@
-diff -ruN gnome-volume-manager-1.1.3-old/gnome-volume-properties.glade gnome-volume-manager-1.1.3/gnome-volume-properties.glade
---- gnome-volume-manager-1.1.3-old/gnome-volume-properties.glade	2005-01-23 23:11:02.000000000 +0100
-+++ gnome-volume-manager-1.1.3/gnome-volume-properties.glade	2005-02-12 19:57:50.560900586 +0100
-@@ -182,25 +182,6 @@
- 			      <property name="fill">False</property>
- 			    </packing>
- 			  </child>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="autorun_cb">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">_Auto-run programs on new drives and media</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
- 			</widget>
- 			<packing>
- 			  <property name="padding">0</property>
-@@ -357,6 +338,7 @@
- 				      <property name="directory_entry">False</property>
- 				      <property name="modal">False</property>
- 				      <property name="use_filechooser">True</property>
-+				      <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
- 
- 				      <child internal-child="entry">
- 					<widget class="GtkEntry" id="command_cdr_entry">
-@@ -367,7 +349,7 @@
- 					  <property name="max_length">0</property>
- 					  <property name="text" translatable="yes"></property>
- 					  <property name="has_frame">True</property>
--					  <property name="invisible_char" translatable="yes">*</property>
-+					  <property name="invisible_char">*</property>
- 					  <property name="activates_default">False</property>
- 					</widget>
- 				      </child>
-@@ -581,6 +563,7 @@
- 				      <property name="directory_entry">False</property>
- 				      <property name="modal">False</property>
- 				      <property name="use_filechooser">True</property>
-+				      <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
- 
- 				      <child internal-child="entry">
- 					<widget class="GtkEntry" id="command_cda_entry">
-@@ -591,7 +574,7 @@
- 					  <property name="max_length">0</property>
- 					  <property name="text" translatable="yes"></property>
- 					  <property name="has_frame">True</property>
--					  <property name="invisible_char" translatable="yes">*</property>
-+					  <property name="invisible_char">*</property>
- 					  <property name="activates_default">False</property>
- 					</widget>
- 				      </child>
-@@ -773,6 +756,7 @@
- 				      <property name="directory_entry">False</property>
- 				      <property name="modal">False</property>
- 				      <property name="use_filechooser">True</property>
-+				      <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
- 
- 				      <child internal-child="entry">
- 					<widget class="GtkEntry" id="command_dvd_entry">
-@@ -783,7 +767,7 @@
- 					  <property name="max_length">0</property>
- 					  <property name="text" translatable="yes"></property>
- 					  <property name="has_frame">True</property>
--					  <property name="invisible_char" translatable="yes">*</property>
-+					  <property name="invisible_char">*</property>
- 					  <property name="activates_default">False</property>
- 					</widget>
- 				      </child>
-@@ -965,6 +949,7 @@
- 				      <property name="directory_entry">False</property>
- 				      <property name="modal">False</property>
- 				      <property name="use_filechooser">True</property>
-+				      <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
- 
- 				      <child internal-child="entry">
- 					<widget class="GtkEntry" id="command_photo_entry">
-@@ -975,7 +960,7 @@
- 					  <property name="max_length">0</property>
- 					  <property name="text" translatable="yes"></property>
- 					  <property name="has_frame">True</property>
--					  <property name="invisible_char" translatable="yes">*</property>
-+					  <property name="invisible_char">*</property>
- 					  <property name="activates_default">False</property>
- 					</widget>
- 				      </child>
-diff -ruN gnome-volume-manager-1.1.3-old/src/manager.c gnome-volume-manager-1.1.3/src/manager.c
---- gnome-volume-manager-1.1.3-old/src/manager.c	2005-02-12 19:57:50.366896000 +0100
-+++ gnome-volume-manager-1.1.3/src/manager.c	2005-02-12 19:57:50.562900632 +0100
-@@ -462,7 +462,7 @@
- 
- 	if (gvm_check_photos (udi, device, mount_point))
- 		goto out;
--
-+/*
- 	if (config.autorun == TRUE && config.autorun_path) {
- 		char **autorun_fns;
- 		int i;
-@@ -500,7 +500,7 @@
- 
- 		g_strfreev (autorun_fns);
- 	}
--	
-+*/
- 	if ((config.autobrowse == TRUE) && (autorun_succeeded == FALSE)) {
- 		gvm_run_command (device, NAUTILUS_COMMAND, mount_point, udi);
- 	}
-diff -ruN gnome-volume-manager-1.1.3-old/src/properties.c gnome-volume-manager-1.1.3/src/properties.c
---- gnome-volume-manager-1.1.3-old/src/properties.c	2005-02-12 19:57:50.432897000 +0100
-+++ gnome-volume-manager-1.1.3/src/properties.c	2005-02-12 19:59:23.414029155 +0100
-@@ -36,7 +36,7 @@
- GtkWidget *automount_drives_cb;
- GtkWidget *automount_media_cb;
- GtkWidget *autobrowse_cb;
--GtkWidget *autorun_cb;
-+//GtkWidget *autorun_cb;
- GtkWidget *autoplay_cda_cb;
- GtkWidget *command_cda_hbox;
- GtkWidget *command_cda_entry;
-@@ -65,8 +65,8 @@
- static void
- set_sensitivity (void)
- {
--	gtk_widget_set_sensitive (autorun_cb,
--			config.automount_media || config.automount_drives);
-+/*	gtk_widget_set_sensitive (autorun_cb,
-+			config.automount_media || config.automount_drives); */
- 	gtk_widget_set_sensitive (command_cda_hbox, config.autoplay_cda);
- 	gtk_widget_set_sensitive (command_cdr_hbox, config.autoburn_cdr);
- 	gtk_widget_set_sensitive (command_dvd_hbox, config.autoplay_dvd);
-@@ -85,8 +85,8 @@
- 			       config.automount_media, NULL);
- 	gconf_client_set_bool (config.client, GCONF_ROOT "autobrowse",
- 			       config.autobrowse, NULL);
--	gconf_client_set_bool (config.client, GCONF_ROOT "autorun",
--			       config.autorun, NULL);
-+/*	gconf_client_set_bool (config.client, GCONF_ROOT "autorun",
-+			       config.autorun, NULL); */
- 	gconf_client_set_bool (config.client, GCONF_ROOT "autoburn_cdr",
- 			       config.autoburn_cdr, NULL);
- 	gconf_client_set_string (config.client,
-@@ -120,7 +120,7 @@
- 			(automount_media_cb)->active;
- 	config.autobrowse = GTK_TOGGLE_BUTTON
- 			(autobrowse_cb)->active;
--	config.autorun = GTK_TOGGLE_BUTTON (autorun_cb)->active;
-+/*	config.autorun = GTK_TOGGLE_BUTTON (autorun_cb)->active; */
- 	config.autoburn_cdr = GTK_TOGGLE_BUTTON (autoburn_cdr_cb)->active;
- 	config.autoplay_cda = GTK_TOGGLE_BUTTON (autoplay_cda_cb)->active;
- 	config.autoplay_dvd = GTK_TOGGLE_BUTTON (autoplay_dvd_cb)->active;
-@@ -170,7 +170,7 @@
- 	GError *error = NULL;
- 
- 	if (!(config.automount_drives || config.automount_media 
--			|| config.autobrowse || config.autorun 
-+			|| config.autobrowse /* || config.autorun */
- 			|| config.autoplay_cda || config.autoplay_dvd 
- 			|| config.autophoto) || check_clipboard ()) 
- 		return;
-@@ -209,8 +209,8 @@
- 				      config.automount_media);
- 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (autobrowse_cb),
- 				      config.autobrowse);
--	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (autorun_cb),
--				      config.autorun);
-+/*	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (autorun_cb),
-+				      config.autorun); */
- 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (autoplay_cda_cb),
- 				      config.autoplay_cda);
- 
-@@ -252,8 +252,8 @@
- 			GCONF_ROOT "automount_media", NULL);
- 	config.autobrowse = gconf_client_get_bool (config.client,
- 			GCONF_ROOT "autobrowse", NULL);
--	config.autorun = gconf_client_get_bool (config.client,
--			GCONF_ROOT "autorun", NULL);
-+/*	config.autorun = gconf_client_get_bool (config.client,
-+			GCONF_ROOT "autorun", NULL); */
- 	config.autoplay_cda = gconf_client_get_bool (config.client,
- 			GCONF_ROOT "autoplay_cda", NULL);
- 	config.autoplay_cda_command =
-@@ -434,7 +434,7 @@
- 	automount_drives_cb = glade_xml_get_widget (xml, "automount_drives_cb");
- 	automount_media_cb = glade_xml_get_widget (xml, "automount_media_cb");
- 	autobrowse_cb = glade_xml_get_widget (xml, "autobrowse_cb");
--	autorun_cb = glade_xml_get_widget (xml, "autorun_cb");
-+/*	autorun_cb = glade_xml_get_widget (xml, "autorun_cb"); */
- 
- 	autoplay_cda_cb = glade_xml_get_widget (xml, "autoplay_cda_cb");
- 	command_cda_entry = glade_xml_get_widget (xml, "command_cda_entry");
-@@ -485,8 +485,8 @@
- 			    GTK_SIGNAL_FUNC (signal_response), NULL);
- 	gtk_signal_connect (GTK_OBJECT (autobrowse_cb), "toggled",
- 			    GTK_SIGNAL_FUNC (signal_response), NULL);
--	gtk_signal_connect (GTK_OBJECT (autorun_cb), "toggled",
--			    GTK_SIGNAL_FUNC (signal_response), NULL);
-+/*	gtk_signal_connect (GTK_OBJECT (autorun_cb), "toggled",
-+			    GTK_SIGNAL_FUNC (signal_response), NULL); */
- 
- 	gtk_signal_connect (GTK_OBJECT (autoplay_cda_cb), "toggled",
- 			    GTK_SIGNAL_FUNC (signal_response), NULL);




More information about the Pkg-utopia-commits mailing list