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

[Sjoerd Simons]

Author: sjoerd
Date: 2004-11-17 03:54:50 -0700 (Wed, 17 Nov 2004)
New Revision: 81

Added:
   packages/gnome-volume-manager/trunk/debian/patches/00_set_defaults.patch
Removed:
   packages/gnome-volume-manager/trunk/debian/patches/00_default_dvd.patch
   packages/gnome-volume-manager/trunk/debian/patches/07_default_photo_command.patch
Modified:
   packages/gnome-volume-manager/trunk/debian/changelog
Log:
Move all the schema changes into one patch and merge the ones from ubuntu

Modified: packages/gnome-volume-manager/trunk/debian/changelog
===================================================================
--- packages/gnome-volume-manager/trunk/debian/changelog	2004-11-16 21:51:45 UTC (rev 80)
+++ packages/gnome-volume-manager/trunk/debian/changelog	2004-11-17 10:54:50 UTC (rev 81)
@@ -1,3 +1,14 @@
+gnome-volume-manager (1.0.2-5) UNRELEASED; urgency=low
+
+  * 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.
+  * debian/patches/00_default_dvd.patch
+  * debian/patches/07_default_photo_command.patch
+    + Removed. Obsoleted by debian/patches/00_set_defaults.patch 
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Wed, 17 Nov 2004 11:44:57 +0100
+
 gnome-volume-manager (1.0.2-4) unstable; urgency=low
 
   * debian/patches/11_dbus_reconnect_on_bus_exit.patch

Deleted: packages/gnome-volume-manager/trunk/debian/patches/00_default_dvd.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/00_default_dvd.patch	2004-11-16 21:51:45 UTC (rev 80)
+++ packages/gnome-volume-manager/trunk/debian/patches/00_default_dvd.patch	2004-11-17 10:54:50 UTC (rev 81)
@@ -1,11 +0,0 @@
---- gnome-volume-manager-0.9.5+cvs20040615/gnome-volume-manager.schemas.in.org	2004-06-15 20:37:12.000000000 +0200
-+++ gnome-volume-manager-0.9.5+cvs20040615/gnome-volume-manager.schemas.in	2004-06-15 20:36:39.000000000 +0200
-@@ -111,7 +111,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/autoplay_dvd_command</key>
- 	<applyto>/desktop/gnome/volume_manager/autoplay_dvd_command</applyto>
- 	<type>string</type>
--	<default>totem %d</default>
-+	<default>totem dvd://</default>
- 	<locale name="C">
- 	  <short>DVD Play Command</short>
- 	  <long>Command to run when a video DVD is inserted.</long>

Added: packages/gnome-volume-manager/trunk/debian/patches/00_set_defaults.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/00_set_defaults.patch	2004-11-16 21:51:45 UTC (rev 80)
+++ packages/gnome-volume-manager/trunk/debian/patches/00_set_defaults.patch	2004-11-17 10:54:50 UTC (rev 81)
@@ -0,0 +1,38 @@
+--- 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
+@@ -29,7 +29,7 @@
+         <key>/schemas/desktop/gnome/volume_manager/autobrowse</key>
+         <applyto>/desktop/gnome/volume_manager/autobrowse</applyto>
+         <type>bool</type>
+-        <default>false</default>
++        <default>true</default>
+         <locale name="C">
+           <short>Autorun nautilus</short>
+           <long>Open nautilus on removeable media insert.</long>
+@@ -40,7 +40,7 @@
+         <key>/schemas/desktop/gnome/volume_manager/autorun</key>
+         <applyto>/desktop/gnome/volume_manager/autorun</applyto>
+         <type>bool</type>
+-        <default>true</default>
++        <default>false</default>
+         <locale name="C">
+           <short>Perform autorun</short>
+           <long>Whether autorun programs (binaries and scripts located in 
+@@ -122,7 +122,7 @@
+         <key>/schemas/desktop/gnome/volume_manager/autoplay_dvd_command</key>
+ 	<applyto>/desktop/gnome/volume_manager/autoplay_dvd_command</applyto>
+ 	<type>string</type>
+-	<default>totem %d</default>
++	<default>totem dvd://</default>
+ 	<locale name="C">
+ 	  <short>DVD play command</short>
+ 	  <long>Command to run when a video DVD is inserted.</long>
+@@ -146,7 +146,7 @@
+         <key>/schemas/desktop/gnome/volume_manager/autophoto_command</key>
+ 	<applyto>/desktop/gnome/volume_manager/autophoto_command</applyto>
+ 	<type>string</type>
+-	<default>gthumb --import-photos</default>
++	<default>gnome-volume-manager-gthumb %h</default>
+ 	<locale name="C">
+ 	  <short>Photo management command</short>
+ 	  <long>Command to run when a digital camera is connected or media 

Deleted: packages/gnome-volume-manager/trunk/debian/patches/07_default_photo_command.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/07_default_photo_command.patch	2004-11-16 21:51:45 UTC (rev 80)
+++ packages/gnome-volume-manager/trunk/debian/patches/07_default_photo_command.patch	2004-11-17 10:54:50 UTC (rev 81)
@@ -1,11 +0,0 @@
---- gnome-volume-manager.schemas.in.orig	2004-09-22 16:22:22.000000000 +0200
-+++ gnome-volume-manager.schemas.in	2004-09-22 16:22:55.000000000 +0200
-@@ -146,7 +146,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/autophoto_command</key>
- 	<applyto>/desktop/gnome/volume_manager/autophoto_command</applyto>
- 	<type>string</type>
--	<default>gthumb --import-photos</default>
-+	<default>gnome-volume-manager-gthumb %h</default>
- 	<locale name="C">
- 	  <short>Photo management command</short>
- 	  <long>Command to run when a digital camera is connected or media