Merge branch 'release/debian/1.1.1-3'debian/1.1.1-3

14 files changed, 123 insertions, 39 deletions

diff --git a/.gitignore b/.gitignore
index bd3b383..7daab1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,8 @@ test-suite.log
 
 # `make dist` artifacts
 /sane-backends-*.tar.gz
+
+
+# debian
+.pc
+debian/files
diff --git a/debian/1.sh b/debian/1.sh
deleted file mode 100755
index 9d8e101..0000000
--- a/debian/1.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-
-
-    if  [ ! -d /var/lib/saned ] ; then
-	echo /var/lib/saned not found
-    fi
-
-    if  [ -d /var/lib/saned ] ; then
-	echo /var/lib/saned found
-    fi
-
diff --git a/debian/changelog b/debian/changelog
index bae3faf..ca09256 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,34 @@
+sane-backends (1.1.1-3) unstable; urgency=medium
+
+  * Remove test artefact (debian/1.sh).
+  * debian/changelog:
+    - Fix spelling error (Closes: #1006116).
+  * debian/sane-utils.postinst:
+    - Remove not longer requested home directory move.
+  * debian/sane-utils.postrm:
+    - Don't remove group scanner (Closes: #1005737).
+  * debian/control:
+    - Add Recommends: sane-airscan to libsane1 (Closes: 1005817).
+  * Move man page sane-umax_pp.5 back to libsane-common (Closes: #1005736):
+    - debian/rules:
+      - Remove delete manpage from libsane-common.
+    - New debian/sane-utils.preinst to remove man page and symlink.
+    - debian/sane-utils.link:
+      - Remove create link from sane-umax_pp.5
+    - debian/control:
+      - Add new Breaks and Replace.
+  * New debian/patches/0185-Change_output_from_sane-find-scanner.patch:
+    - Improve output for possible USB scanners (Closes: #983332).
+  * debian/libsane1.symbols:
+    - Add !kfreebsd-any to missing symbol.
+  * debian/copyright:
+    - Refresh Upstream Contact and Source.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Wed, 23 Feb 2022 09:28:33 +0100
+
 sane-backends (1.1.1-2) unstable; urgency=medium
 
-  * debina/sane-utils.postinst:
+  * debian/sane-utils.postinst:
     - Fix syntax error (Closes: #1005102).
 
  -- Jörg Frings-Fürst <debian@jff.email>  Mon, 07 Feb 2022 20:35:48 +0100
diff --git a/debian/control b/debian/control
index 8794851..a7b9e87 100644
--- a/debian/control
+++ b/debian/control
@@ -43,8 +43,7 @@ Depends:
  ${shlibs:Depends}
 Pre-Depends:
  ${misc:Pre-Depends}
-Breaks: libsane-common (<<1.0.27-1~)
-Replaces: libsane-common (<<1.0.27-1~)
+Breaks: libsane-common (<<1.1.1-3~)
 Suggests: avahi-daemon, unpaper
 Description: API library for scanners -- utilities
  SANE stands for "Scanner Access Now Easy" and is an application
@@ -67,7 +66,8 @@ Multi-Arch: foreign
 Pre-Depends:
  dpkg (>= 1.15.7.2)
 Depends: ${misc:Depends}
-Breaks: sane-utils (<<1.0.27-1~)
+Breaks: sane-utils (<<1.1.1-3~)
+Replaces: sane-utils (<<1.1.1-3~)
 Description: API library for scanners -- documentation and support files
  SANE stands for "Scanner Access Now Easy" and is an application
  programming interface (API) that provides standardized access to any
@@ -97,6 +97,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends}
 Recommends:
+ sane-airscan,
  sane-utils (>= ${binary:Version}),
  ipp-usb
 Suggests: avahi-daemon, hplip
diff --git a/debian/copyright b/debian/copyright
index 551790f..6671360 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: sane-backends
-Upstream-Contact:
-Source: ftp://ftp.sane-project.org/pub/sane/
+Upstream-Contact: <sane-devel@alioth-lists.debian.net>
+Source: https://gitlab.com/sane-project/backends/-/archive/master/
 
 Files: *
 Copyright: 1997-2014 Andreas Beck
diff --git a/debian/libsane1.symbols b/debian/libsane1.symbols
index 69ecbbb..b32e02e 100644
--- a/debian/libsane1.symbols
+++ b/debian/libsane1.symbols
@@ -1,6 +1,6 @@
 libsane.so.1 libsane1 #MINVER#
 * Build-Depends-Package: libsane-dev
- (arch=!hurd-i386)cmsg@Base 1.0.29
+ (arch=!hurd-i386 !kfreebsd-any)cmsg@Base 1.0.29
  fail_test@Base 1.0.29
  md5_buffer@Base 1.0.27
  md5_finish_ctx@Base 1.0.27
diff --git a/debian/patches/0185-Change_output_from_sane-find-scanner.patch b/debian/patches/0185-Change_output_from_sane-find-scanner.patch
new file mode 100644
index 0000000..ee4bc1a
--- /dev/null
+++ b/debian/patches/0185-Change_output_from_sane-find-scanner.patch
@@ -0,0 +1,51 @@
+Description: Improve output for possible USB scanners
+Author: Ralph Little 
+Origin: upstream, https://gitlab.com/sane-project/backends/-/commit/b701c499c9ce56c6bbea14b2fac2feea37f2410f
+Bug: https://gitlab.com/sane-project/backends/-/issues/575
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983332
+Forwarded: not-needed
+Applied-Upstream: commit b701c499c9ce56c6bbea14b2fac2feea37f2410f
+Last-Update: 2022-02-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/tools/sane-find-scanner.c
+===================================================================
+--- trunk.orig/tools/sane-find-scanner.c
++++ trunk/tools/sane-find-scanner.c
+@@ -384,7 +384,7 @@ check_usb_file (char *file_name)
+ 	{
+ 	  if (verbose > 1)
+ 	    printf (" open ok, vendor and product ids were identified\n");
+-	  printf ("found USB scanner (vendor=0x%04x, "
++	  printf ("found possible USB scanner (vendor=0x%04x, "
+ 		  "product=0x%04x) at %s\n", vendor, product, file_name);
+ 	}
+       else
+@@ -392,7 +392,7 @@ check_usb_file (char *file_name)
+ 	  if (verbose > 1)
+ 	    printf (" open ok, but vendor and product could NOT be "
+ 		    "identified\n");
+-	  printf ("found USB scanner (UNKNOWN vendor and product) "
++	  printf ("found possible USB scanner (UNKNOWN vendor and product) "
+ 		  "at device %s\n", file_name);
+ 	  unknown_found = SANE_TRUE;
+ 	}
+@@ -676,7 +676,8 @@ check_libusb_device (struct usb_device *
+     {
+       char * chipset = check_usb_chip (dev, verbose, from_file);
+ 
+-      printf ("found USB scanner (vendor=0x%04x", dev->descriptor.idVendor);
++      printf ("found possible USB scanner (vendor=0x%04x",
++	      dev->descriptor.idVendor);
+       if (vendor)
+ 	printf (" [%s]", vendor);
+       printf (", product=0x%04x", dev->descriptor.idProduct);
+@@ -1066,7 +1067,7 @@ check_libusb_device (libusb_device *dev,
+       if(!from_file)
+         chipset = check_usb_chip (verbose, desc, hdl, config0);
+ 
+-      printf ("found USB scanner (vendor=0x%04x", vid);
++      printf ("found possible USB scanner (vendor=0x%04x", vid);
+       if (vendor)
+ 	printf (" [%s]", vendor);
+       printf (", product=0x%04x", pid);
diff --git a/debian/patches/series b/debian/patches/series
index a1dd4c2..31378d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@
 #0170-return_empty_list_when_local_devices_requested.patch
 0605-fix_groff-warnings.patch
 #0180-gt68xx_fix_use-after-free_two_memleaks.patch
+0185-Change_output_from_sane-find-scanner.patch
diff --git a/debian/rules b/debian/rules
index d0e1664..ef8e976 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,7 +106,6 @@ override_dh_installman-indep:
 	$(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/sane-find-scanner.1
 	$(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/scanimage.1
 	$(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/sane-config.1
-	$(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man5/sane-umax_pp.5
 	$(RM) -r $(CURDIR)/debian/libsane-common/usr/share/man/man8/
 	$(RM) -r $(CURDIR)/debian/libsane-common/usr/share/man/man1/
         # remove manpages for not build libs
diff --git a/debian/sane-utils.links b/debian/sane-utils.links
index dacfe5d..50ffd0e 100644
--- a/debian/sane-utils.links
+++ b/debian/sane-utils.links
@@ -1,2 +1 @@
 /dev/null  /lib/systemd/system/saned.service
-/usr/share/man/man5/sane-umax_pp.5 /usr/share/man/man5/umax_pp.5
diff --git a/debian/sane-utils.manpages b/debian/sane-utils.manpages
index 6a2c010..357020f 100644
--- a/debian/sane-utils.manpages
+++ b/debian/sane-utils.manpages
@@ -1,3 +1,2 @@
 usr/share/man/man8/*.8
 usr/share/man/man1/*.1
-/usr/share/man/man5/sane-umax_pp.5
diff --git a/debian/sane-utils.postinst b/debian/sane-utils.postinst
index 4d8e9b1..b026a6e 100644
--- a/debian/sane-utils.postinst
+++ b/debian/sane-utils.postinst
@@ -46,22 +46,6 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
 	adduser --home /var/lib/saned  --quiet --system --group saned || true
     fi
 
-    # Move home from /home/saned to /var/lib/saned (since 1.0.24-6)
-    if getent passwd | grep "^saned:" | grep -q "/home/saned"; then
-	echo "Test for running scanbd"
-	if ps -Af | grep "saned" | grep -q "scanbd"; then
-	    echo "Stop scanbd"
-	    invoke-rc.d --quiet scanbd stop
-	    echo "Move homedir from /home/saned to /var/lib/saned"
-	    usermod -d /var/lib/saned saned
-	    echo "Start scanbd"
-	    invoke-rc.d --quiet scanbd start
-	else
-	    echo "Move homedir from /home/saned to /var/lib/saned"
-	    usermod -d /var/lib/saned saned
-	fi
-    fi
-
     if [ ! -d /var/lib/saned ] ; then
 	usermod -d /var/lib/saned saned
     fi
diff --git a/debian/sane-utils.postrm b/debian/sane-utils.postrm
index 4bb3253..f5a0394 100644
--- a/debian/sane-utils.postrm
+++ b/debian/sane-utils.postrm
@@ -55,7 +55,6 @@ if [ "$1" = purge ] ; then
 #
     if pathfind deluser ; then
 	deluser -q --group --system saned || true
-	deluser -q --group --system scanner || true
 	deluser -q --system --remove-home saned || true
     fi
 
diff --git a/debian/sane-utils.preinst b/debian/sane-utils.preinst
new file mode 100644
index 0000000..2e49781
--- /dev/null
+++ b/debian/sane-utils.preinst
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+set -e
+
+MANPAGE=/usr/share/man/man5/sane-umax_pp.5.gz
+MANLINK=/usr/share/man/man5/umax_pp.5.gz
+
+
+
+if [ "$1" = install ] || [ "$1" = upgrade ]; then
+
+    ## Remove obsolete manpages that are now provided by sane-common
+    if dpkg --compare-versions "$2" le "1.1.1-2"; then
+
+	if [ -f "$MANLINK" ] && [ -L "$MANLINK" ]; then
+	    rm -rf "$MANLINK"
+	fi
+
+
+	if [ -f "$MANPAGE" ]; then
+	    rm -rf "$MANPAGE"
+	fi
+    fi
+fi
+
+
+
+
+
+#DEBHELPER#