--- ./doc/Makefile.in	Wed Apr 30 19:12:55 2003
+++ ../sane-backends-1.0.12/./doc/Makefile.in	Mon Jun 23 15:43:16 2003
@@ -25,7 +25,7 @@
 includedir = @includedir@
 oldincludedir = /usr/include
 configdir = ${sysconfdir}/sane.d
-docdir=$(prefix)/doc/sane-@VERSION@
+docdir=$(datadir)/doc/sane-backends
 
 MKDIR = $(top_srcdir)/mkinstalldirs
 INSTALL = @INSTALL@
--- ./backend/Makefile.in	Tue May 13 05:39:50 2003
+++ ../sane-backends-1.0.12/./backend/Makefile.in	Mon Jun 23 15:43:16 2003
@@ -46,6 +46,7 @@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 BACKENDLIBS = @LIBS@ @DL_LIB@
+GPHOTO2_LIBS = @GPHOTO2_LIBS@
 DEFS = @DEFS@
 DYNAMIC_FLAG=@DYNAMIC_FLAG@
 
@@ -79,6 +80,7 @@
 CONFIGS = $(addsuffix .conf,$(ALL_BACKENDS)) saned.conf
 
 EXTRA = sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_config.lo
+.NOTPARALLEL: $(EXTRA)
 
 # With libtool-1.0, we have to mention each library object explicitly... ;-(
 ifneq (@LIBOBJS@ @ALLOCA@,)
@@ -152,6 +154,11 @@
 
 
 .PHONY: all clean depend dist distclean install uninstall
+
+libsane-gphoto2.la: gphoto2.lo gphoto2-s.lo $(EXTRA) $(LIBOBJS)
+	@$(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) \
+	$(LDFLAGS) $(GPHOTO2_LIBS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
+	-version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
 
 libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS)
 	@$(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) \
--- ./backend/teco2.c	Sat Apr 26 07:10:26 2003
+++ ../sane-backends-1.0.12/./backend/teco2.c	Mon Jun 23 15:48:36 2003
@@ -1253,8 +1253,19 @@
   size_t size;
 
 
+  /*
+   * Ah! size is not yet initialized, and it's nevertheless used to setup the
+   * CDB. A better value should be dev->buffer_size...
+   */
+  size = dev->buffer_size;
   MKSCSI_REQUEST_SENSE (cdb, size);
-  size = cdb.data[5];
+
+  /*
+   * Not needed, since MKSCSI_REQUEST_SENSE always initialized cdb.data[5] to
+   * zero.
+   *
+   *   size = cdb.data[5];
+   */
 
   hexdump (DBG_info2, "teco_request_sense: enter\n", cdb.data, cdb.len);
 
--- ./backend/canon-sane.c	Fri Feb 28 05:27:57 2003
+++ ../sane-backends-1.0.12/./backend/canon-sane.c	Mon Jun 23 15:45:51 2003
@@ -2079,7 +2079,10 @@
 
   *len = 0;
 
