diff options
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 32 | ||||
| -rw-r--r-- | debian/patches/0105-fuj-126a.patch | 68 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 1 | ||||
| -rw-r--r-- | debian/sane-utils.links | 1 | ||||
| -rw-r--r-- | debian/sane-utils.lintian-overrides | 2 | ||||
| -rw-r--r-- | debian/sane-utils.postinst | 6 |
8 files changed, 81 insertions, 40 deletions
diff --git a/debian/changelog b/debian/changelog index 6d81b48..e8d5788 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -sane-backends (1.0.25+git20150425-2) UNRELEASED; urgency=medium +sane-backends (1.0.25+git20150528-1) experimental; urgency=medium - * Sync with sane-backends/1.0.24-11. + * Build from daily snapshot sane-backends-git20150528.tar.gz. + * Sync with sane-backends/1.0.24-13. + * New debian/patches/0105-fuj-126a.patch: + - Upstream patch for testing Fujitsu backend adjust + brightness and threshold. - -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 09 May 2015 08:52:46 +0200 + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Thu, 28 May 2015 07:43:42 +0200 sane-backends (1.0.25+git20150425-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 4cff38c..b96f79e 100644 --- a/debian/control +++ b/debian/control @@ -148,35 +148,3 @@ Description: API development library for scanners [debug symbols] backends are welcome, too, however). . This package contains the debugging symbols for the SANE backends. - -Package: libsane1 -Section: libs -Architecture: any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: - acl [linux-any], - adduser, - libsane-common (= ${source:Version}), - udev [linux-any] | makedev [linux-any], - ${misc:Depends}, - ${shlibs:Depends} -Recommends: libsane-extras, sane-utils (>= ${binary:Version}) -Suggests: avahi-daemon, hplip -Description: API library for scanners - SANE stands for "Scanner Access Now Easy" and is an application - programming interface (API) that provides standardized access to any - raster image scanner hardware (flatbed scanner, hand-held scanner, - video- and still-cameras, frame-grabbers, etc.). The SANE standard is - free and its discussion and development are open to everybody. The - current source code is written to support several operating systems, - including GNU/Linux, OS/2, Win32 and various Unices and is available - under the GNU General Public License (commercial applications and - backends are welcome, too, however). - . - This package includes the backends for many scanners. A libsane-extras - package containing some not-yet-included backends is available separately. - . - Graphical frontends for sane are available in the packages sane and - xsane. Command line frontend scanimage, saned and sane-find-scanner are - available in the sane-utils package. diff --git a/debian/patches/0105-fuj-126a.patch b/debian/patches/0105-fuj-126a.patch new file mode 100644 index 0000000..c9fcae6 --- /dev/null +++ b/debian/patches/0105-fuj-126a.patch @@ -0,0 +1,68 @@ +Description: Test patch for testing Fujitsu adjust brightness and threshold. + ++++ only for testing ++++ +Author: m. allan noah <kitno455@gmail.com> +Bug: https://alioth.debian.org/tracker/?func=detail&atid=410366&aid=315069&group_id=30186 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=740256 +Last-Update: 2015-05-28 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +diff --git a/backend/fujitsu.c b/backend/fujitsu.c +index 7f008d0..5e97810 100644 +--- a/backend/fujitsu.c ++++ b/backend/fujitsu.c +@@ -620,7 +620,7 @@ + #include "fujitsu.h" + + #define DEBUG 1 +-#define BUILD 125 ++#define BUILD 126 + + /* values for SANE_DEBUG_FUJITSU env var: + - errors 5 +@@ -2271,6 +2271,7 @@ init_model (struct fujitsu *s) + + /* weirdness */ + s->need_q_table = 1; ++ s->late_lut = 1; + s->need_diag_preread = 1; + s->ppl_mod_by_mode[MODE_COLOR] = 2; + s->hopper_before_op = 1; +@@ -6899,6 +6900,13 @@ sane_start (SANE_Handle handle) + if (ret != SANE_STATUS_GOOD) + DBG (5, "sane_start: WARNING: cannot send_endorser %d\n", ret); + ++ /* send lut if scanner has no hardware brightness/contrast */ ++ if (!s->late_lut && (!s->brightness_steps || !s->contrast_steps)){ ++ ret = send_lut(s); ++ if (ret != SANE_STATUS_GOOD) ++ DBG (5, "sane_start: WARNING: cannot early send_lut %d\n", ret); ++ } ++ + /* set window command */ + ret = set_window(s); + if (ret != SANE_STATUS_GOOD) { +@@ -6907,10 +6915,10 @@ sane_start (SANE_Handle handle) + } + + /* send lut if scanner has no hardware brightness/contrast */ +- if (!s->brightness_steps || !s->contrast_steps){ ++ if (s->late_lut && (!s->brightness_steps || !s->contrast_steps)){ + ret = send_lut(s); + if (ret != SANE_STATUS_GOOD) +- DBG (5, "sane_start: WARNING: cannot send_lut %d\n", ret); ++ DBG (5, "sane_start: WARNING: cannot late send_lut %d\n", ret); + } + + /* some scanners need the q table sent, even when not scanning jpeg */ +diff --git a/backend/fujitsu.h b/backend/fujitsu.h +index e1f7d68..6ce1a56 100644 +--- a/backend/fujitsu.h ++++ b/backend/fujitsu.h +@@ -332,6 +332,7 @@ struct fujitsu + int broken_diag_serial; /* some scanners are just plain borked */ + int need_q_table; /* some scanners wont work without these */ + int need_diag_preread; ++ int late_lut; + int hopper_before_op; /* some scanners dont like OP when hopper empty */ + int no_wait_after_op; /* some scanners dont like TUR after OP */ + diff --git a/debian/patches/series b/debian/patches/series index d347517..5a1f96c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,3 +25,4 @@ ppc64el.patch #0100-usb3-corrections.patch 001-scanimage_manpage.patch 0510-disable-html-tests.patch +0105-fuj-126a.patch diff --git a/debian/rules b/debian/rules index 4bd5bcc..a82bc2f 100755 --- a/debian/rules +++ b/debian/rules @@ -142,4 +142,3 @@ override_dh_strip: override_dh_makeshlibs: dh_makeshlibs -- -c0 -v$(VERSION) -Pdebian/libsane -plibsane - dh_makeshlibs -- -c0 -v$(VERSION) -Pdebian/libsane1 -plibsane1 diff --git a/debian/sane-utils.links b/debian/sane-utils.links new file mode 100644 index 0000000..50ffd0e --- /dev/null +++ b/debian/sane-utils.links @@ -0,0 +1 @@ +/dev/null /lib/systemd/system/saned.service diff --git a/debian/sane-utils.lintian-overrides b/debian/sane-utils.lintian-overrides index 6511491..255413a 100644 --- a/debian/sane-utils.lintian-overrides +++ b/debian/sane-utils.lintian-overrides @@ -11,4 +11,4 @@ systemd-no-service-for-init-script # # disabled during piuparts error # -maintainer-script-ignores-errors
\ No newline at end of file +maintainer-script-ignores-errors diff --git a/debian/sane-utils.postinst b/debian/sane-utils.postinst index f3e5f2d..155ed22 100644 --- a/debian/sane-utils.postinst +++ b/debian/sane-utils.postinst @@ -50,10 +50,10 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then adduser --home /var/lib/saned --quiet --system --no-create-home --group saned || true fi - # Move home from /home/saned to /var/lib/saned - if getent passwd | grep -q "^saned:" | grep -q "/home/saned"; then + # 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 -q "saned" | grep -q "scanbd"; then + 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" |