From 5793a221e112fa49073de0137d6bfa750a61b0a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 8 Dec 2020 20:30:37 +0100 Subject: Add part if sane-backends and tlp runs on the same system --- debian/TROUBLESHOOTING.Debian | 12 +++++++++++- debian/changelog | 8 ++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/TROUBLESHOOTING.Debian b/debian/TROUBLESHOOTING.Debian index 85b7868..1412219 100644 --- a/debian/TROUBLESHOOTING.Debian +++ b/debian/TROUBLESHOOTING.Debian @@ -1,7 +1,7 @@ 1.) usbfs: interface 1 claimed by usblp while ‘scanimage’ sets config #1 2.) ACL: device file system does not support ACLs - +3.) TLP and sane-backends 1.) usbfs: interface 1 claimed by usblp while ‘scanimage’ sets config #1 @@ -27,3 +27,13 @@ possible in its fallback mode of traditional Unix-style file permissions. As a workaround, I have substituted "/bin/chown root:scanner $env{DEVNAME}" as the command at the end of 99-libsane1.rules (an alternative would be to use a UDEV rule element to change the ownership). + + +3.) TLP and sane-backends + +From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=954096 + +If the scanner frontends works only once you can add your scanner into +the blacklist in /etc/default/tlp. For more Infos please read the bugreport. + +Thanks to Eduardo Casais . diff --git a/debian/changelog b/debian/changelog index b4647ec..cdb12fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +sane-backends (1.0.31-5) UNRELEASED; urgency=medium + + * TROUBLESHOOTING.Debian: + - Add part if sane-backends and tlp runs on the same system + (Closes: #954096, #887745). + + -- Jörg Frings-Fürst Tue, 08 Dec 2020 19:43:48 +0100 + sane-backends (1.0.31-4) unstable; urgency=medium * debian/rules: -- cgit v1.2.3 From 7380432da53456fb70684627226c73df74fe3ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 16 Feb 2021 20:33:54 +0100 Subject: Refresh, remove and new patches --- debian/changelog | 26 ++++++- debian/patches/0040-remove_git.patch | 16 ++-- .../0045-disable_lock_test_at_build_time.patch | 2 +- debian/patches/0060-cross.patch | 4 +- debian/patches/0140-avahi.patch | 12 +-- debian/patches/0145-avahi.patch | 4 +- debian/patches/0150-i386-test.patch | 4 +- debian/patches/0155-hurd_PATH_MAX.patch | 44 +++++------ debian/patches/0175-fix_tests.patch | 90 ++++++++++++++++++++++ debian/patches/0600-scanimage_manpage.patch | 4 +- debian/patches/0705-kfreebsd.patch | 2 +- debian/patches/0725-fix_link_60-libsane_rule.patch | 2 +- debian/patches/series | 11 +-- 13 files changed, 163 insertions(+), 58 deletions(-) create mode 100644 debian/patches/0175-fix_tests.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cdb12fb..227235e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,34 @@ -sane-backends (1.0.31-5) UNRELEASED; urgency=medium +sane-backends (1.0.32-1) UNRELEASED; urgency=medium + * New Upstream release: + - Refresh patches: + + patches/0040-remove_git.patch + + patches/0045-disable_lock_test_at_build_time.patch + + patches/0060-cross.patch + + patches/0140-avahi.patch + + patches/0145-avahi.patch + + patches/0150-i386-test.patch + + patches/0155-hurd_PATH_MAX.patch + + patches/0600-scanimage_manpage.patch + + patches/0705-kfreebsd.patch + + patches/0725-fix_link_60-libsane_rule.patch + - Remove not longer needed patches: + + patches/0100-source_spelling.patch + + patches/0125-multiarch_dll_search_path.patch + + patches/0055-Fix_build_error.patch + + patches/0165-respect_local_only_parameter.patch + + patches/0170-return_empty_list_when_local_devices_requested.patch + - New Patches: + + patches/0175-fix_tests.patch to fix build - tests. * TROUBLESHOOTING.Debian: - Add part if sane-backends and tlp runs on the same system (Closes: #954096, #887745). - -- Jörg Frings-Fürst Tue, 08 Dec 2020 19:43:48 +0100 + -- Jörg Frings-Fürst Tue, 16 Feb 2021 18:26:03 +0100 sane-backends (1.0.31-4) unstable; urgency=medium - * debian/rules: + * debian/rules: - Add the --disable-locking option to dh_auto_configure. -- Jörg Frings-Fürst Fri, 04 Dec 2020 17:08:57 +0100 diff --git a/debian/patches/0040-remove_git.patch b/debian/patches/0040-remove_git.patch index d3df568..2f38fcc 100644 --- a/debian/patches/0040-remove_git.patch +++ b/debian/patches/0040-remove_git.patch @@ -1,19 +1,13 @@ -Description: Remove git from buildsystem -Author: Jörg Frings-Fürst -Forwarded: not-needed -Last-Update: 2019-08-11 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/configure.ac =================================================================== --- trunk.orig/configure.ac +++ trunk/configure.ac -@@ -5,7 +5,7 @@ dnl Set up autoconf and automake - dnl When preparing a release, modify the numeric version components - dnl and remove the git suffix. +@@ -4,7 +4,7 @@ dnl ************************************ + dnl Set up autoconf and automake dnl ****************************************************************** --AC_INIT([sane-backends],m4_esyscmd_s([git describe --dirty]), -+AC_INIT([sane-backends],[1.0.31-debian], + AC_INIT([sane-backends], +- m4_esyscmd_s([tools/git-version-gen --prefix '' .tarball-version]), ++ [1.0.32-debian], [sane-devel@alioth-lists.debian.net]) AC_PREREQ([2.69]) dnl minimum autoconf version required AC_CONFIG_MACRO_DIR([m4]) diff --git a/debian/patches/0045-disable_lock_test_at_build_time.patch b/debian/patches/0045-disable_lock_test_at_build_time.patch index e5f82f3..8aeccf8 100644 --- a/debian/patches/0045-disable_lock_test_at_build_time.patch +++ b/debian/patches/0045-disable_lock_test_at_build_time.patch @@ -8,7 +8,7 @@ Index: trunk/acinclude.m4 =================================================================== --- trunk.orig/acinclude.m4 +++ trunk/acinclude.m4 -@@ -359,11 +359,11 @@ AC_DEFUN([SANE_CHECK_LOCKING], +@@ -356,11 +356,11 @@ AC_DEFUN([SANE_CHECK_LOCKING], touch sanetest.file chgrp $LOCKPATH_GROUP sanetest.file 2>/dev/null || lasterror=$? rm -f sanetest.file diff --git a/debian/patches/0060-cross.patch b/debian/patches/0060-cross.patch index 4087882..a810929 100644 --- a/debian/patches/0060-cross.patch +++ b/debian/patches/0060-cross.patch @@ -9,7 +9,7 @@ Index: trunk/acinclude.m4 =================================================================== --- trunk.orig/acinclude.m4 +++ trunk/acinclude.m4 -@@ -439,15 +439,19 @@ AC_DEFUN([SANE_CHECK_GPHOTO2], +@@ -436,15 +436,19 @@ AC_DEFUN([SANE_CHECK_GPHOTO2], # a program. And, if that works, then add the -l flags to # GPHOTO2_LIBS and any other flags to GPHOTO2_LDFLAGS to pass to # sane-config. @@ -36,7 +36,7 @@ Index: trunk/acinclude.m4 saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${GPHOTO2_CPPFLAGS}" saved_LIBS="${LIBS}" -@@ -467,13 +471,13 @@ AC_DEFUN([SANE_CHECK_GPHOTO2], +@@ -464,13 +468,13 @@ AC_DEFUN([SANE_CHECK_GPHOTO2], GPHOTO2_LIBS="" else SANE_EXTRACT_LDFLAGS(GPHOTO2_LIBS, GPHOTO2_LDFLAGS) diff --git a/debian/patches/0140-avahi.patch b/debian/patches/0140-avahi.patch index c424323..b666bff 100644 --- a/debian/patches/0140-avahi.patch +++ b/debian/patches/0140-avahi.patch @@ -9,7 +9,7 @@ Index: trunk/backend/net.c =================================================================== --- trunk.orig/backend/net.c +++ trunk/backend/net.c -@@ -771,7 +771,7 @@ net_avahi_browse_callback (AvahiServiceB +@@ -769,7 +769,7 @@ net_avahi_browse_callback (AvahiServiceB { case AVAHI_BROWSER_FAILURE: DBG (1, "net_avahi_browse_callback: %s\n", avahi_strerror (avahi_client_errno (avahi_service_browser_get_client (b)))); @@ -18,7 +18,7 @@ Index: trunk/backend/net.c return; case AVAHI_BROWSER_NEW: -@@ -836,7 +836,7 @@ net_avahi_callback (AvahiClient *c, Avah +@@ -834,7 +834,7 @@ net_avahi_callback (AvahiClient *c, Avah if (avahi_browser == NULL) { DBG (1, "net_avahi_callback: could not create service browser: %s\n", avahi_strerror (avahi_client_errno (c))); @@ -27,7 +27,7 @@ Index: trunk/backend/net.c } break; -@@ -859,14 +859,14 @@ net_avahi_callback (AvahiClient *c, Avah +@@ -857,14 +857,14 @@ net_avahi_callback (AvahiClient *c, Avah if (avahi_client == NULL) { DBG (1, "net_avahi_init: could not create Avahi client: %s\n", avahi_strerror (error)); @@ -44,7 +44,7 @@ Index: trunk/backend/net.c } break; } -@@ -1045,12 +1041,12 @@ sane_init (SANE_Int * version_code, SANE +@@ -1043,12 +1043,12 @@ sane_init (SANE_Int * version_code, SANE continue; } #if WITH_AVAHI @@ -59,7 +59,7 @@ Index: trunk/backend/net.c #endif /* WITH_AVAHI */ } -@@ -1096,12 +1092,12 @@ sane_init (SANE_Int * version_code, SANE +@@ -1094,12 +1094,12 @@ sane_init (SANE_Int * version_code, SANE continue; #endif /* ENABLE_IPV6 */ #if WITH_AVAHI @@ -74,7 +74,7 @@ Index: trunk/backend/net.c #endif /* WITH_AVAHI */ } free (copy); -@@ -1519,11 +1520,11 @@ sane_open (SANE_String_Const full_name, +@@ -1517,11 +1517,11 @@ sane_open (SANE_String_Const full_name, "sane_open: device %s not found, trying to register it anyway\n", nd_name); #if WITH_AVAHI diff --git a/debian/patches/0145-avahi.patch b/debian/patches/0145-avahi.patch index d358a41..a5d98ef 100644 --- a/debian/patches/0145-avahi.patch +++ b/debian/patches/0145-avahi.patch @@ -9,7 +9,7 @@ Index: trunk/backend/net.c =================================================================== --- trunk.orig/backend/net.c +++ trunk/backend/net.c -@@ -964,10 +964,6 @@ sane_init (SANE_Int * version_code, SANE +@@ -962,10 +962,6 @@ sane_init (SANE_Int * version_code, SANE first_device = NULL; first_handle = NULL; @@ -20,7 +20,7 @@ Index: trunk/backend/net.c auth_callback = authorize; /* Return the version number of the sane-backends package to allow -@@ -1119,6 +1115,11 @@ sane_init (SANE_Int * version_code, SANE +@@ -1117,6 +1113,11 @@ sane_init (SANE_Int * version_code, SANE DBG (2, "sane_init: connect timeout set to %d seconds from env\n", connect_timeout); } diff --git a/debian/patches/0150-i386-test.patch b/debian/patches/0150-i386-test.patch index 4c064c5..70681dd 100644 --- a/debian/patches/0150-i386-test.patch +++ b/debian/patches/0150-i386-test.patch @@ -8,7 +8,7 @@ Index: trunk/testsuite/backend/genesys/tests_image.cpp =================================================================== --- trunk.orig/testsuite/backend/genesys/tests_image.cpp +++ trunk/testsuite/backend/genesys/tests_image.cpp -@@ -124,14 +124,14 @@ void test_set_pixel_to_row() +@@ -122,14 +122,14 @@ void test_set_pixel_to_row() pixel = Pixel(0x1200, 0x1200, 0x1200); set_pixel_to_row(data.data(), 0, pixel, PixelFormat::I8); @@ -27,7 +27,7 @@ Index: trunk/testsuite/backend/genesys/tests_image.cpp reset(); pixel = Pixel(0x1200, 0x3400, 0x5600); -@@ -160,14 +160,14 @@ void test_set_pixel_to_row() +@@ -158,14 +158,14 @@ void test_set_pixel_to_row() pixel = Pixel(0x1234, 0x1234, 0x1234); set_pixel_to_row(data.data(), 0, pixel, PixelFormat::I16); diff --git a/debian/patches/0155-hurd_PATH_MAX.patch b/debian/patches/0155-hurd_PATH_MAX.patch index 41952c6..71d4c68 100644 --- a/debian/patches/0155-hurd_PATH_MAX.patch +++ b/debian/patches/0155-hurd_PATH_MAX.patch @@ -5,7 +5,7 @@ Index: trunk/backend/escl/escl_capabilities.c =================================================================== --- trunk.orig/backend/escl/escl_capabilities.c +++ trunk/backend/escl/escl_capabilities.c -@@ -35,6 +35,10 @@ +@@ -34,6 +34,10 @@ #include "../include/sane/saneopts.h" @@ -20,7 +20,7 @@ Index: trunk/backend/escl/escl.h =================================================================== --- trunk.orig/backend/escl/escl.h +++ trunk/backend/escl/escl.h -@@ -62,6 +62,10 @@ +@@ -67,6 +67,10 @@ # define DBGDUMP(level, buf, size) #endif @@ -35,7 +35,7 @@ Index: trunk/backend/canon630u.c =================================================================== --- trunk.orig/backend/canon630u.c +++ trunk/backend/canon630u.c -@@ -67,6 +67,10 @@ +@@ -65,6 +65,10 @@ #include "canon630u-common.c" @@ -50,7 +50,7 @@ Index: trunk/backend/canon_pp.c =================================================================== --- trunk.orig/backend/canon_pp.c +++ trunk/backend/canon_pp.c -@@ -85,6 +85,11 @@ +@@ -77,6 +77,11 @@ #include "../include/sane/sanei_backend.h" /* #include "../include/sane/sanei_debug.h" */ @@ -66,7 +66,7 @@ Index: trunk/backend/gt68xx.h =================================================================== --- trunk.orig/backend/gt68xx.h +++ trunk/backend/gt68xx.h -@@ -53,4 +53,8 @@ +@@ -51,4 +51,8 @@ #define GT68XX_CONFIG_FILE "gt68xx.conf" @@ -79,7 +79,7 @@ Index: trunk/backend/hp3900_sane.c =================================================================== --- trunk.orig/backend/hp3900_sane.c +++ trunk/backend/hp3900_sane.c -@@ -54,6 +54,11 @@ +@@ -53,6 +53,11 @@ #include "hp3900_rts8822.c" @@ -95,7 +95,7 @@ Index: trunk/backend/hp4200.h =================================================================== --- trunk.orig/backend/hp4200.h +++ trunk/backend/hp4200.h -@@ -27,6 +27,10 @@ +@@ -26,6 +26,10 @@ #define min(a, b) (((a) < (b)) ? (a) : (b)) #define max(a, b) (((a) > (b)) ? (a) : (b)) @@ -110,7 +110,7 @@ Index: trunk/backend/hp5400_sane.c =================================================================== --- trunk.orig/backend/hp5400_sane.c +++ trunk/backend/hp5400_sane.c -@@ -88,6 +88,9 @@ +@@ -87,6 +87,9 @@ #define NUM_GAMMA_ENTRIES 65536 @@ -124,7 +124,7 @@ Index: trunk/backend/hpsj5s.c =================================================================== --- trunk.orig/backend/hpsj5s.c +++ trunk/backend/hpsj5s.c -@@ -58,6 +58,9 @@ +@@ -56,6 +56,9 @@ #include #include @@ -138,7 +138,7 @@ Index: trunk/backend/leo.c =================================================================== --- trunk.orig/backend/leo.c +++ trunk/backend/leo.c -@@ -78,6 +78,10 @@ +@@ -75,6 +75,10 @@ #include "leo.h" @@ -153,7 +153,7 @@ Index: trunk/backend/lexmark.c =================================================================== --- trunk.orig/backend/lexmark.c +++ trunk/backend/lexmark.c -@@ -47,6 +47,10 @@ +@@ -45,6 +45,10 @@ #include "lexmark.h" @@ -168,7 +168,7 @@ Index: trunk/backend/matsushita.c =================================================================== --- trunk.orig/backend/matsushita.c +++ trunk/backend/matsushita.c -@@ -82,6 +82,10 @@ +@@ -79,6 +79,10 @@ #include "matsushita.h" @@ -196,7 +196,7 @@ Index: trunk/backend/pie.c =================================================================== --- trunk.orig/backend/pie.c +++ trunk/backend/pie.c -@@ -134,8 +134,11 @@ +@@ -132,8 +132,11 @@ #define min(a,b) (((a)<(b))?(a):(b)) #define max(a,b) (((a)>(b))?(a):(b)) @@ -214,7 +214,7 @@ Index: trunk/backend/pieusb.c =================================================================== --- trunk.orig/backend/pieusb.c +++ trunk/backend/pieusb.c -@@ -109,6 +109,10 @@ extern void write_tiff_rgbi_header (FILE +@@ -107,6 +107,10 @@ extern void write_tiff_rgbi_header (FILE #define DBG_info_scan 11 /* information scanner commands */ #define DBG_info_usb 13 /* information usb level functions */ @@ -229,7 +229,7 @@ Index: trunk/backend/plustek-usb.c =================================================================== --- trunk.orig/backend/plustek-usb.c +++ trunk/backend/plustek-usb.c -@@ -119,6 +119,10 @@ static TabDef usbVendors[] = { +@@ -117,6 +117,10 @@ static TabDef usbVendors[] = { /** we use at least 8 megs for scanning... */ #define _SCANBUF_SIZE (8 * 1024 * 1024) @@ -244,7 +244,7 @@ Index: trunk/backend/sceptre.c =================================================================== --- trunk.orig/backend/sceptre.c +++ trunk/backend/sceptre.c -@@ -80,6 +80,10 @@ +@@ -77,6 +77,10 @@ #include "sceptre.h" @@ -259,7 +259,7 @@ Index: trunk/backend/sp15c.c =================================================================== --- trunk.orig/backend/sp15c.c +++ trunk/backend/sp15c.c -@@ -228,6 +228,10 @@ +@@ -225,6 +225,10 @@ #include "sp15c-scsi.h" #include "sp15c.h" @@ -274,7 +274,7 @@ Index: trunk/backend/stv680.c =================================================================== --- trunk.orig/backend/stv680.c +++ trunk/backend/stv680.c -@@ -101,6 +101,10 @@ +@@ -98,6 +98,10 @@ #define TIMEOUT 1000 @@ -289,7 +289,7 @@ Index: trunk/backend/teco1.c =================================================================== --- trunk.orig/backend/teco1.c +++ trunk/backend/teco1.c -@@ -86,6 +86,10 @@ +@@ -83,6 +83,10 @@ #define sanei_scsi_close(a) SANE_STATUS_GOOD #endif @@ -304,7 +304,7 @@ Index: trunk/backend/teco2.c =================================================================== --- trunk.orig/backend/teco2.c +++ trunk/backend/teco2.c -@@ -106,6 +106,10 @@ +@@ -103,6 +103,10 @@ #define sanei_scsi_close(a) SANE_STATUS_GOOD #endif @@ -319,7 +319,7 @@ Index: trunk/backend/teco3.c =================================================================== --- trunk.orig/backend/teco3.c +++ trunk/backend/teco3.c -@@ -78,6 +78,10 @@ +@@ -75,6 +75,10 @@ #include "teco3.h" @@ -334,7 +334,7 @@ Index: trunk/backend/test.c =================================================================== --- trunk.orig/backend/test.c +++ trunk/backend/test.c -@@ -76,6 +76,10 @@ +@@ -74,6 +74,10 @@ #define TEST_CONFIG_FILE "test.conf" diff --git a/debian/patches/0175-fix_tests.patch b/debian/patches/0175-fix_tests.patch new file mode 100644 index 0000000..6ee39b1 --- /dev/null +++ b/debian/patches/0175-fix_tests.patch @@ -0,0 +1,90 @@ +Index: trunk/testsuite/tools/data/db.ref +=================================================================== +--- trunk.orig/testsuite/tools/data/db.ref ++++ trunk/testsuite/tools/data/db.ref +@@ -1,5 +1,5 @@ + # This file was generated from description files (*.desc) +-# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab ++# by sane-desc 3.6 from sane-backends 1.0.32-debian + # + # The entries below are used to detect a USB device when it's plugged in + # and then run a script to change the ownership and +Index: trunk/testsuite/tools/data/html-backends-split.ref +=================================================================== +--- trunk.orig/testsuite/tools/data/html-backends-split.ref ++++ trunk/testsuite/tools/data/html-backends-split.ref +@@ -16496,6 +16496,6 @@ Grandtek Scopecam + >Contact + + +-This page was created by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab ++This page was created by sane-desc 3.6 from sane-backends 1.0.32-debian + + +Index: trunk/testsuite/tools/data/html-mfgs.ref +=================================================================== +--- trunk.orig/testsuite/tools/data/html-mfgs.ref ++++ trunk/testsuite/tools/data/html-mfgs.ref +@@ -23910,6 +23910,6 @@ qcam
(unmaintained) + >Contact + + +-This page was created by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab ++This page was created by sane-desc 3.6 from sane-backends 1.0.32-debian + + +Index: trunk/testsuite/tools/data/hwdb.ref +=================================================================== +--- trunk.orig/testsuite/tools/data/hwdb.ref ++++ trunk/testsuite/tools/data/hwdb.ref +@@ -1,5 +1,5 @@ + # This file was generated from description files (*.desc) +-# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab ++# by sane-desc 3.6 from sane-backends 1.0.32-debian + # + # hwdb file for supported USB devices + # +Index: trunk/testsuite/tools/data/udev+acl.ref +=================================================================== +--- trunk.orig/testsuite/tools/data/udev+acl.ref ++++ trunk/testsuite/tools/data/udev+acl.ref +@@ -1,5 +1,5 @@ + # This file was generated from description files (*.desc) +-# by sane-desc 3.6 from sane-backends 1.0.31-118-g5d3ce7806 ++# by sane-desc 3.6 from sane-backends 1.0.32-debian + # + # udev rules file for supported USB and SCSI devices + # +Index: trunk/testsuite/tools/data/udev+hwdb.ref +=================================================================== +--- trunk.orig/testsuite/tools/data/udev+hwdb.ref ++++ trunk/testsuite/tools/data/udev+hwdb.ref +@@ -1,5 +1,5 @@ + # This file was generated from description files (*.desc) +-# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab ++# by sane-desc 3.6 from sane-backends 1.0.32-debian + # + # udev rules file for supported USB and SCSI devices + # +Index: trunk/testsuite/tools/data/udev.ref +=================================================================== +--- trunk.orig/testsuite/tools/data/udev.ref ++++ trunk/testsuite/tools/data/udev.ref +@@ -1,5 +1,5 @@ + # This file was generated from description files (*.desc) +-# by sane-desc 3.6 from sane-backends 1.0.31-118-g5d3ce7806 ++# by sane-desc 3.6 from sane-backends 1.0.32-debian + # + # udev rules file for supported USB and SCSI devices + # +Index: trunk/testsuite/tools/data/usermap.ref +=================================================================== +--- trunk.orig/testsuite/tools/data/usermap.ref ++++ trunk/testsuite/tools/data/usermap.ref +@@ -1,5 +1,5 @@ + # This file was generated from description files (*.desc) +-# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab ++# by sane-desc 3.6 from sane-backends 1.0.32-debian + # + # The entries below are used to detect a USB device and change owner + # and permissions on the "device node" used by libusb. diff --git a/debian/patches/0600-scanimage_manpage.patch b/debian/patches/0600-scanimage_manpage.patch index ddf125f..6e8cc23 100644 --- a/debian/patches/0600-scanimage_manpage.patch +++ b/debian/patches/0600-scanimage_manpage.patch @@ -17,5 +17,5 @@ Index: trunk/doc/scanimage.man +Please read the backend documentation first. + Parameters are separated by a blank from single-character options (e.g. - \-d epson) and by a "=" from multi-character options (e.g. \-\-device\-name=epson). - + .BR "\-d epson" ) + and by a "=" from multi-character options (e.g. diff --git a/debian/patches/0705-kfreebsd.patch b/debian/patches/0705-kfreebsd.patch index 86f7650..34a510b 100644 --- a/debian/patches/0705-kfreebsd.patch +++ b/debian/patches/0705-kfreebsd.patch @@ -4,7 +4,7 @@ Index: trunk/backend/umax_pp_low.c =================================================================== --- trunk.orig/backend/umax_pp_low.c +++ trunk/backend/umax_pp_low.c -@@ -74,8 +74,10 @@ +@@ -72,8 +72,10 @@ #endif #ifdef HAVE_MACHINE_CPUFUNC_H diff --git a/debian/patches/0725-fix_link_60-libsane_rule.patch b/debian/patches/0725-fix_link_60-libsane_rule.patch index ec851cf..0b424e2 100644 --- a/debian/patches/0725-fix_link_60-libsane_rule.patch +++ b/debian/patches/0725-fix_link_60-libsane_rule.patch @@ -9,7 +9,7 @@ Index: trunk/tools/sane-desc.c =================================================================== --- trunk.orig/tools/sane-desc.c +++ trunk/tools/sane-desc.c -@@ -3651,7 +3651,7 @@ print_udevhwdb_header (void) +@@ -3649,7 +3649,7 @@ print_udevhwdb_header (void) ("#\n" "# udev rules file for supported USB and SCSI devices\n" "#\n" diff --git a/debian/patches/series b/debian/patches/series index f7b7531..bc9c20d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,8 @@ 0035-trim-libraries-in-sane-backends.pc.in.patch 0040-remove_git.patch -0100-source_spelling.patch -0125-multiarch_dll_search_path.patch +#0100-source_spelling.patch +#0125-multiarch_dll_search_path.patch +0175-fix_tests.patch 0140-avahi.patch 0145-avahi.patch 0600-scanimage_manpage.patch @@ -11,7 +12,7 @@ 0155-hurd_PATH_MAX.patch 0045-disable_lock_test_at_build_time.patch 0050-Use-python3-shebang.patch -0055-Fix_build_error.patch +#0055-Fix_build_error.patch 0060-cross.patch -0165-respect_local_only_parameter.patch -0170-return_empty_list_when_local_devices_requested.patch +#0165-respect_local_only_parameter.patch +#0170-return_empty_list_when_local_devices_requested.patch -- cgit v1.2.3 From e103ca919f2eb1a409d35719bddb14d5a1a03667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 16 Feb 2021 21:22:34 +0100 Subject: New patch 0605-fix_groff-warnings.patch to fix groff warnings --- debian/changelog | 1 + debian/patches/0605-fix_groff-warnings.patch | 62 ++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 64 insertions(+) create mode 100644 debian/patches/0605-fix_groff-warnings.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 227235e..69d3fc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ sane-backends (1.0.32-1) UNRELEASED; urgency=medium + patches/0170-return_empty_list_when_local_devices_requested.patch - New Patches: + patches/0175-fix_tests.patch to fix build - tests. + + patches/0605-fix_groff-warnings.patch to fix groff warnings. * TROUBLESHOOTING.Debian: - Add part if sane-backends and tlp runs on the same system (Closes: #954096, #887745). diff --git a/debian/patches/0605-fix_groff-warnings.patch b/debian/patches/0605-fix_groff-warnings.patch new file mode 100644 index 0000000..14471dc --- /dev/null +++ b/debian/patches/0605-fix_groff-warnings.patch @@ -0,0 +1,62 @@ +Index: trunk/doc/sane-canon_dr.man +=================================================================== +--- trunk.orig/doc/sane-canon_dr.man ++++ trunk/doc/sane-canon_dr.man +@@ -161,7 +161,7 @@ Some scanners pad the upper edge of one + .RE + .PP + .BR NOTE : +-'option' lines may appear multiple times in the configuration file. ++"option" lines may appear multiple times in the configuration file. + They only apply to scanners discovered by the next 'scsi/usb' line. + .PP + +Index: trunk/doc/sane-pixma.man +=================================================================== +--- trunk.orig/doc/sane-pixma.man ++++ trunk/doc/sane-pixma.man +@@ -184,7 +184,7 @@ an up-to-date status at the project home + Users feedback is essential to help improve features and performances. + .SH OPTIONS + Besides "well-known" options (e.g. resolution, mode etc.) +-.Bsane\-pixma ++.B sane\-pixma + backend also + provides the following options, i.e. the options might change in the future. + .br +Index: trunk/doc/sane-scsi.man +=================================================================== +--- trunk.orig/doc/sane-scsi.man ++++ trunk/doc/sane-scsi.man +@@ -122,7 +122,7 @@ $ chmod 660 /dev/sg0 + .RE + .PP + When your system uses the device filesystem (devfs), you have to edit +-.BIR /etc/devfs/perms. ++.BI /etc/devfs/perms. + There you should search the line + .PP + .RS +@@ -172,7 +172,7 @@ If there are no + devices, just do a + .I sh MAKEDEV uk0 + in the +-.i /dev ++.I /dev + directory. The scanner should then be accessible as + .I /dev/uk0 + if it was probed during boot. +Index: trunk/doc/sane-artec_eplus48u.man +=================================================================== +--- trunk.orig/doc/sane-artec_eplus48u.man ++++ trunk/doc/sane-artec_eplus48u.man +@@ -44,8 +44,7 @@ or + You can find it on the installation CD that was provided by the manufacturer, + normally in the directory Win98, WinMe or similar. + If the Windows-driver is installed on your computer, then you can also +-find the firmware file under +-.IR c:\\windows\\system32\\drivers . ++find the firmware file under c:\\windows\\system32\\drivers. + + .SH CONFIGURATION + The contents of the diff --git a/debian/patches/series b/debian/patches/series index bc9c20d..8d90078 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -16,3 +16,4 @@ 0060-cross.patch #0165-respect_local_only_parameter.patch #0170-return_empty_list_when_local_devices_requested.patch +0605-fix_groff-warnings.patch -- cgit v1.2.3 From 76c0462b05bb0f1f42d3735a2794d86d633f4f42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 17 Feb 2021 12:09:39 +0100 Subject: Add quilt header --- debian/patches/0040-remove_git.patch | 23 +++++++++++------------ debian/patches/0175-fix_tests.patch | 6 ++++++ debian/patches/0605-fix_groff-warnings.patch | 6 ++++++ 3 files changed, 23 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/debian/patches/0040-remove_git.patch b/debian/patches/0040-remove_git.patch index 2f38fcc..2be7a6e 100644 --- a/debian/patches/0040-remove_git.patch +++ b/debian/patches/0040-remove_git.patch @@ -1,13 +1,12 @@ -Index: trunk/configure.ac +Description: fix missing .tarball-version if git isn't used +Author: Jörg Frings-Fürst +Bug: https://gitlab.com/sane-project/backends/-/issues/440 +Last-Update: 2021-02-17 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/.tarball-version =================================================================== ---- trunk.orig/configure.ac -+++ trunk/configure.ac -@@ -4,7 +4,7 @@ dnl ************************************ - dnl Set up autoconf and automake - dnl ****************************************************************** - AC_INIT([sane-backends], -- m4_esyscmd_s([tools/git-version-gen --prefix '' .tarball-version]), -+ [1.0.32-debian], - [sane-devel@alioth-lists.debian.net]) - AC_PREREQ([2.69]) dnl minimum autoconf version required - AC_CONFIG_MACRO_DIR([m4]) +--- /dev/null ++++ trunk/.tarball-version +@@ -0,0 +1 @@ ++1.0.32-debian diff --git a/debian/patches/0175-fix_tests.patch b/debian/patches/0175-fix_tests.patch index 6ee39b1..77f5e03 100644 --- a/debian/patches/0175-fix_tests.patch +++ b/debian/patches/0175-fix_tests.patch @@ -1,3 +1,9 @@ +Description: Fix test +Author: Jörg Frings-Fürst +Bug: https://gitlab.com/sane-project/backends/-/issues/443 +Last-Update: 2021-02-17 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/testsuite/tools/data/db.ref =================================================================== --- trunk.orig/testsuite/tools/data/db.ref diff --git a/debian/patches/0605-fix_groff-warnings.patch b/debian/patches/0605-fix_groff-warnings.patch index 14471dc..9e8ecde 100644 --- a/debian/patches/0605-fix_groff-warnings.patch +++ b/debian/patches/0605-fix_groff-warnings.patch @@ -1,3 +1,9 @@ +Description: Fix some groff warnings +Author: Jörg Frings-Fürst +Bug: https://gitlab.com/sane-project/backends/-/issues/433 +Last-Update: 2021-02-17 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/doc/sane-canon_dr.man =================================================================== --- trunk.orig/doc/sane-canon_dr.man -- cgit v1.2.3 From b28ab36a2e3939d430c2683bf5429cfb88417b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 17 Feb 2021 20:35:38 +0100 Subject: Refresh d/copyright --- debian/changelog | 2 ++ debian/copyright | 16 ++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 69d3fc4..8f4b3b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ sane-backends (1.0.32-1) UNRELEASED; urgency=medium - New Patches: + patches/0175-fix_tests.patch to fix build - tests. + patches/0605-fix_groff-warnings.patch to fix groff warnings. + * debian/copyright: + - Refresh to the new upstream release. * TROUBLESHOOTING.Debian: - Add part if sane-backends and tlp runs on the same system (Closes: #954096, #887745). diff --git a/debian/copyright b/debian/copyright index 6d5dc77..428fa7e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -15,7 +15,7 @@ Copyright: 1997-2002 Kevin Dalley 2013 Mark Buda 2018 Laurent Bigonville 2019 John Paul Adrian Glaubitz - 2014-2020 Jörg Frings-Fürst + 2014-2021 Jörg Frings-Fürst License: GPL-2+ with sane exception Files: backend/abaton.* @@ -65,7 +65,7 @@ Copyright: 1999-2000 Tom Martone License: GPL-2+ with sane exception Files: backend/canon-scsi.c - backend/canon.* + backend/canon.* Copyright: 1997 BYTEC GmbH Germany License: GPL-2+ with sane exception @@ -81,7 +81,7 @@ Files: backend/canon_dr.* backend/cardscan.* include/sane/sanei_magic.h sanei/sanei_magic.c -Copyright: 2007-2016 m. allan noah +Copyright: 2007-2020 m. allan noah License: GPL-2+ with sane exception Files: backend/canon_pp-*.* @@ -256,7 +256,7 @@ Files: backend/hp5400.* backend/hp5400_xfer.* Copyright: 2003 Martijn van Oosterhout 2003 Thomas Soumarmon - 2020 2020 Ralph Little + 2020 Ralph Little License: GPL-2+ with sane exception Files: backend/hp5400_internal.* @@ -721,7 +721,7 @@ Copyright: 2010-2011 Reinhold Kainhofer License: GPL-2+ Files: doc/descriptions-external/utsushi.desc -Copyright: 2004-2019 Olaf Meeuwissen +Copyright: 2004-2021 Olaf Meeuwissen License: GPL-3+ Files: po/Makevars @@ -881,10 +881,14 @@ Files: testsuite/backend/Makefile.am Copyright: 2019 Sane Developers License: GPL-2+ with sane exception +Files: tools/git-version-gen +Copyright: 2007-2021 Free Software Foundation, Inc. +License: GPL-3+ + Files: tools/create-release.sh tools/create-changelog.sh tools/update-upstreams.sh -Copyright: 2017-2019 Olaf Meeuwissen +Copyright: 2017-2021 Olaf Meeuwissen License: GPL-3+ Files: tools/RenSaneDlls.cmd -- cgit v1.2.3 From 9483eaa585acdf9f05701c6ffd90fefb80a0e08e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 17 Feb 2021 21:07:10 +0100 Subject: d/libsane1.symbols Add 1 new symbol --- debian/changelog | 3 +++ debian/libsane1.symbols | 8 +------- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8f4b3b9..14b245c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,9 @@ sane-backends (1.0.32-1) UNRELEASED; urgency=medium + patches/0605-fix_groff-warnings.patch to fix groff warnings. * debian/copyright: - Refresh to the new upstream release. + * debian/libsane1.symbols: + - Add 1 new symbol. + - Remove MISSING from last release. * TROUBLESHOOTING.Debian: - Add part if sane-backends and tlp runs on the same system (Closes: #954096, #887745). diff --git a/debian/libsane1.symbols b/debian/libsane1.symbols index 45a21ff..69ecbbb 100644 --- a/debian/libsane1.symbols +++ b/debian/libsane1.symbols @@ -77,12 +77,6 @@ libsane.so.1 libsane1 #MINVER# sanei_usb_testing_enable_record@Base 1.0.29 sanei_usb_testing_enable_replay@Base 1.0.29 sanei_usb_testing_get_backend@Base 1.0.29 + sanei_usb_testing_record_clear@Base 1.0.32 sanei_usb_testing_record_message@Base 1.0.29 sanei_usb_write_bulk@Base 1.0.29 -#MISSING: 1.0.31# testing_append_commands_node@Base 1.0.29 -#MISSING: 1.0.31# testing_known_commands_input_failed@Base 1.0.29 -#MISSING: 1.0.31# testing_last_known_seq@Base 1.0.29 -#MISSING: 1.0.31# testing_record_backend@Base 1.0.29 -#MISSING: 1.0.31# testing_xml_doc@Base 1.0.29 -#MISSING: 1.0.31# testing_xml_next_tx_node@Base 1.0.29 -#MISSING: 1.0.31# testing_xml_path@Base 1.0.29 -- cgit v1.2.3 From eb9a23e3304b9f9fb73926c28a1f572817683f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 17 Feb 2021 21:36:04 +0100 Subject: work on lintian-overrides --- debian/changelog | 3 +++ debian/libsane-common.lintian-overrides | 2 -- debian/libsane1.lintian-overrides | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 debian/libsane1.lintian-overrides (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 14b245c..a16fa8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,9 @@ sane-backends (1.0.32-1) UNRELEASED; urgency=medium * debian/libsane1.symbols: - Add 1 new symbol. - Remove MISSING from last release. + * debian/libsane-common.lintian-overrides: + - Remove double lines. + * New debian/libsane1.lintian-overrides to override afe spelling. * TROUBLESHOOTING.Debian: - Add part if sane-backends and tlp runs on the same system (Closes: #954096, #887745). diff --git a/debian/libsane-common.lintian-overrides b/debian/libsane-common.lintian-overrides index 4eede3d..cf00b5d 100644 --- a/debian/libsane-common.lintian-overrides +++ b/debian/libsane-common.lintian-overrides @@ -2,5 +2,3 @@ # doc/gt68xx/gt68xx.CHANGES:442:- Added "afe" option for gt68xx.conf for selecting default afe values. # libsane-common: typo-in-manual-page usr/share/man/man5/sane-gt68xx.5.gz afe safe -libsane-common: typo-in-manual-page usr/share/man/man5/sane-gt68xx.5.gz afe safe -libsane-common: typo-in-manual-page usr/share/man/man5/sane-gt68xx.5.gz afe safe diff --git a/debian/libsane1.lintian-overrides b/debian/libsane1.lintian-overrides new file mode 100644 index 0000000..39bacce --- /dev/null +++ b/debian/libsane1.lintian-overrides @@ -0,0 +1,7 @@ +# +# doc/gt68xx/gt68xx.CHANGES:442:- Added "afe" option for gt68xx.conf for selecting default afe values. +# +libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-artec_eplus48u.so.1.0.32 afe safe +libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-canon_dr.so.1.0.32 afe safe +libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-gt68xx.so.1.0.32 afe safe + -- cgit v1.2.3 From 039c68125575bc77cf9ce120b5149b3552ed3058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 17 Feb 2021 21:43:17 +0100 Subject: Declare compliance with Debian Policy 4.5.1 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a16fa8e..3e94714 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ sane-backends (1.0.32-1) UNRELEASED; urgency=medium * TROUBLESHOOTING.Debian: - Add part if sane-backends and tlp runs on the same system (Closes: #954096, #887745). + * Declare compliance with Debian Policy 4.5.1 (No changes needed). -- Jörg Frings-Fürst Tue, 16 Feb 2021 18:26:03 +0100 diff --git a/debian/control b/debian/control index fb8b9f8..1ba4090 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: sane-backends Section: graphics Priority: optional Maintainer: Jörg Frings-Fürst -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Build-Depends: autoconf, autoconf-archive, -- cgit v1.2.3 From 16c8a051da41637d15bef40ec5e3bc29ebaf0a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 30 Apr 2021 17:12:29 +0200 Subject: Fix FTCBFS: Annotate python3-minimal dependency :any --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3e94714..8fa3c1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ sane-backends (1.0.32-1) UNRELEASED; urgency=medium - Add part if sane-backends and tlp runs on the same system (Closes: #954096, #887745). * Declare compliance with Debian Policy 4.5.1 (No changes needed). + * Fix FTCBFS: Annotate python3-minimal dependency :any. (Closes: #984747). + - Thanks to Helmut Grohne . -- Jörg Frings-Fürst Tue, 16 Feb 2021 18:26:03 +0100 diff --git a/debian/control b/debian/control index 1ba4090..d44c8de 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Build-Depends: pkg-config, po-debconf, xutils-dev, - python3-minimal + python3-minimal:any Homepage: http://www.sane-project.org Vcs-Git: git://jff.email/opt/git/sane-backends.git Vcs-Browser: https://jff.email/cgit/sane-backends.git -- cgit v1.2.3 From 93500879a52aa00d32bb85e0fa69bacea84c883c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 30 Apr 2021 19:47:09 +0200 Subject: Fix package doesn't purge cleanly (user/group not purged) --- debian/changelog | 3 +++ debian/sane-utils.postrm | 9 +++++++++ 2 files changed, 12 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8fa3c1d..8483a9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,9 @@ sane-backends (1.0.32-1) UNRELEASED; urgency=medium * Declare compliance with Debian Policy 4.5.1 (No changes needed). * Fix FTCBFS: Annotate python3-minimal dependency :any. (Closes: #984747). - Thanks to Helmut Grohne . + * debian/sane-utils.postrm: + - Fix package doesn't purge cleanly (user/group not purged) + (Closes: #987837). -- Jörg Frings-Fürst Tue, 16 Feb 2021 18:26:03 +0100 diff --git a/debian/sane-utils.postrm b/debian/sane-utils.postrm index 275eee6..20d95a7 100644 --- a/debian/sane-utils.postrm +++ b/debian/sane-utils.postrm @@ -51,6 +51,15 @@ if [ "$1" = purge ] ; then rm -f /var/run/saned.pid fi +# +# remove user / group +# + pathfind deluser || true + if [ $? = 0 ] ; then + deluser -q --group --system saned || true + deluser -q --group --system scanner || true + deluser -q --system --remove-all-files saned || true + fi fi -- cgit v1.2.3 From 57c64f1acca5b544b2f088097c7296649b7e122e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 30 Apr 2021 19:51:20 +0200 Subject: Fix package doesn't purge cleanly (fix test with pathfind()) --- debian/changelog | 2 ++ debian/sane-utils.postrm | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8483a9d..5c48515 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ sane-backends (1.0.32-1) UNRELEASED; urgency=medium * debian/sane-utils.postrm: - Fix package doesn't purge cleanly (user/group not purged) (Closes: #987837). + - Fix package doesn't purge cleanly (fix test with pathfind()) + (Closes: #987805). -- Jörg Frings-Fürst Tue, 16 Feb 2021 18:26:03 +0100 diff --git a/debian/sane-utils.postrm b/debian/sane-utils.postrm index 20d95a7..30e2a2d 100644 --- a/debian/sane-utils.postrm +++ b/debian/sane-utils.postrm @@ -26,7 +26,7 @@ pathfind() { if [ "$1" = purge ] ; then - pathfind update-inetd || true + pathfind update-inetd if [ $? = 0 ] ; then update-inetd --remove sane-port || true update-inetd --remove "## sane-port" || true @@ -54,7 +54,7 @@ if [ "$1" = purge ] ; then # # remove user / group # - pathfind deluser || true + pathfind deluser if [ $? = 0 ] ; then deluser -q --group --system saned || true deluser -q --group --system scanner || true -- cgit v1.2.3 From f98d745e540224920b6926dcba4355b7e69b099b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 30 Apr 2021 22:11:03 +0200 Subject: Fix filtering out libsane-dll --- debian/changelog | 3 +++ debian/rules | 4 ++++ 2 files changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5c48515..94794c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,9 @@ sane-backends (1.0.32-1) UNRELEASED; urgency=medium (Closes: #987837). - Fix package doesn't purge cleanly (fix test with pathfind()) (Closes: #987805). + * Fix filtering out libsane-dll (Closes: #971592): + - Cherry-picked from 1.0.25-4.1+deb9u2 (Thanks to + Sylvain Beucler ). -- Jörg Frings-Fürst Tue, 16 Feb 2021 18:26:03 +0100 diff --git a/debian/rules b/debian/rules index 1109e1f..d0e1664 100755 --- a/debian/rules +++ b/debian/rules @@ -84,6 +84,10 @@ override_dh_auto_install-arch: override_dh_auto_install-indep: dh_auto_install + # remove /usr/lib/sane/libsane.so.1 (libtool side-effect ?) + $(RM) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sane/libsane.so.1 + # remove libsane-dll, same as regular libsane + $(RM) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sane/libsane-dll.* override_dh_install-arch: dh_install -- cgit v1.2.3 From 6db1e4019deeace08858bb48c0e0295cfe2f134f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 30 Apr 2021 22:41:29 +0200 Subject: d/changelog: Change distribution to experimental, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 94794c2..141c4db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sane-backends (1.0.32-1) UNRELEASED; urgency=medium +sane-backends (1.0.32-1) experimental; urgency=medium * New Upstream release: - Refresh patches: @@ -44,7 +44,7 @@ sane-backends (1.0.32-1) UNRELEASED; urgency=medium - Cherry-picked from 1.0.25-4.1+deb9u2 (Thanks to Sylvain Beucler ). - -- Jörg Frings-Fürst Tue, 16 Feb 2021 18:26:03 +0100 + -- Jörg Frings-Fürst Fri, 30 Apr 2021 22:38:18 +0200 sane-backends (1.0.31-4) unstable; urgency=medium -- cgit v1.2.3 From 5ce4518b75545f987594f3af823bfe1a97f61c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 1 May 2021 12:08:56 +0200 Subject: Fix ftbfs with autoconf 2.70 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 141c4db..18dd564 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ sane-backends (1.0.32-1) experimental; urgency=medium - New Patches: + patches/0175-fix_tests.patch to fix build - tests. + patches/0605-fix_groff-warnings.patch to fix groff warnings. + - Fix ftbfs with autoconf 2.70 (Closes: #978902). * debian/copyright: - Refresh to the new upstream release. * debian/libsane1.symbols: -- cgit v1.2.3 From 154785ab2d5df7ddc8c2cf813b773c340e5e2aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 18 May 2021 07:42:47 +0200 Subject: d/changelog: Change date/time --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 18dd564..08e2114 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,7 +45,7 @@ sane-backends (1.0.32-1) experimental; urgency=medium - Cherry-picked from 1.0.25-4.1+deb9u2 (Thanks to Sylvain Beucler ). - -- Jörg Frings-Fürst Fri, 30 Apr 2021 22:38:18 +0200 + -- Jörg Frings-Fürst Sat, 01 May 2021 12:09:06 +0200 sane-backends (1.0.31-4) unstable; urgency=medium -- cgit v1.2.3