[Pkg-utopia-commits] r83 - in packages/gnome-volume-manager/trunk/debian: . patches
Sjoerd Simons
sjoerd@haydn.debian.org
Wed, 17 Nov 2004 06:39:25 -0700
Author: sjoerd
Date: 2004-11-17 06:38:01 -0700 (Wed, 17 Nov 2004)
New Revision: 83
Removed:
packages/gnome-volume-manager/trunk/debian/patches/04_hal_fusage.patch
packages/gnome-volume-manager/trunk/debian/patches/05_automount.patch
packages/gnome-volume-manager/trunk/debian/patches/10_dont_mount_locked.patch
packages/gnome-volume-manager/trunk/debian/patches/12_dont_mount_mounted.patch
packages/gnome-volume-manager/trunk/debian/patches/14_ca.patch
Modified:
packages/gnome-volume-manager/trunk/debian/changelog
Log:
Remove obsoleted patches
Modified: packages/gnome-volume-manager/trunk/debian/changelog
===================================================================
--- packages/gnome-volume-manager/trunk/debian/changelog 2004-11-17 13:25:40 UTC (rev 82)
+++ packages/gnome-volume-manager/trunk/debian/changelog 2004-11-17 13:38:01 UTC (rev 83)
@@ -1,5 +1,12 @@
gnome-volume-manager (1.1.2-1) UNRELEASED; urgency=low
+ * New upstream release
+ + Obsoleted patches:
+ - debian/patches/04_hal_fusage.patch
+ - debian/patches/05_automount.patch
+ - debian/patches/10_dont_mount_locked.patch
+ - debian/patches/12_dont_mount_mounted.patch
+ - debian/patches/14_ca.patch
* debian/patches/00_set_defaults.patch
+ Added. Merge all the gconf schema patches into one patch.
Also turn autorun off and autobrowse on by default.
Deleted: packages/gnome-volume-manager/trunk/debian/patches/04_hal_fusage.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/04_hal_fusage.patch 2004-11-17 13:25:40 UTC (rev 82)
+++ packages/gnome-volume-manager/trunk/debian/patches/04_hal_fusage.patch 2004-11-17 13:38:01 UTC (rev 83)
@@ -1,16 +0,0 @@
---- src/manager.c 30 Aug 2004 14:53:09 -0000 1.30
-+++ src/manager.c 1 Sep 2004 19:17:41 -0000 1.31
-@@ -1060,9 +1045,10 @@
-
- /* only mount if the block device got a sensible filesystem */
- if (!hal_device_property_exists (ctx, udi,
-- "volume.is_filesystem") ||
-- !hal_device_get_property_bool (ctx, udi,
-- "volume.is_filesystem"))
-+ "volume.fsusage") ||
-+ strcmp (hal_device_get_property_string (ctx, udi,
-+ "volume.fsusage"),
-+ "filesystem") != 0)
- continue;
-
- device_file = hal_device_get_property_string (ctx, udi,
Deleted: packages/gnome-volume-manager/trunk/debian/patches/05_automount.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/05_automount.patch 2004-11-17 13:25:40 UTC (rev 82)
+++ packages/gnome-volume-manager/trunk/debian/patches/05_automount.patch 2004-11-17 13:38:01 UTC (rev 83)
@@ -1,39 +0,0 @@
---- src/manager.c 30 Aug 2004 14:53:09 -0000 1.30
-+++ src/manager.c 1 Sep 2004 19:17:41 -0000 1.31
-@@ -659,7 +659,8 @@
- * At the moment, we only handle CD-ROM and DVD drives.
- */
- static void
--gvm_media_changed (const char *udi, const char *storage_device)
-+gvm_media_changed (const char *udi, const char *storage_device,
-+ const char *device)
- {
- char *media_type;
-
-@@ -674,10 +675,14 @@
- return;
- }
-
-- if (!g_strcasecmp (media_type, "cdrom"))
-+ if (!g_strcasecmp (media_type, "cdrom")) {
- gvm_cdrom_policy (udi);
--
-- /* other media_types go here */
-+ } else {
-+ dbg ("Added: %s\n", device);
-+
-+ if (config.automount_drives)
-+ gvm_device_mount (device);
-+ }
-
- hal_free_string (media_type);
- }
-@@ -730,7 +735,7 @@
- "storage.removable")) {
- /* we handle media change events separately */
- dbg ("Changed: %s\n", device);
-- gvm_media_changed (udi, storage_device);
-+ gvm_media_changed (udi, storage_device, device);
- goto out;
- }
-
Deleted: packages/gnome-volume-manager/trunk/debian/patches/10_dont_mount_locked.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/10_dont_mount_locked.patch 2004-11-17 13:25:40 UTC (rev 82)
+++ packages/gnome-volume-manager/trunk/debian/patches/10_dont_mount_locked.patch 2004-11-17 13:38:01 UTC (rev 83)
@@ -1,19 +0,0 @@
-Nur in gnome-volume-manager-1.0.2/debian/patches: 07_dont_mount_locked.patch.
-diff -ru gnome-volume-manager-1.0.2/src/manager.c gnome-volume-manager-1.0.2.new/src/manager.c
---- gnome-volume-manager-1.0.2/src/manager.c 2004-09-27 14:48:24.000000000 +0200
-+++ gnome-volume-manager-1.0.2.new/src/manager.c 2004-09-28 14:34:23.374800304 +0200
-@@ -663,6 +663,14 @@
- {
- char *media_type;
-
-+ /* Refuse to enforce policy on removable media if drive is locked */
-+ if (hal_device_property_exists (hal_ctx, storage_device, "info.locked") &&
-+ hal_device_get_property_bool (hal_ctx, storage_device, "info.locked")) {
-+ dbg ("Drive with udi %s is locked through hal; "
-+ "skipping policy\n", storage_device);
-+ return;
-+ }
-+
- /*
- * Get HAL's interpretation of our media type. Note that we must check
- * the storage device and not this UDI
Deleted: packages/gnome-volume-manager/trunk/debian/patches/12_dont_mount_mounted.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/12_dont_mount_mounted.patch 2004-11-17 13:25:40 UTC (rev 82)
+++ packages/gnome-volume-manager/trunk/debian/patches/12_dont_mount_mounted.patch 2004-11-17 13:38:01 UTC (rev 83)
@@ -1,52 +0,0 @@
---- src/manager.c.orig 2004-10-14 14:38:41.000000000 +0200
-+++ src/manager.c 2004-10-14 14:39:24.000000000 +0200
-@@ -837,9 +837,20 @@
- */
- static void
- hal_device_removed (LibHalContext *ctx __attribute__((__unused__)),
-- const char *udi)
-+ const char *udi)
- {
-+ gchar *device;
-+ GSList *i, *next;
- dbg ("Device removed: %s\n", udi);
-+
-+ 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.
-@@ -893,6 +904,14 @@
- if (val == TRUE) {
- gboolean ignore_mount;
-
-+ /* do nothing if volume is already mounted (is_mounted is
-+ * reported as changed on hal restarts) */
-+ for (i = all_mounted_volumes; i != NULL; i = g_slist_next (i))
-+ if (strcmp (udi, (const char *)i->data) == 0) {
-+ dbg ("%s reported as mounted, but we already mounted it previously. Ignoring\n", udi );
-+ return;
-+ }
-+
- dbg ("Mounted: %s\n", udi);
-
- /* add to list of all volumes mounted during lifetime */
-@@ -1089,8 +1108,11 @@
- if (!hal_device_property_exists (ctx, udi,
- "volume.is_mounted") ||
- hal_device_get_property_bool (ctx, udi,
-- "volume.is_mounted"))
-+ "volume.is_mounted")) {
-+ all_mounted_volumes = g_slist_append (all_mounted_volumes,
-+ g_strdup (udi));
- continue;
-+ }
-
- /* only mount if the block device got a sensible filesystem */
- if (!hal_device_property_exists (ctx, udi,
Deleted: packages/gnome-volume-manager/trunk/debian/patches/14_ca.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/14_ca.patch 2004-11-17 13:25:40 UTC (rev 82)
+++ packages/gnome-volume-manager/trunk/debian/patches/14_ca.patch 2004-11-17 13:38:01 UTC (rev 83)
@@ -1,264 +0,0 @@
-diff -Nuar gnome-volume-manager-1.0.2.orig/po/ca.po gnome-volume-manager-1.0.2/po/ca.po
---- gnome-volume-manager-1.0.2.orig/po/ca.po 2004-09-13 09:06:43.000000000 +0200
-+++ gnome-volume-manager-1.0.2/po/ca.po 2004-10-14 18:51:17.000000000 +0200
-@@ -7,8 +7,8 @@
- msgstr ""
- "Project-Id-Version: gnome-volume-manager\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2004-09-13 03:06-0400\n"
--"PO-Revision-Date: 2004-08-21 18:06+0200\n"
-+"POT-Creation-Date: 2004-10-14 18:51+0200\n"
-+"PO-Revision-Date: 2004-10-14 18:51+0200\n"
- "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
- "Language-Team: Catalan <tradgnome@softcatala.org>\n"
- "MIME-Version: 1.0\n"
-@@ -30,22 +30,26 @@
- msgstr "Munta automàticament els medis extraïbles"
-
- #: gnome-volume-manager.schemas.in.h:4
-+msgid "Automount static drives on session start"
-+msgstr "Munta automàticament les unitats estàtiques quan s'inicia la sessió"
-+
-+#: gnome-volume-manager.schemas.in.h:5
- msgid "Autorun nautilus"
- msgstr "Executa automàticament el nautilus"
-
--#: gnome-volume-manager.schemas.in.h:5
-+#: gnome-volume-manager.schemas.in.h:6
- msgid "Autorun path"
- msgstr "Camí d'autoexecució"
-
--#: gnome-volume-manager.schemas.in.h:6
-+#: gnome-volume-manager.schemas.in.h:7
- msgid "CD burn command"
- msgstr "Ordre de gravació de CD"
-
--#: gnome-volume-manager.schemas.in.h:7
-+#: gnome-volume-manager.schemas.in.h:8
- msgid "CD play command"
- msgstr "Ordre de reproducció de CD"
-
--#: gnome-volume-manager.schemas.in.h:8
-+#: gnome-volume-manager.schemas.in.h:9
- msgid ""
- "Command to run when a digital camera is connected or media from a digital "
- "camera is inserted."
-@@ -53,59 +57,59 @@
- "Ordre a executar quan s'insereix una càmera digital o medis d'una càmera "
- "digital."
-
--#: gnome-volume-manager.schemas.in.h:9
-+#: gnome-volume-manager.schemas.in.h:10
- msgid "Command to run when a video DVD is inserted."
- msgstr "Ordre a executar quan s'insereix un DVD de vídeo."
-
--#: gnome-volume-manager.schemas.in.h:10
-+#: gnome-volume-manager.schemas.in.h:11
- msgid "Command to run when an audio CD is inserted."
- msgstr "Ordre a executar quan s'insereix un CD d'àudio."
-
--#: gnome-volume-manager.schemas.in.h:11
-+#: gnome-volume-manager.schemas.in.h:12
- msgid "Command to run when an empty CD is inserted."
- msgstr "Ordre a executar quan s'insereix un CD buit."
-
--#: gnome-volume-manager.schemas.in.h:12
-+#: gnome-volume-manager.schemas.in.h:13
- msgid "Command to run when the eject button on a optical drive is pressed."
- msgstr "Ordre a executar quan es prem el botó d'expulsió d'una unitat òptica."
-
--#: gnome-volume-manager.schemas.in.h:13
-+#: gnome-volume-manager.schemas.in.h:14
- msgid "DVD play command"
- msgstr "Ordre de reproducció de DVD"
-
--#: gnome-volume-manager.schemas.in.h:14
-+#: gnome-volume-manager.schemas.in.h:15
- msgid "Eject command"
- msgstr "Ordre d'expulsió"
-
--#: gnome-volume-manager.schemas.in.h:15
-+#: gnome-volume-manager.schemas.in.h:16
- msgid "Open nautilus on removeable media insert."
- msgstr "Obre el nautilus quan s'insereixen medis extraïbles."
-
--#: gnome-volume-manager.schemas.in.h:16
-+#: gnome-volume-manager.schemas.in.h:17
- msgid "Perform autorun"
- msgstr "Realitza l'execució automàtica"
-
--#: gnome-volume-manager.schemas.in.h:17
-+#: gnome-volume-manager.schemas.in.h:18
- msgid "Photo management command"
- msgstr "Ordre de gestió de fotografies"
-
--#: gnome-volume-manager.schemas.in.h:18
-+#: gnome-volume-manager.schemas.in.h:19
- msgid "Play inserted audio CD's"
- msgstr "Reprodueix els CD d'àudio inserits"
-
--#: gnome-volume-manager.schemas.in.h:19
-+#: gnome-volume-manager.schemas.in.h:20
- msgid "Play inserted video DVDs"
- msgstr "Reprodueix els DVD de vídeo inserits"
-
--#: gnome-volume-manager.schemas.in.h:20
-+#: gnome-volume-manager.schemas.in.h:21
- msgid "Run CD burn command"
- msgstr "Executa l'ordre de gravació de CD"
-
--#: gnome-volume-manager.schemas.in.h:21
-+#: gnome-volume-manager.schemas.in.h:22
- msgid "Run photo management command"
- msgstr "Executa l'ordre de gestió de fotografies"
-
--#: gnome-volume-manager.schemas.in.h:22
-+#: gnome-volume-manager.schemas.in.h:23
- msgid ""
- "Whether autorun programs (binaries and scripts located in 'autorun_path') "
- "are run on newly mounted media."
-@@ -113,7 +117,7 @@
- "Si s'han d'executar els programes d'execució automàtica (binaris i scripts "
- "ubicats en «autorun_path») en muntar medis nous."
-
--#: gnome-volume-manager.schemas.in.h:23
-+#: gnome-volume-manager.schemas.in.h:24
- msgid ""
- "Whether gnome-volume-manager should automatically mount removable storage "
- "drives when they are inserted."
-@@ -121,7 +125,7 @@
- "Si el gnome-volume-manager hauria de muntar automàticament les unitats "
- "d'emmagatzemament extraïble quan s'insereixen."
-
--#: gnome-volume-manager.schemas.in.h:24
-+#: gnome-volume-manager.schemas.in.h:25
- msgid ""
- "Whether gnome-volume-manager should automatically mount removable storage "
- "media when they are inserted."
-@@ -129,7 +133,15 @@
- "Si el gnome-volume-manager hauria de muntar automàticament els medis "
- "d'emmagatzemament extraïble quan s'insereixen."
-
--#: gnome-volume-manager.schemas.in.h:25
-+#: gnome-volume-manager.schemas.in.h:26
-+msgid ""
-+"Whether gnome-volume-manager should automatically mount static storage "
-+"drives on session start."
-+msgstr ""
-+"Si el gnome-volume-manager hauria de muntar automàticament les unitats "
-+"d'emmagatzemament estàtiques quan s'insereixen."
-+
-+#: gnome-volume-manager.schemas.in.h:27
- msgid ""
- "Whether, when a blank CD is inserted, gnome-volume-manager should run "
- "'autoburn_cdr_command'."
-@@ -137,7 +149,7 @@
- "Si el gnome-volume-manager hauria d'executar «autoburn_cdr_command» quan "
- "s'insereix un CD buit."
-
--#: gnome-volume-manager.schemas.in.h:26
-+#: gnome-volume-manager.schemas.in.h:28
- msgid ""
- "Whether, when a digital camera is connected or media from a digital camera "
- "is inserted, gnome-volume-manager should run 'autophoto_command'."
-@@ -145,7 +157,7 @@
- "Si el gnome-volume-manager hauria d'executar «autophoto_command» quan "
- "s'insereix una càmera digital o medis d'una càmera digital."
-
--#: gnome-volume-manager.schemas.in.h:27
-+#: gnome-volume-manager.schemas.in.h:29
- msgid ""
- "Whether, when a video DVD is inserted, gnome-volume-manager should run "
- "'autoplay_dvd_command'."
-@@ -153,7 +165,7 @@
- "Si el gnome-volume-manager hauria d'executar «autoplay_dvd_command» quan "
- "s'insereix un DVD de vídeo."
-
--#: gnome-volume-manager.schemas.in.h:28
-+#: gnome-volume-manager.schemas.in.h:30
- msgid ""
- "Whether, when an audio CD is inserted, gnome-volume-manager should run "
- "'autoplay_cda_command'."
-@@ -218,51 +230,55 @@
- msgstr "Importa els àlbums de _fotografies digitals quan es connecte"
-
- #: gnome-volume-properties.glade.h:13
-+msgid "Mount removable drives when hot-plugged"
-+msgstr "Munta les unitats extraïbles quan es connecten en calent"
-+
-+#: gnome-volume-properties.glade.h:14
- msgid "Mount removable media when _inserted"
- msgstr "Munta els medis extraïbles quan s'_insereixen"
-
--#: gnome-volume-properties.glade.h:14
-+#: gnome-volume-properties.glade.h:15
- msgid "Play DVD Videos when inserted"
- msgstr "Reprodueix els DVD de vídeo quan s'insereixen"
-
--#: gnome-volume-properties.glade.h:15
-+#: gnome-volume-properties.glade.h:16
- msgid "Play _DVD Videos when inserted"
- msgstr "Reprodueix els _DVD de vídeo quan s'insereixen"
-
--#: gnome-volume-properties.glade.h:16
-+#: gnome-volume-properties.glade.h:17
- msgid "Play a_udio CDs when inserted"
- msgstr "Reprodueix els CD d'àudio quan s'insereixen"
-
--#: gnome-volume-properties.glade.h:17
-+#: gnome-volume-properties.glade.h:18
- msgid "Play audio CDs when inserted"
- msgstr "Reprodueix els CD d'àudio quan s'insereixen"
-
--#: gnome-volume-properties.glade.h:18
-+#: gnome-volume-properties.glade.h:19
- msgid "_Auto-run programs on new drives and media"
- msgstr "Executa _automàticament programes a les unitats i medis noves"
-
--#: gnome-volume-properties.glade.h:19
--msgid "_Mount removable drives when hot-plugged"
--msgstr "_Munta les unitats extraïbles quan es connecten en calent"
-+#: gnome-volume-properties.glade.h:20
-+msgid "_Mount static drives on session start"
-+msgstr "_Munta les unitats estàtiques quan s'inicia la sessió"
-
--#: src/manager.c:230
-+#: src/manager.c:238
- #, c-format
- msgid "Do you want to run %s?"
- msgstr "Voleu executar %s?"
-
--#: src/manager.c:318 src/manager.c:361
-+#: src/manager.c:328 src/manager.c:371
- msgid "_Import"
- msgstr "_Importa"
-
--#: src/manager.c:551
-+#: src/manager.c:623
- msgid "_Play"
- msgstr "Re_produeix"
-
--#: src/manager.c:552
-+#: src/manager.c:624
- msgid "_Browse"
- msgstr "_Navega"
-
--#: src/properties.c:187
-+#: src/properties.c:192
- #, c-format
- msgid ""
- "Error starting gnome-volume-manager daemon:\n"
-@@ -271,11 +287,11 @@
- "S'ha produït un error en iniciar el dimoni gnome-volume-manager:\n"
- "%s"
-
--#: src/properties.c:400
-+#: src/properties.c:409
- msgid "Could not load the main interface"
- msgstr "No s'ha pogut carregar la interfície principal"
-
--#: src/properties.c:402
-+#: src/properties.c:411
- msgid "Please make sure that the volume manager is properly installed"
- msgstr "Assegureu-vos que el gestor de volums està instal·lat correctament"
-