Merge branch 'feature/upstream' into develop

5 files changed, 15 insertions, 10 deletions

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 684815a..105d178 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -42,15 +42,15 @@ if have_usblib
 sane_find_scanner_SOURCES += check-usb-chip.c
 endif
 sane_find_scanner_LDADD = ../sanei/libsanei.la ../lib/liblib.la \
-			  $(USB_LIBS) $(IEEE1284_LIBS) $(SCSI_LIBS) \
+                          $(USB_LIBS) $(IEEE1284_LIBS) $(SCSI_LIBS) $(XML_LIBS) \
 			  ../backend/sane_strstatus.lo
 
 gamma4scanimage_SOURCES = gamma4scanimage.c
 gamma4scanimage_LDADD = $(MATH_LIB)
 
-umax_pp_SOURCES = umax_pp.c
-umax_pp_LDADD = ../sanei/libsanei.la ../lib/liblib.la $(MATH_LIB) \
-	        ../backend/umax_pp_low.lo
+umax_pp_SOURCES  = umax_pp.c
+umax_pp_SOURCES += ../backend/umax_pp_low.c
+umax_pp_LDADD = ../sanei/libsanei.la ../lib/liblib.la $(MATH_LIB)
 
 sane_desc_SOURCES = sane-desc.c
 sane_desc_LDADD = ../sanei/libsanei.la ../lib/liblib.la
diff --git a/tools/create-changelog.sh b/tools/create-changelog.sh
index a0b8d91..bb3c8f2 100755
--- a/tools/create-changelog.sh
+++ b/tools/create-changelog.sh
@@ -4,7 +4,7 @@
 #
 # License: GPL-3.0+
 
-git log --date=iso8601 --decorate=short 1.0.27..HEAD \
+git log --date=iso8601 --decorate=short 1.0.28..HEAD \
     | sed 's/^[ \t]*$//' \
     > ChangeLog
 
@@ -12,5 +12,5 @@ cat << EOF >> ChangeLog
 
 ----------------------------------------------------------------------
 Older ChangeLog entries can be found in the ChangeLogs/ directory on a
-file per release basis.  Please note that 1.0.26 was never released.
+file per release basis.  Please note that version 1.0.26 was skipped.
 EOF
diff --git a/tools/sane-find-scanner.c b/tools/sane-find-scanner.c
index a62ceac..ac25c55 100644
--- a/tools/sane-find-scanner.c
+++ b/tools/sane-find-scanner.c
@@ -1611,7 +1611,7 @@ main (int argc, char **argv)
 	      usage (0);
 	      exit (0);
 	    }
-
+          // fall through
 	default:
 	  printf ("unknown option: -%c, try -h for help\n", (*ap)[1]);
 	  exit (0);
@@ -2009,7 +2009,12 @@ main (int argc, char **argv)
 	  }
 
 	if (verbose > 3)
+#if LIBUSB_API_VERSION >= 0x01000106
+          libusb_set_option (sfs_usb_ctx, LIBUSB_OPTION_LOG_LEVEL,
+                             LIBUSB_LOG_LEVEL_INFO);
+#else
 	  libusb_set_debug (sfs_usb_ctx, 3);
+#endif
 
 	devcnt = libusb_get_device_list (sfs_usb_ctx, &devlist);
 	if (devcnt < 0)
diff --git a/tools/umax_pp.c b/tools/umax_pp.c
index 7b127e3..eabf900 100644
--- a/tools/umax_pp.c
+++ b/tools/umax_pp.c
@@ -32,7 +32,7 @@ main (int argc, char **argv)
   char dbgstr[80];
   int probe = 0;
   int port = 0;
-  char *name = NULL;
+  const char *name = NULL;
   int scan = 0;
   int lamp = -1;
   int i;
diff --git a/tools/update-upstreams.sh b/tools/update-upstreams.sh
index 3fde735..3a5e94a 100755
--- a/tools/update-upstreams.sh
+++ b/tools/update-upstreams.sh
@@ -6,11 +6,11 @@
 
 fetch () {
     if type curl 2>/dev/null >/dev/null ; then
-        curl --silent --location --remote-name $1
+        curl --location --remote-name $1
         return
     fi
     if type wget 2>/dev/null >/dev/null ; then
-        wget --quiet --output-document $(echo $1 | sed 's,.*/,,') $1
+        wget --output-document $(echo $1 | sed 's,.*/,,') $1
     fi
 }