-  DBG (21, "   read_fb1200: nread=%d, bytes_to_read=%d\n", nread,
+  /*
+   * Please: don't print unitialized variables...
+   */
+  DBG (21, "   read_fb1200: nread=%d, bytes_to_read=%d\n", nread = 0,
        s->bytes_to_read);
 
   if (s->bytes_to_read == 0 && s->buf_pos == s->buf_used)
--- ./backend/dc25.conf	Tue Jan  7 04:49:46 2003
+++ ../sane-backends-1.0.12/./backend/dc25.conf	Mon Jun 23 15:43:16 2003
@@ -1,8 +1,8 @@
 # Serial port where the camera is connected
 ## Linux
-port=/dev/ttyS0
+#port=/dev/ttyS0
 ## IRIX
-#port=/dev/ttyd1
+port=/dev/ttyd1
 ## Solaris
 #port=/dev/term/a
 ## HP-UX
--- ./backend/dc240.conf	Tue Jan  7 04:49:45 2003
+++ ../sane-backends-1.0.12/./backend/dc240.conf	Mon Jun 23 15:43:16 2003
@@ -1,8 +1,8 @@
 # Serial port where the camera is connected
 ## Linux
-port=/dev/ttyS0
+#port=/dev/ttyS0
 ## IRIX
-#port=/dev/ttyd1
+port=/dev/ttyd1
 ## Solaris
 #port=/dev/term/a
 ## HP-UX
--- ./backend/dc210.conf	Tue Jan  7 04:49:45 2003
+++ ../sane-backends-1.0.12/./backend/dc210.conf	Mon Jun 23 15:43:16 2003
@@ -1,8 +1,8 @@
 # Serial port where the camera is connected
 ## Linux
-port=/dev/ttyS0
+#port=/dev/ttyS0
 ## IRIX
-#port=/dev/ttyd1
+port=/dev/ttyd1
 ## Solaris
 #port=/dev/term/a
 ## HP-UX
--- ./backend/hp5400_internal.c	Thu May  8 08:33:21 2003
+++ ../sane-backends-1.0.12/./backend/hp5400_internal.c	Mon Jun 23 15:47:44 2003
@@ -512,7 +512,7 @@
 
       res =
 	hp5400_bulk_read_block (iHandle, CMD_INITBULK3, cmd, sizeof (cmd),
-				p->buffer + p->bufend, p->blksize);
+				(char *) p->buffer + p->bufend, p->blksize);
       if (res != p->blksize)
 	{
 	  DBG (DBG_ERR, "*** ERROR: Read returned %d. FATAL.", res);
@@ -530,9 +530,9 @@
   if (p->bpp == 1)
     {
       char *itPix = (char *) pabLine;
-      char *itR = (char *) (p->buffer + p->bufstart + p->roff);
-      char *itG = (char *) (p->buffer + p->bufstart + p->goff);
-      char *itB = (char *) (p->buffer + p->bufstart + p->boff);
+      char *itR = (char *) ((char *) p->buffer + p->bufstart + p->roff);
+      char *itG = (char *) ((char *) p->buffer + p->bufstart + p->goff);
+      char *itB = (char *) ((char *) p->buffer + p->bufstart + p->boff);
       for (i = 0; i < p->pixels; i++)
 	{
 	  /* pointer move goes a little bit faster than vector access */
@@ -546,9 +546,9 @@
   else
     {
       short *itPix = (short *) pabLine;
-      short *itR = (short *) (p->buffer + p->bufstart + p->roff);
-      short *itG = (short *) (p->buffer + p->bufstart + p->goff);
-      short *itB = (short *) (p->buffer + p->bufstart + p->boff);
+      short *itR = (short *) ((char *) p->buffer + p->bufstart + p->roff);
+      short *itG = (short *) ((char *) p->buffer + p->bufstart + p->goff);
+      short *itB = (short *) ((char *) p->buffer + p->bufstart + p->boff);
       for (i = 0; i < p->pixels; i++)
 	{
 #if 0
@@ -576,7 +576,7 @@
   /* If we've used a whole block at the beginning, move it */
   if (p->bufstart > p->blksize)
     {
-      memmove (p->buffer, p->buffer + p->bufstart, p->bufend - p->bufstart);
+      memmove (p->buffer, (char *) p->buffer + p->bufstart, p->bufend - p->bufstart);
 
       p->bufend -= p->bufstart;
       p->bufstart = 0;
--- ./acinclude.m4	Thu May 15 06:51:16 2003
+++ ../sane-backends-1.0.12/./acinclude.m4	Mon Jun 23 15:43:16 2003
@@ -345,8 +345,7 @@
 
 			CPPFLAGS="${CPPFLAGS} `gphoto2-config --cflags`"
 			GPHOTO2_LIBS="`gphoto2-config --libs`"
-			SANE_EXTRACT_LDFLAGS(LDFLAGS, GPHOTO2_LIBS)
-			LIBS="${LIBS} ${GPHOTO2_LIBS}"
+			AC_SUBST(GPHOTO2_LIBS)
 		fi
 ])	fi
 ])
--- ./ltmain.sh	Wed Apr 30 19:12:55 2003
+++ ../sane-backends-1.0.12/./ltmain.sh	Mon Jun 23 15:43:16 2003
@@ -68,7 +68,7 @@
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
 mv="mv -f"
 rm="rm -f"