[Pkg-utopia-commits] r85 - in packages/gnome-volume-manager/trunk/debian: . patches
Sjoerd Simons
sjoerd@haydn.debian.org
Wed, 17 Nov 2004 08:06:39 -0700
Author: sjoerd
Date: 2004-11-17 08:06:32 -0700 (Wed, 17 Nov 2004)
New Revision: 85
Modified:
packages/gnome-volume-manager/trunk/debian/patches/00_set_defaults.patch
packages/gnome-volume-manager/trunk/debian/patches/02_search_fstab.patch
packages/gnome-volume-manager/trunk/debian/patches/03_browse_fixup.patch
packages/gnome-volume-manager/trunk/debian/patches/06_mount_at_start.patch
packages/gnome-volume-manager/trunk/debian/patches/08_fr.patch
packages/gnome-volume-manager/trunk/debian/patches/11_dbus_reconnect_on_bus_exit.patch
packages/gnome-volume-manager/trunk/debian/patches/13_dont_set_capabilities.patch
packages/gnome-volume-manager/trunk/debian/rules
Log:
Updates to make stuff work with dbs-edit-patch
Modified: packages/gnome-volume-manager/trunk/debian/patches/00_set_defaults.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/00_set_defaults.patch 2004-11-17 15:00:52 UTC (rev 84)
+++ packages/gnome-volume-manager/trunk/debian/patches/00_set_defaults.patch 2004-11-17 15:06:32 UTC (rev 85)
@@ -1,5 +1,5 @@
---- gnome-volume-manager.schemas.in.orig 2004-08-13 19:11:56.000000000 +0200
-+++ gnome-volume-manager.schemas.in 2004-11-17 11:42:38.780433681 +0100
+--- gnome-volume-manager/gnome-volume-manager.schemas.in.orig 2004-08-13 19:11:56.000000000 +0200
++++ gnome-volume-manager/gnome-volume-manager.schemas.in 2004-11-17 11:42:38.780433681 +0100
@@ -29,7 +29,7 @@
<key>/schemas/desktop/gnome/volume_manager/autobrowse</key>
<applyto>/desktop/gnome/volume_manager/autobrowse</applyto>
Modified: packages/gnome-volume-manager/trunk/debian/patches/02_search_fstab.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/02_search_fstab.patch 2004-11-17 15:00:52 UTC (rev 84)
+++ packages/gnome-volume-manager/trunk/debian/patches/02_search_fstab.patch 2004-11-17 15:06:32 UTC (rev 85)
@@ -1,5 +1,6 @@
---- /tmp/g/gnome-volume-manager-0.9.10+cvs20040902/src/manager.c 2004-09-02 21:26:48.000000000 +0200
-+++ src/manager.c 2004-09-02 21:52:30.000000000 +0200
+diff -ruN gnome-volume-manager-old/src/manager.c gnome-volume-manager/src/manager.c
+--- gnome-volume-manager-old/src/manager.c 2004-10-25 21:12:11.000000000 +0200
++++ gnome-volume-manager/src/manager.c 2004-11-17 15:39:30.891370034 +0100
@@ -23,6 +23,8 @@
#include <libhal.h>
#include <signal.h>
@@ -9,7 +10,7 @@
#include "gvm.h"
#ifdef ENABLE_NLS
-@@ -450,6 +452,61 @@
+@@ -447,6 +449,61 @@
}
/*
@@ -71,7 +72,7 @@
* gvm_device_mount - use BIN_MOUNT to mount the given device node.
*
* Note that this requires that the given device node is in /etc/fstab. This
-@@ -462,18 +519,25 @@
+@@ -459,18 +516,25 @@
{
char *argv[3];
GError *error = NULL;
Modified: packages/gnome-volume-manager/trunk/debian/patches/03_browse_fixup.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/03_browse_fixup.patch 2004-11-17 15:00:52 UTC (rev 84)
+++ packages/gnome-volume-manager/trunk/debian/patches/03_browse_fixup.patch 2004-11-17 15:06:32 UTC (rev 85)
@@ -1,5 +1,6 @@
---- /tmp/g2/gnome-volume-manager-0.9.10+cvs20040902/src/manager.c 2004-09-02 21:26:48.000000000 +0200
-+++ src/manager.c 2004-09-02 21:57:28.000000000 +0200
+diff -ruN gnome-volume-manager-old/src/manager.c gnome-volume-manager/src/manager.c
+--- gnome-volume-manager-old/src/manager.c 2004-11-17 15:40:39.287446000 +0100
++++ gnome-volume-manager/src/manager.c 2004-11-17 15:41:15.044577131 +0100
@@ -248,31 +248,32 @@
/*
* gvm_check_dvd - is this a Video DVD? If so, do something about it.
Modified: packages/gnome-volume-manager/trunk/debian/patches/06_mount_at_start.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/06_mount_at_start.patch 2004-11-17 15:00:52 UTC (rev 84)
+++ packages/gnome-volume-manager/trunk/debian/patches/06_mount_at_start.patch 2004-11-17 15:06:32 UTC (rev 85)
@@ -1,11 +1,6 @@
-? src/tmp
-Index: gnome-volume-manager.schemas.in
-===================================================================
-RCS file: /cvs/gnome/gnome-volume-manager/gnome-volume-manager.schemas.in,v
-retrieving revision 1.7
-diff -u -r1.7 gnome-volume-manager.schemas.in
---- gnome-volume-manager.schemas.in 13 Aug 2004 17:11:56 -0000 1.7
-+++ gnome-volume-manager.schemas.in 22 Sep 2004 14:50:06 -0000
+diff -ruN gnome-volume-manager-old/gnome-volume-manager.schemas.in gnome-volume-manager/gnome-volume-manager.schemas.in
+--- gnome-volume-manager-old/gnome-volume-manager.schemas.in 2004-11-17 15:53:15.516544000 +0100
++++ gnome-volume-manager/gnome-volume-manager.schemas.in 2004-11-17 15:54:17.588248200 +0100
@@ -2,6 +2,17 @@
<schemalist>
@@ -24,13 +19,9 @@
<key>/schemas/desktop/gnome/volume_manager/automount_drives</key>
<applyto>/desktop/gnome/volume_manager/automount_drives</applyto>
<type>bool</type>
-Index: gnome-volume-properties.glade
-===================================================================
-RCS file: /cvs/gnome/gnome-volume-manager/gnome-volume-properties.glade,v
-retrieving revision 1.3
-diff -u -r1.3 gnome-volume-properties.glade
---- gnome-volume-properties.glade 13 Aug 2004 17:11:56 -0000 1.3
-+++ gnome-volume-properties.glade 22 Sep 2004 14:50:07 -0000
+diff -ruN gnome-volume-manager-old/gnome-volume-properties.glade gnome-volume-manager/gnome-volume-properties.glade
+--- gnome-volume-manager-old/gnome-volume-properties.glade 2004-08-13 19:11:56.000000000 +0200
++++ gnome-volume-manager/gnome-volume-properties.glade 2004-11-17 15:54:17.593248498 +0100
@@ -122,10 +122,29 @@
<property name="spacing">0</property>
@@ -62,13 +53,9 @@
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
-Index: src/gvm.h
-===================================================================
-RCS file: /cvs/gnome/gnome-volume-manager/src/gvm.h,v
-retrieving revision 1.4
-diff -u -r1.4 gvm.h
---- src/gvm.h 13 Aug 2004 17:11:56 -0000 1.4
-+++ src/gvm.h 22 Sep 2004 14:50:07 -0000
+diff -ruN gnome-volume-manager-old/src/gvm.h gnome-volume-manager/src/gvm.h
+--- gnome-volume-manager-old/src/gvm.h 2004-08-13 19:11:56.000000000 +0200
++++ gnome-volume-manager/src/gvm.h 2004-11-17 15:54:17.594248558 +0100
@@ -5,6 +5,7 @@
struct gvm_configuration {
GConfClient *client;
@@ -77,13 +64,9 @@
gboolean automount_drives;
gboolean automount_media;
gboolean autobrowse;
-Index: src/manager.c
-===================================================================
-RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v
-retrieving revision 1.32
-diff -u -r1.32 manager.c
---- src/manager.c 20 Sep 2004 16:12:22 -0000 1.32
-+++ src/manager.c 22 Sep 2004 14:50:08 -0000
+diff -ruN gnome-volume-manager-old/src/manager.c gnome-volume-manager/src/manager.c
+--- gnome-volume-manager-old/src/manager.c 2004-11-17 15:53:15.637551000 +0100
++++ gnome-volume-manager/src/manager.c 2004-11-17 15:54:17.599248856 +0100
@@ -66,6 +66,8 @@
static void
gvm_load_config (void)
@@ -93,7 +76,7 @@
config.automount_drives = gconf_client_get_bool (config.client,
GCONF_ROOT "automount_drives", NULL);
config.automount_media = gconf_client_get_bool (config.client,
-@@ -950,9 +952,8 @@
+@@ -1009,9 +1011,8 @@
char **volumes;
char *udi;
char *device_file;
@@ -105,7 +88,7 @@
volumes = hal_find_device_by_capability (ctx, "volume", &num_volumes);
for (i = 0; i < num_volumes; i++) {
-@@ -973,6 +974,22 @@
+@@ -1032,6 +1033,22 @@
"filesystem") != 0)
continue;
@@ -128,13 +111,9 @@
device_file = hal_device_get_property_string (ctx, udi,
"block.device");
-Index: src/properties.c
-===================================================================
-RCS file: /cvs/gnome/gnome-volume-manager/src/properties.c,v
-retrieving revision 1.11
-diff -u -r1.11 properties.c
---- src/properties.c 13 Aug 2004 19:49:44 -0000 1.11
-+++ src/properties.c 22 Sep 2004 14:50:08 -0000
+diff -ruN gnome-volume-manager-old/src/properties.c gnome-volume-manager/src/properties.c
+--- gnome-volume-manager-old/src/properties.c 2004-08-13 21:49:44.000000000 +0200
++++ gnome-volume-manager/src/properties.c 2004-11-17 15:54:17.602249035 +0100
@@ -33,6 +33,7 @@
#endif
Modified: packages/gnome-volume-manager/trunk/debian/patches/08_fr.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/08_fr.patch 2004-11-17 15:00:52 UTC (rev 84)
+++ packages/gnome-volume-manager/trunk/debian/patches/08_fr.patch 2004-11-17 15:06:32 UTC (rev 85)
@@ -1,6 +1,6 @@
-diff -Nur gnome-volume-manager-1.0.2/po/fr.po gnome-volume-manager-1.0.2.new/po/fr.po
---- gnome-volume-manager-1.0.2/po/fr.po 2004-09-13 09:06:44.000000000 +0200
-+++ gnome-volume-manager-1.0.2.new/po/fr.po 2004-09-27 10:29:55.021622392 +0200
+diff -ruN gnome-volume-manager-old/po/fr.po gnome-volume-manager/po/fr.po
+--- gnome-volume-manager-old/po/fr.po 2004-10-30 17:09:30.000000000 +0200
++++ gnome-volume-manager/po/fr.po 2004-11-17 15:56:39.625725390 +0100
@@ -32,9 +32,8 @@
msgstr "Montage automatique des média amovibles"
Modified: packages/gnome-volume-manager/trunk/debian/patches/11_dbus_reconnect_on_bus_exit.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/11_dbus_reconnect_on_bus_exit.patch 2004-11-17 15:00:52 UTC (rev 84)
+++ packages/gnome-volume-manager/trunk/debian/patches/11_dbus_reconnect_on_bus_exit.patch 2004-11-17 15:06:32 UTC (rev 85)
@@ -1,13 +1,14 @@
---- src/manager.c.orig 2004-10-31 14:30:52.000000000 +0100
-+++ src/manager.c 2004-10-31 14:39:55.000000000 +0100
+diff -ruN gnome-volume-manager-old/src/manager.c gnome-volume-manager/src/manager.c
+--- gnome-volume-manager-old/src/manager.c 2004-11-17 16:03:20.628507000 +0100
++++ gnome-volume-manager/src/manager.c 2004-11-17 16:03:49.415199839 +0100
@@ -53,6 +53,7 @@
static struct gvm_configuration config;
static LibHalContext *hal_ctx;
+static DBusConnection *dbus_ctx;
- /** List of UDI's for volumes mounted when starting up */
- static GSList *mount_ignore_udi_list = NULL;
+ /** 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;
@@ -60,6 +61,9 @@
/** List of UDI's of all volumes mounted during the lifetime of the program */
static GSList *all_mounted_volumes = NULL;
@@ -18,7 +19,7 @@
/*
* gvm_load_config - synchronize gconf => config structure
*/
-@@ -870,6 +874,58 @@
+@@ -946,6 +950,58 @@
{
}
@@ -77,7 +78,7 @@
/** Invoked by libhal for integration with our mainloop.
*
* @param ctx LibHal context
-@@ -879,7 +935,12 @@
+@@ -955,7 +1011,12 @@
hal_mainloop_integration (LibHalContext *ctx __attribute__((__unused__)),
DBusConnection * dbus_connection)
{
@@ -90,7 +91,7 @@
}
/** Internal HAL initialization function
-@@ -997,7 +1058,12 @@
+@@ -1078,7 +1139,12 @@
char *device_file;
char *udi;
@@ -104,7 +105,7 @@
for (i = all_mounted_volumes; i != NULL; i = g_slist_next (i)) {
-@@ -1069,17 +1135,23 @@
+@@ -1150,17 +1216,23 @@
gtk_main_quit ();
}
@@ -135,7 +136,7 @@
gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE,
argc, argv, GNOME_PARAM_NONE);
-@@ -1100,7 +1172,7 @@
+@@ -1181,7 +1253,7 @@
gtk_signal_connect (GTK_OBJECT (client), "die",
GTK_SIGNAL_FUNC (gvm_die), NULL);
Modified: packages/gnome-volume-manager/trunk/debian/patches/13_dont_set_capabilities.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/13_dont_set_capabilities.patch 2004-11-17 15:00:52 UTC (rev 84)
+++ packages/gnome-volume-manager/trunk/debian/patches/13_dont_set_capabilities.patch 2004-11-17 15:06:32 UTC (rev 85)
@@ -1,6 +1,7 @@
---- src/manager.c.orig 2004-10-14 17:17:19.000000000 +0200
-+++ src/manager.c 2004-10-14 17:24:22.000000000 +0200
-@@ -314,10 +314,6 @@
+diff -ruN gnome-volume-manager-old/src/manager.c gnome-volume-manager/src/manager.c
+--- gnome-volume-manager-old/src/manager.c 2004-11-17 16:04:23.128182000 +0100
++++ gnome-volume-manager/src/manager.c 2004-11-17 16:04:38.698098036 +0100
+@@ -312,10 +312,6 @@
dbg ("Photos detected: %s\n", dcim_path);
Modified: packages/gnome-volume-manager/trunk/debian/rules
===================================================================
--- packages/gnome-volume-manager/trunk/debian/rules 2004-11-17 15:00:52 UTC (rev 84)
+++ packages/gnome-volume-manager/trunk/debian/rules 2004-11-17 15:06:32 UTC (rev 85)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-DEB_TAR_SRCDIR=gnome-volume-manager-1.1.2
+DEB_TAR_SRCDIR=gnome-volume-manager
include /usr/share/cdbs/1/rules/tarball.mk
include /usr/share/cdbs/1/rules/debhelper.mk