2001-04-08 Henning Meier-Geinitz <hmg@gmx.de>

* backend/mustek.c backend/mustek.desc backend/mustek.CHANGES
	  Added detection of the TA for the Paragon 1200 SP Pro. Added
	  warning about not supported Trust scanners. Changed description
	  of contarst and brightness settings. Backend status is "stable"
	  now. New version: 1.0-106.
	* acinclude.m4 aclocal.m4: Fixed comment concerning dc240.
	* configure configure.in include/sane/config.h.in: Added test for
	  socklen_t in sys/socket.h. This fixes the compilation problem on
	  Irix.
	* doc/sane-avision.man doc/sane-ricoh.man doc/sane-s9036.man
	  doc/sane-tamarack.man: find-scanner is now called
	  sane-find-scanner and installed on the system so it's not
	  necessary to point to the tools directory.
	* frontend/scanimage.c: Fixed too long line in output.
	* sane-config.in: Name is sane-config again (was sane-backends-config
	  due to the renaming of the package).
	* TODO: Removed entry about net.c not compiling on Irix and
	  references to find-scanner in the man pages. Updated numbers of
	  the compilation warnings. Still too many, however.

acinclude.m4

@@ -83,7 +83,7 @@ AC_DEFUN(SANE_CHECK_PTAL,
 ])
 
 #
-# Checks for jpeg library >= v6B (61), needed for DC210 backend.
+# Checks for jpeg library >= v6B (61), needed for DC210 and DC240 backends.
 AC_DEFUN(SANE_CHECK_JPEG,
 [
   AC_CHECK_LIB(jpeg,jpeg_start_decompress, 

aclocal.m4

@@ -95,13 +95,12 @@ AC_DEFUN(SANE_CHECK_PTAL,
 ])
 
 #
-# Checks for jpeg library >= v6B (61), needed for DC210 backend.
-# Henning Meier Geinitz
+# Checks for jpeg library >= v6B (61), needed for DC210 and DC240 backends.
 AC_DEFUN(SANE_CHECK_JPEG,
 [
-  AC_CHECK_LIB(jpeg,jpeg_start_decompress,
+  AC_CHECK_LIB(jpeg,jpeg_start_decompress, 
   [
-    AC_CHECK_HEADER(jconfig.h,
+    AC_CHECK_HEADER(jconfig.h, 
     [
       AC_MSG_CHECKING([for jpeglib - version >= 61 (6a)])
       AC_EGREP_CPP(sane_correct_jpeg_lib_version_found,
@@ -110,7 +109,7 @@ AC_DEFUN(SANE_CHECK_JPEG,
         #if JPEG_LIB_VERSION >= 61
           sane_correct_jpeg_lib_version_found
         #endif
-      ],[sane_cv_use_libjpeg="yes"; LIBS="${LIBS} -ljpeg";
+      ],[sane_cv_use_libjpeg="yes"; LIBS="${LIBS} -ljpeg"; 
       AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
     ],)
   ],)

backend/mustek.CHANGES

@@ -1,5 +1,20 @@
 CHANGES for the SANE Mustek backend
 
+2001-04-08
+  * Backend status is "stable" now. Hopefully this doesn't mean that new
+    bugs show up now :-)
+
+2001-04-01
+  * Added detection of the Pro models TA (at least the 1200SP Pro).
+  * Added warning about real (not relabeled) Trust scanners.
+
+2001-03-31
+  * Removed comment about brightness and contrast in the description strings
+    because you can't read them anyway in color mode (at least with xsane).
+
+2001-03-31
+  * Released Mustek backend 1.0-105
+
 2001-03-31
   * Removed compilation warning in gamma_correction.
   * Fixed handling of tlx and brx when scanning with ADF (bug found by

backend/mustek.desc

@@ -9,8 +9,8 @@
 ;
 
 :backend "mustek"		; name of backend
-:version "1.0-105"		; version of backend
-:status :beta			; :alpha, :beta, :stable, :new
+:version "1.0-106"		; version of backend
+:status :stable			; :alpha, :beta, :stable, :new
 :manpage "sane-mustek"		; name of manpage (if it exists)
 :url "http://hmg.home.pages.de/sane/"
 

doc/sane-avision.man

@@ -20,10 +20,8 @@ Where
 is the path-name for the special device that corresponds to a
 SCSI scanner. The special device name must be a generic SCSI device or a
 symlink to such a device.  The program 
-.IR find-scanner 
-helps to find out the correct device. It can be found in the
-.IR tools
-directory of the SANE distribution. Under Linux, such a device name
+.IR sane-find-scanner 
+helps to find out the correct device. Under Linux, such a device name
 could be
 .I /dev/sga
 or

doc/sane-ricoh.man

@@ -27,10 +27,8 @@ Where
 is the path-name for the special device that corresponds to a
 SCSI scanner. The special device name must be a generic SCSI device or a
 symlink to such a device.  The program 
-.IR find-scanner 
-helps to find out the correct device. It can be found in the
-.IR tools
-directory of the SANE distribution. Under Linux, such a device name
+.IR sane-find-scanner 
+helps to find out the correct device. Under Linux, such a device name
 could be
 .I /dev/sga
 or

doc/sane-s9036.man

@@ -20,10 +20,8 @@ Where
 is the path-name for the special device that corresponds to a
 SCSI scanner. The special device name must be a generic SCSI device or a
 symlink to such a device.  The program 
-.IR find-scanner 
-helps to find out the correct device. It can be found in the
-.IR tools
-directory of the SANE distribution. Under Linux, such a device name
+.IR sane-find-scanner 
+helps to find out the correct device. Under Linux, such a device name
 could be
 .I /dev/sga
 or

doc/sane-tamarack.man

@@ -29,10 +29,8 @@ Where
 is the path-name for the special device that corresponds to a
 SCSI scanner. The special device name must be a generic SCSI device or a
 symlink to such a device.  The program 
-.IR find-scanner 
-helps to find out the correct device. It can be found in the
-.IR tools
-directory of the SANE distribution. Under Linux, such a device name
+.IR sane-find-scanner 
+helps to find out the correct device. Under Linux, such a device name
 could be
 .I /dev/sga
 or

frontend/scanimage.c

@@ -1420,7 +1420,7 @@ main (int argc, char **argv)
 	      printf ("\nNo scanners were identified. If you were expecting "
 		      "something different,\ncheck that the scanner is plugged "
 		      "in, turned on and detected by the\nsane-find-scanner tool "
-		      "(if appropriate). Please read the documentation which came\n"
+		      "(if appropriate). Please read the documentation\nwhich came "
 		      "with this software (README, FAQ, manpages).\n");
 	    if (defdevname)
 	      printf ("default device is `%s'\n", defdevname);

include/sane/config.h.in

@@ -58,6 +58,9 @@
 /* Define to `long' if <sys/types.h> doesn't define.  */
 #undef ssize_t
 
+/* Define socklen_t as `int' if necessary.  */
+#undef socklen_t
+
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef pid_t