Update to V0.4.2. Changes:

New patches for FreeBSD, OpenBSD, and NetBSD, Sony DSC F55 library changes,
a Canon A50 library and general fixes, Canon A5 compatibility fixes, Sony
DSC F505 and Sony memory stick adapter support, an HTML Gallery path fix,
and a GNOME desktop entry.

18 files changed, 51 insertions, 374 deletions

diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index 87c64972011..ec8cec520f2 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 1999/11/30 01:31:59 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1999/12/08 17:25:20 hubertf Exp $
 
-DISTNAME=	gphoto-0.4.1
+DISTNAME=	gphoto-0.4.2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gphoto.org/projects/gphoto/pub/tar/0.4/
 
diff --git a/graphics/gphoto/files/md5 b/graphics/gphoto/files/md5
index fbc588e5142..97a227b97e9 100644
--- a/graphics/gphoto/files/md5
+++ b/graphics/gphoto/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/11/30 00:01:37 dmcmahill Exp $
+$NetBSD: md5,v 1.2 1999/12/08 17:25:21 hubertf Exp $
 
-MD5 (gphoto-0.4.1.tar.gz) = 37d71ed13c12374eaaeb146918db3e81
+MD5 (gphoto-0.4.2.tar.gz) = 4bfb9fb1d020bf99d54f9c0467cb0a1d
diff --git a/graphics/gphoto/files/patch-sum b/graphics/gphoto/files/patch-sum
index 7b7d1c2e049..d6043319f81 100644
--- a/graphics/gphoto/files/patch-sum
+++ b/graphics/gphoto/files/patch-sum
@@ -1,16 +1,3 @@
-$NetBSD: patch-sum,v 1.2 1999/11/30 01:30:49 hubertf Exp $
+$NetBSD: patch-sum,v 1.3 1999/12/08 17:25:21 hubertf Exp $
 
