PACKAGE_VERSION fix. Fixed debug message in do_stop: really print exit status

of reader process.

ChangeLog

@@ -6,6 +6,9 @@
 	  tools/sane-desc.c: Fixed PACKAGE_VERSION breakage. PACKAGE_VERSION was
 	  redefined by autoconf 2.5 with a different meaning. Use PACKAGE_STRING
 	  instead.
+	* backend/mustek.c doc/descriptions/mustek.desc doc/mustek/mustek.CHANGES:
+	  PACKAGE_VERSION fix. Fixed debug message in do_stop: really print exit
+	  status of reader process.
 
 2002-11-29 Oliver Rauch <Oliver.Rauch@Rauch-Domain.DE>
 

backend/mustek.c

@@ -46,7 +46,7 @@
 
 /**************************************************************************/
 /* Mustek backend version                                                 */
-#define BUILD 129
+#define BUILD 130
 /**************************************************************************/
 
 #include "../include/sane/config.h"
@@ -2844,14 +2844,16 @@ do_stop (Mustek_Scanner * s)
       DBG (5, "do_stop: terminating reader process\n");
       kill (s->reader_pid, SIGTERM);
       pid = waitpid (s->reader_pid, &exit_status, 0);
+
+      if (status != SANE_STATUS_CANCELLED && pid > 0
+	  && WIFEXITED (exit_status))
+	status = WEXITSTATUS (exit_status);
+
       DBG (5, "do_stop: reader process terminated: %s\n",
 	   sane_strstatus (status));
       if (pid <= 0)
 	DBG (5, "do_stop: reader process already terminated (%s)\n",
 	     strerror (errno));
-      if (status != SANE_STATUS_CANCELLED && pid > 0
-	  && WIFEXITED (exit_status))
-	status = WEXITSTATUS (exit_status);
       s->reader_pid = 0;
     }
 
@@ -5009,7 +5011,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
 #endif
 
   DBG (2, "SANE mustek backend version %d.%d build %d from %s\n", V_MAJOR,
-       V_MINOR, BUILD, PACKAGE_VERSION);
+       V_MINOR, BUILD, PACKAGE_STRING);
 
   if (version_code)
     *version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);

doc/descriptions/mustek.desc

@@ -9,7 +9,7 @@
 ;
 
 :backend "mustek"		; name of backend
-:version "1.0-129"		; version of backend
+:version "1.0-130"		; version of backend
 :status :stable			; :alpha, :beta, :stable, :new
 :manpage "sane-mustek"		; name of manpage (if it exists)
 :url "http://www.meier-geinitz.de/sane/"

doc/mustek/mustek.CHANGES

@@ -1,5 +1,20 @@
 CHANGES for the SANE Mustek backend
 
+2002-11-29
+  * Released Mustek backend 1.0-130
+
+2002-11-29
+  * PACKAGE_VERSION fix.
+
+2002-11-18
+  * Fixed debug message in do_stop: really print exit status of reader process.
+
+2002-11-17
+  * Fixed minor issues in mapage. Added links to plustek and gt68xx backends.
+
+2002-11-09
+  * Added link to SCSI documentation to manpage.
+
 2002-11-07
   * Released Mustek backend 1.0-129