Using a g-v-m gthumb-wrapper to include usb-storage based digicams as well

[Michael Banck]

On Mon, Oct 11, 2004 at 09:11:26PM +1000, Jeff Waugh wrote:
> On Mon, 2004-10-11 at 12:25 +0200, Michael Banck wrote:
> > I believe this script would make a worthwhile addition to warty's user
> > experience, so you might want to consider including it, if it is not too
> > late.
> 
> Agreed, this is a great bugfix for a very annoying inconsistency. Got
> time for a quick package patch? :-)

Attached are the changes made in the Debian package by Sjoerd Simons.


Michael
-------------- next part --------------
diff -Naur gnome-volume-manager-0.9.10+cvs20040902/debian/gnome-volume-manager-gthumb gnome-volume-manager-1.0.2/debian/gnome-volume-manager-gthumb
--- gnome-volume-manager-0.9.10+cvs20040902/debian/gnome-volume-manager-gthumb	1970-01-01 01:00:00.000000000 +0100
+++ gnome-volume-manager-1.0.2/debian/gnome-volume-manager-gthumb	2004-10-11 14:22:13.000000000 +0200
@@ -0,0 +1,7 @@
+#!/bin/sh
+MOUNT_POINT=`hal-get-property --udi "$1" --key volume.mount_point`
+if test "$MOUNT_POINT" == ""; then
+  gthumb --import-photos
+else
+  gthumb $MOUNT_POINT
+fi
diff -Naur gnome-volume-manager-0.9.10+cvs20040902/debian/patches/07_default_photo_command.patch gnome-volume-manager-1.0.2/debian/patches/07_default_photo_command.patch
--- gnome-volume-manager-0.9.10+cvs20040902/debian/patches/07_default_photo_command.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnome-volume-manager-1.0.2/debian/patches/07_default_photo_command.patch	2004-10-11 14:22:13.000000000 +0200
@@ -0,0 +1,11 @@
+--- 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 
diff -Naur gnome-volume-manager-0.9.10+cvs20040902/debian/rules gnome-volume-manager-1.0.2/debian/rules
--- gnome-volume-manager-0.9.10+cvs20040902/debian/rules	2004-10-11 14:18:12.000000000 +0200
+++ gnome-volume-manager-1.0.2/debian/rules	2004-10-11 14:22:13.000000000 +0200
@@ -3,3 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/gnome.mk
+
+common-install-impl::
+	install -m 644 debian/gnome-volume-manager-gthumb \
+		$(DEB_DESTDIR)/usr/bin