-MD5 (patch-aa) = 85227f4cef9a13ab224368aacee3d1d0
-MD5 (patch-ab) = 20fc68c9144effe838d23541b053d65c
-MD5 (patch-ac) = 1109248cfe24b5de94cdfcfc735ea107
-MD5 (patch-ad) = 2ef155c03a4e44d9e047d4ef5797dcb5
-MD5 (patch-ae) = dbecdf80f8640724095ca982ad99e1d4
-MD5 (patch-af) = 1c5d9c7050d49dd9b593fb2926a705f4
-MD5 (patch-ag) = f3d9aa4043e11309d92b002aa9e2a968
-MD5 (patch-ah) = fd297eaf6f68a4163c94b6c508a45c73
-MD5 (patch-ai) = 5268101332e2fe8c397d5ca961554f4b
-MD5 (patch-aj) = 10fddef60133fe8d186d2ee12677c7c5
-MD5 (patch-ak) = 699f8728adf237cea6d2e8292f6fd3fe
-MD5 (patch-al) = 0198fb20ed09a9eed19cb5915652dfd9
-MD5 (patch-am) = dfa33810cce6f1472b5dccbf8cb897e8
-MD5 (patch-an) = a7fd9cb195fbb3807766351a6913d5e4
+MD5 (patch-af) = 086bb5ec6fe7a344b2c49121589c3c22
diff --git a/graphics/gphoto/patches/patch-aa b/graphics/gphoto/patches/patch-aa
deleted file mode 100644
index 4844ea5af23..00000000000
--- a/graphics/gphoto/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
-
---- canon/serial.c.orig	Wed Nov 24 23:37:05 1999
-+++ canon/serial.c	Wed Nov 24 23:48:38 1999
-@@ -84,7 +84,7 @@
-     newtio.c_cflag = (newtio.c_cflag & ~CSIZE) | CS8;
- 
-     /* Set into raw, no echo mode */
--    #ifdef __FreeBSD__
-+    #if defined(__FreeBSD__) || defined(__NetBSD__)
-     newtio.c_iflag &= ~(IGNBRK | IGNCR | INLCR | ICRNL | 
- 			IXANY | IXON | IXOFF | INPCK | ISTRIP);
-     #else
diff --git a/graphics/gphoto/patches/patch-ab b/graphics/gphoto/patches/patch-ab
deleted file mode 100644
index 937dd7aee50..00000000000
--- a/graphics/gphoto/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
-
---- konica/setSpeed.c.orig	Wed Nov 24 23:41:49 1999
-+++ konica/setSpeed.c	Wed Nov 24 23:49:08 1999
-@@ -17,14 +17,14 @@
- 
-   newt.c_cflag |= CS8;
-   newt.c_iflag &= ~(IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|ISTRIP|INLCR);
--  #ifdef __FreeBSD__ /* by fujisawa@konica.co.jp */
-+  #if defined(__FreeBSD__) || defined(__NetBSD__) /* by fujisawa@konica.co.jp */
-   newt.c_iflag &= ~(IGNCR|ICRNL|IXON|IXOFF|      IXANY|IMAXBEL);
-   #else
-   newt.c_iflag &= ~(IGNCR|ICRNL|IXON|IXOFF|IUCLC|IXANY|IMAXBEL);
-   #endif
-   newt.c_oflag &= ~(OPOST);
-   newt.c_lflag &= ~(ISIG|ICANON);
--  #ifdef __FreeBSD__
-+  #if defined(__FreeBSD__) || defined(__NetBSD__)
-   /**/
-   #else
-   newt.c_cflag &= ~(XCASE);
diff --git a/graphics/gphoto/patches/patch-ac b/graphics/gphoto/patches/patch-ac
deleted file mode 100644
index 45b3bbb926d..00000000000
--- a/graphics/gphoto/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
-
---- konica_qmxxx/os.c.orig	Wed Nov 24 23:44:27 1999
-+++ konica_qmxxx/os.c	Wed Nov 24 23:45:01 1999
-@@ -134,7 +134,7 @@
- 	printf("19 V_spare2  0x%02x\n", 0 );
- 	#endif
- 
--	#if defined(linux) || defined(FreeBSD_3)
-+	#if defined(linux) || defined(FreeBSD_3) || defined(__NetBSD__)
- 		switch( mode ){
- 		case XON_XOFF:	iflag = (IXON|IXOFF|IGNBRK);	break;
- 		case CRTS_CTS:	iflag = (CRTSCTS);		break;
diff --git a/graphics/gphoto/patches/patch-ad b/graphics/gphoto/patches/patch-ad
deleted file mode 100644
index f41194cd57a..00000000000
--- a/graphics/gphoto/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
-
---- mustek/device.c.orig	Wed Nov 24 23:46:03 1999
-+++ mustek/device.c	Wed Nov 24 23:47:06 1999
-@@ -59,8 +59,13 @@
- 	newtio.c_cflag = (newtio.c_cflag & ~CSIZE) | CS8;
- 
- 	//  Set into raw, no echo mode 
-+	#if defined(__NetBSD__)
-+	newtio.c_iflag &= ~(IGNBRK | IGNCR | INLCR | ICRNL |
-+		IXANY | IXON | IXOFF | INPCK | ISTRIP);
-+	#else
- 	newtio.c_iflag &= ~(IGNBRK | IGNCR | INLCR | ICRNL | IUCLC |
- 		IXANY | IXON | IXOFF | INPCK | ISTRIP);
-+	#endif
- 	newtio.c_iflag |= (BRKINT | IGNPAR);
- 	newtio.c_oflag &= ~OPOST;
- 	newtio.c_lflag = ~(ICANON | ISIG | ECHO | ECHONL | ECHOE | ECHOK);
diff --git a/graphics/gphoto/patches/patch-ae b/graphics/gphoto/patches/patch-ae
deleted file mode 100644
index b28c597a6b4..00000000000
--- a/graphics/gphoto/patches/patch-ae
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
-
---- kodak/kodak_dc210.c.orig	Thu Nov 25 00:00:33 1999
-+++ kodak/kodak_dc210.c	Thu Nov 25 00:18:45 1999
-@@ -372,7 +372,7 @@
- 
-   struct termios newt, oldt;
- 
--  serialdev = open(devname, O_RDWR|O_NOCTTY);
-+  serialdev = open(devname, O_RDWR|O_NOCTTY|O_NONBLOCK);
- 
-   if (serialdev < 0) 
-     error_dialog("Cannot open device");
-@@ -384,10 +384,11 @@
- 
-   /* need the device to be raw. 8 bits no parity on 9600 baud to start.  */
-   cfmakeraw(&newt);
--  newt.c_oflag &= ~CSTOPB;
-+  newt.c_cflag &= ~CSTOPB;
-   newt.c_cflag &= ~PARENB;
-   newt.c_cflag |= CS8;
-   newt.c_cflag &= ~PARODD;
-+  newt.c_cflag |= CRTSCTS;
- 
-   newt.c_cc[VMIN] = 0;
-   newt.c_cc[VTIME] = 10;
-@@ -594,10 +595,16 @@
-       memcpy(imData,bmpHeader, sizeof(bmpHeader));
- 
-       /* reverse the thumbnail data */
--      for (j=fileSize-1,i=54; j >= 0 ; j--)
--      {
--	imData[i++] = picData[j];
--      }
-+      /* not only is the data reversed but the image is flipped
-+       * left to right
-+       */
-+      for (i = 0; i < 72; i++) {
-+         for (j = 0; j < 96; j++) {
-+            imData[i*96*3+j*3+54] = picData[(71-i)*96*3+j*3+2];
-+            imData[i*96*3+j*3+54+1] = picData[(71-i)*96*3+j*3+1];
-+            imData[i*96*3+j*3+54+2] = picData[(71-i)*96*3+j*3];
-+            }
-+         }
- 
-       strcpy ( im->image_type, "bmp" );
-       im->image_info = NULL;
diff --git a/graphics/gphoto/patches/patch-af b/graphics/gphoto/patches/patch-af
index a07e1578a6b..cb15422049d 100644
--- a/graphics/gphoto/patches/patch-af
+++ b/graphics/gphoto/patches/patch-af
@@ -1,8 +1,9 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
+$NetBSD: patch-af,v 1.2 1999/12/08 17:25:22 hubertf Exp $
 
---- ./configure.orig	Fri Nov 19 21:32:38 1999
-+++ ./configure	Mon Nov 29 15:40:55 1999
-@@ -1583,8 +1583,8 @@
+--- configure.orig	Mon Dec  6 00:12:35 1999
++++ configure	Wed Dec  8 16:17:50 1999
+@@ -1936,10 +1936,10 @@
+ 
  
  # This can be used to rebuild libtool when needed
 -LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
@@ -13,3 +14,4 @@ $NetBSD: patch-af,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
 +#LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
  # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
diff --git a/graphics/gphoto/patches/patch-ag b/graphics/gphoto/patches/patch-ag
deleted file mode 100644
index 37b9afedcdc..00000000000
--- a/graphics/gphoto/patches/patch-ag
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
-
---- ./casio/configure.c.orig	Thu May 27 14:32:02 1999
-+++ ./casio/configure.c	Mon Nov 29 16:16:10 1999
-@@ -226,5 +226,5 @@
-   gtk_signal_connect (GTK_OBJECT (normalSize), "pressed",
-                       GTK_SIGNAL_FUNC (setSize),
--                      0);
-+                      (gpointer) 0);
- 
-   doubleSize = gtk_radio_button_new_with_label (Size_group, "640 x 480");
-@@ -236,5 +236,5 @@
-   gtk_signal_connect (GTK_OBJECT (doubleSize), "pressed",
-                       GTK_SIGNAL_FUNC (setSize),
--                      1);
-+                      (gpointer) 1);
- 
-   vbox1 = gtk_vbox_new (FALSE, 0);
-@@ -252,5 +252,5 @@
-   gtk_signal_connect_after (GTK_OBJECT (spd_9600), "pressed",
-                             GTK_SIGNAL_FUNC (on_spd_pressed),
--                            DEFAULT);
-+                            (gpointer) DEFAULT);
- 
-   spd_19200 = gtk_radio_button_new_with_label (Speed_group, "19200");
-@@ -262,5 +262,5 @@
-   gtk_signal_connect_after (GTK_OBJECT (spd_19200), "pressed",
-                             GTK_SIGNAL_FUNC (on_spd_pressed),
--                            MID);
-+                            (gpointer) MID);
- 
-   spd_38400 = gtk_radio_button_new_with_label (Speed_group, "38400");
-@@ -272,5 +272,5 @@
-   gtk_signal_connect_after (GTK_OBJECT (spd_38400), "pressed",
-                             GTK_SIGNAL_FUNC (on_spd_pressed),
--                            HIGH);
-+                            (gpointer) HIGH);
- 
-   spd_57600 = gtk_radio_button_new_with_label (Speed_group, "57600");
-@@ -282,5 +282,5 @@
-   gtk_signal_connect_after (GTK_OBJECT (spd_57600), "pressed",
-                             GTK_SIGNAL_FUNC (on_spd_pressed),
--                            TOP);
-+                            (gpointer) TOP);
- 
-   spd_115200 = gtk_radio_button_new_with_label (Speed_group, "115200");
-@@ -292,5 +292,5 @@
-   gtk_signal_connect_after (GTK_OBJECT (spd_115200), "pressed",
-                             GTK_SIGNAL_FUNC (on_spd_pressed),
--                            LIGHT);
-+                            (gpointer) LIGHT);
- 
-   vbox3 = gtk_vbox_new (FALSE, 0);
diff --git a/graphics/gphoto/patches/patch-ah b/graphics/gphoto/patches/patch-ah
deleted file mode 100644
index 5e7f585bf59..00000000000
--- a/graphics/gphoto/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
-
---- ./mustek/rs232.c.orig	Thu Nov 18 16:50:35 1999
-+++ ./mustek/rs232.c	Mon Nov 29 16:17:36 1999
-@@ -32,5 +32,7 @@
- #include <fcntl.h>
- #include <termios.h>
-+#include <sys/types.h>
- #include <sys/time.h>
-+#include <unistd.h>
- 
- /*
diff --git a/graphics/gphoto/patches/patch-ai b/graphics/gphoto/patches/patch-ai
deleted file mode 100644
index b9deafb30cc..00000000000
--- a/graphics/gphoto/patches/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1999/11/30 01:30:50 hubertf Exp $
-
---- kodak/kodak_dc2x.c.orig	Tue Nov 30 01:34:40 1999
-+++ kodak/kodak_dc2x.c	Tue Nov 30 01:37:07 1999
-@@ -31,7 +31,11 @@
-   
-   /* Open the camera for reading/writing */
- 
-+#ifdef __NetBSD__
-+  char *serial_port = "/dev/tty00"; 
-+#else
-   char *serial_port = "/dev/ttyS0"; 
-+#endif
-  
-   int tfd;
- 
diff --git a/graphics/gphoto/patches/patch-aj b/graphics/gphoto/patches/patch-aj
deleted file mode 100644
index 63fcb919bd9..00000000000
--- a/graphics/gphoto/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.1 1999/11/30 01:30:50 hubertf Exp $
-
---- konica/configDialog.c.orig	Tue Nov 30 01:34:40 1999
-+++ konica/configDialog.c	Tue Nov 30 01:37:29 1999
-@@ -84,10 +84,17 @@
- static char *PortLabel[] = 
- {
-    "Autodetect",
-+#ifdef __NetBSD__
-+   "/dev/tty00",
-+   "/dev/tty01",
-+   "/dev/tty02",
-+   "/dev/tty03"
-+#else
-    "/dev/ttyS0",
-    "/dev/ttyS1",
-    "/dev/ttyS2",
-    "/dev/ttyS3"
-+#endif
- };
- /*---------------------------------------------------------------------*
-  *                                                                     *
diff --git a/graphics/gphoto/patches/patch-ak b/graphics/gphoto/patches/patch-ak
deleted file mode 100644
index 6ce78f5545f..00000000000
--- a/graphics/gphoto/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.1 1999/11/30 01:30:50 hubertf Exp $
-
---- konica/defs.h.orig	Tue Nov 30 01:34:40 1999
-+++ konica/defs.h	Tue Nov 30 01:37:46 1999
-@@ -79,7 +79,11 @@
- #define WHITEBAL      packet.packet[32]
- #define PICNUM        packet.packet+0xf9
- 
-+#ifdef __NetBSD__
-+#define DEFAULT_PORT	   "/dev/tty00"
-+#else
- #define DEFAULT_PORT	   "/dev/ttyS0"
-+#endif
- #define DEFAULT_SPEED   "57600"
- #define DEFAULT_PACING  "1"
- #define DEFAULT_TRACE   "Off"
diff --git a/graphics/gphoto/patches/patch-al b/graphics/gphoto/patches/patch-al
deleted file mode 100644
index aae3ce1f0f4..00000000000
--- a/graphics/gphoto/patches/patch-al
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-al,v 1.1 1999/11/30 01:30:50 hubertf Exp $
-
---- konica_qmxxx/dcx.c.orig	Tue Nov 30 01:34:40 1999
-+++ konica_qmxxx/dcx.c	Tue Nov 30 01:38:17 1999
-@@ -2291,7 +2291,11 @@
- {
- 	//dcx_debug(1);
- 	os_debug(1);
-+#ifdef __NetBSD__
-+	dcx_init("/dev/tty00", QM100 );
-+#else
- 	dcx_init("/dev/ttyS0", QM100 );
-+#endif
- 	dcx_open();
- 	dcx_close();
- }
diff --git a/graphics/gphoto/patches/patch-am b/graphics/gphoto/patches/patch-am
deleted file mode 100644
index f04e1099141..00000000000
--- a/graphics/gphoto/patches/patch-am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-am,v 1.1 1999/11/30 01:30:50 hubertf Exp $
-
---- sony/common.h.orig	Tue Nov 30 01:34:40 1999
-+++ sony/common.h	Tue Nov 30 01:38:47 1999
-@@ -17,7 +17,11 @@
- #ifdef DOS
- #define RSPORT "AUX1"
- #else
-+#ifdef __NetBSD__
-+#define RSPORT	"/dev/tty00"     
-+#else   
- #define RSPORT	"/dev/ttyS0"     
-+#endif
- #endif 
- #endif 
- 
diff --git a/graphics/gphoto/patches/patch-an b/graphics/gphoto/patches/patch-an
deleted file mode 100644
index 5a9c0be9ca6..00000000000
--- a/graphics/gphoto/patches/patch-an
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-an,v 1.1 1999/11/30 01:30:50 hubertf Exp $
-
---- src/callbacks.c.orig	Tue Nov 30 01:34:40 1999
-+++ src/callbacks.c	Tue Nov 30 01:40:05 1999
-@@ -578,17 +578,33 @@
- 	group = NULL;
- 	label = gtk_label_new("Port:");
- 	gtk_widget_show(label);
-+#ifdef __NetBSD__
-+	port0 = gtk_radio_button_new_with_label(NULL, "/dev/tty00 (COM1)");
-+#else   
- 	port0 = gtk_radio_button_new_with_label(NULL, "/dev/ttyS0 (COM1)");
-+#endif
-         gtk_widget_show(port0);
- 	gtk_button_clicked(GTK_BUTTON(port0));
-         group = gtk_radio_button_group(GTK_RADIO_BUTTON(port0));
-+#ifdef __NetBSD__
-+        port1 = gtk_radio_button_new_with_label(group, "/dev/tty01 (COM2)");
-+#else   
-         port1 = gtk_radio_button_new_with_label(group, "/dev/ttyS1 (COM2)");
-+#endif
-         gtk_widget_show(port1);
-         group = gtk_radio_button_group(GTK_RADIO_BUTTON(port1));
-+#ifdef __NetBSD__
-+        port2 = gtk_radio_button_new_with_label(group, "/dev/tty02 (COM3)");
-+#else   
-         port2 = gtk_radio_button_new_with_label(group, "/dev/ttyS2 (COM3)");
-+#endif
-         gtk_widget_show(port2);
-         group = gtk_radio_button_group(GTK_RADIO_BUTTON(port2));
-+#ifdef __NetBSD__
-+        port3 = gtk_radio_button_new_with_label(group, "/dev/tty03 (COM4)");
-+#else   
-         port3 = gtk_radio_button_new_with_label(group, "/dev/ttyS3 (COM4)");
-+#endif
-         gtk_widget_show(port3);
-         group = gtk_radio_button_group(GTK_RADIO_BUTTON(port3));
-         other = gtk_radio_button_new_with_label(group, "other");
-@@ -704,7 +720,11 @@
- 	}
- 
- 	/* reset to defaults, and save */
-+#ifdef __NetBSD__
-+	sprintf(serial_port, "/dev/tty00");
-+#else   
- 	sprintf(serial_port, "/dev/ttyS0");
-+#endif
- 	sprintf(camera_model, "Browse Directory");
- 	sprintf(post_process_script, "");
- 	save_config();
diff --git a/graphics/gphoto/pkg/PLIST b/graphics/gphoto/pkg/PLIST
index 58079a0ad78..700bc437f13 100644
--- a/graphics/gphoto/pkg/PLIST
+++ b/graphics/gphoto/pkg/PLIST
@@ -1,42 +1,44 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/12/08 17:25:24 hubertf Exp $
 bin/gphoto-exifdump
 bin/qm100
 bin/qmxxx
 bin/rsony
 bin/gphoto
-lib/gphoto/libgphoto_canon.so.0.0
-lib/gphoto/libgphoto_canon.a
-lib/gphoto/libgphoto_casio_qv.so.0.0
-lib/gphoto/libgphoto_casio_qv.a
-lib/gphoto/libgphoto_dir.so.0.0
-lib/gphoto/libgphoto_dir.a
-lib/gphoto/libgphoto_fuji.so.0.0
-lib/gphoto/libgphoto_fuji.a
-lib/gphoto/libgphoto_kodak_dc2x.so.0.0
-lib/gphoto/libgphoto_kodak_dc2x.a
-lib/gphoto/libgphoto_philips.a
-lib/gphoto/libgphoto_kodak_generic.so.0.0
-lib/gphoto/libgphoto_kodak_generic.a
-lib/gphoto/libgphoto_konica_qm100.so.0.0
-lib/gphoto/libgphoto_konica_qm100.a
-lib/gphoto/libgphoto_konica_qmxxx.so.0.0
-lib/gphoto/libgphoto_konica_qmxxx.a
-lib/gphoto/libgphoto_dimage_v.so.0.0
-lib/gphoto/libgphoto_dimage_v.a
-lib/gphoto/libgphoto_mustek_mdc800.so.1.0
-lib/gphoto/libgphoto_mustek_mdc800.a
-lib/gphoto/libgphoto_coolpix600.so.0.0
-lib/gphoto/libgphoto_coolpix600.a
-lib/gphoto/libgphoto_philips.so.0.5
-lib/gphoto/libgphoto_photopc.so.0.0
-lib/gphoto/libgphoto_photopc.a
-lib/gphoto/libgphoto_ricoh300z.so.0.0
-lib/gphoto/libgphoto_ricoh300z.a
-lib/gphoto/libgphoto_sony_dscf55.so.0.0
-lib/gphoto/libgphoto_sony_dscf55.a
-lib/gphoto/libgphoto_sony_dscf1.so.0.0
-lib/gphoto/libgphoto_sony_dscf1.a
+lib/gphoto/drivers/libgphoto_canon.so.0.0
+lib/gphoto/drivers/libgphoto_canon.a
+lib/gphoto/drivers/libgphoto_casio_qv.so.0.0
+lib/gphoto/drivers/libgphoto_casio_qv.a
+lib/gphoto/drivers/libgphoto_dir.so.0.0
+lib/gphoto/drivers/libgphoto_dir.a
+lib/gphoto/drivers/libgphoto_fuji.so.0.0
+lib/gphoto/drivers/libgphoto_fuji.a
+lib/gphoto/drivers/libgphoto_kodak_dc2x.so.0.0
+lib/gphoto/drivers/libgphoto_kodak_dc2x.a
+lib/gphoto/drivers/libgphoto_kodak_generic.so.0.0
+lib/gphoto/drivers/libgphoto_kodak_generic.a
+lib/gphoto/drivers/libgphoto_konica_qm100.so.0.0
+lib/gphoto/drivers/libgphoto_konica_qm100.a
+lib/gphoto/drivers/libgphoto_konica_qmxxx.so.0.0
+lib/gphoto/drivers/libgphoto_konica_qmxxx.a
+lib/gphoto/drivers/libgphoto_dimage_v.so.0.0
+lib/gphoto/drivers/libgphoto_dimage_v.a
+lib/gphoto/drivers/libgphoto_mustek_mdc800.so.1.0
+lib/gphoto/drivers/libgphoto_mustek_mdc800.a
+lib/gphoto/drivers/libgphoto_coolpix600.so.0.0
+lib/gphoto/drivers/libgphoto_coolpix600.a
+lib/gphoto/drivers/libgphoto_philips.so.0.5
+lib/gphoto/drivers/libgphoto_philips.a
+lib/gphoto/drivers/libgphoto_photopc.so.0.0
+lib/gphoto/drivers/libgphoto_photopc.a
+lib/gphoto/drivers/libgphoto_ricoh300z.so.0.0
+lib/gphoto/drivers/libgphoto_ricoh300z.a
+lib/gphoto/drivers/libgphoto_sony_dscf55.so.0.0
+lib/gphoto/drivers/libgphoto_sony_dscf55.a
+lib/gphoto/drivers/libgphoto_sony_dscf1.so.0.0
+lib/gphoto/drivers/libgphoto_sony_dscf1.a
 man/man1/gphoto.1
+share/doc/gphoto/AUTHORS
+share/doc/gphoto/MANUAL
 share/gphoto/gallery/Default/banner.gif
 share/gphoto/gallery/Default/index.gif
 share/gphoto/gallery/Default/index_bottom.html
@@ -62,12 +64,11 @@ share/gphoto/gallery/CSStheme/styles.css
 share/gphoto/gallery/CSStheme/thumbnail.html
 share/gphoto/gallery/CSStheme/vh40.png
 share/gphoto/gallery/CSStheme/gphotobutton.png
-share/gphoto/doc/AUTHORS
-share/gphoto/doc/MANUAL
-@dirrm lib/gphoto
-@dirrm share/gphoto/doc
-@dirrm share/gphoto/gallery/CSStheme
+share/gnome/apps/Graphics/gphoto.desktop
 @dirrm share/gphoto/gallery/RedNGray
 @dirrm share/gphoto/gallery/Default
+@dirrm share/gphoto/gallery/CSStheme
 @dirrm share/gphoto/gallery
 @dirrm share/gphoto
+@dirrm share/doc/gphoto
+@dirrm lib/gphoto/drivers