diff --git a/fix-sanei_scsi_find_devices.patch b/fix-sanei_scsi_find_devices.patch deleted file mode 100644 index a233afb..0000000 --- a/fix-sanei_scsi_find_devices.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- sanei/sanei_scsi.c.orig 2007-11-16 19:37:07.000000000 +0100 -+++ sanei/sanei_scsi.c 2008-04-08 15:45:05.000000000 +0200 -@@ -2882,8 +2882,7 @@ issue (struct req *req) - channel, id, lun) - && ((*attach) (dev_name) != SANE_STATUS_GOOD)) - { -- fclose (proc_fp); -- return; -+ DBG(1,"sanei_scsi_find_devices: bad attach\n"); - } - } - vendor[0] = model[0] = type[0] = 0; diff --git a/fix-uninitialized-variables.patch b/fix-uninitialized-variables.patch deleted file mode 100644 index acb4b2d..0000000 --- a/fix-uninitialized-variables.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- backend/avision.c.orig 2008-02-09 11:42:46.000000000 +0100 -+++ backend/avision.c 2008-02-27 13:35:18.000000000 +0100 -@@ -4375,8 +4375,9 @@ set_calib_data (Avision_Scanner* s, stru - static uint8_t* - sort_and_average (struct calibration_format* format, uint8_t* data) - { -- int stride, i, line; -- int elements_per_line; -+ int stride = 1; -+ int i, line; -+ int elements_per_line = format->pixel_per_line * format->channels; - - uint8_t *sort_data, *avg_data; - diff --git a/install-umax_pp-tool.patch b/install-umax_pp-tool.patch index 922498a..3083104 100644 --- a/install-umax_pp-tool.patch +++ b/install-umax_pp-tool.patch @@ -1,15 +1,13 @@ ---- tools/Makefile.in.orig 2008-02-03 07:59:36.000000000 +0100 -+++ tools/Makefile.in 2008-10-28 12:24:59.000000000 +0100 -@@ -88,10 +88,11 @@ SUBDIRS = hotplug hotplug-ng udev hal +--- tools/Makefile.am.orig 2009-02-20 17:51:09.000000000 +0100 ++++ tools/Makefile.am 2009-06-05 15:08:45.000000000 +0200 +@@ -7,8 +7,8 @@ + AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \ + -I$(top_srcdir)/include - all: $(DESTINATIONS) +-bin_PROGRAMS = sane-find-scanner gamma4scanimage +-noinst_PROGRAMS = sane-desc umax_pp ++bin_PROGRAMS = sane-find-scanner gamma4scanimage umax_pp ++noinst_PROGRAMS = sane-desc --install: sane-config sane-find-scanner gamma4scanimage -+install: sane-config sane-find-scanner gamma4scanimage umax_pp - $(INSTALL_SCRIPT) sane-config $(DESTDIR)$(bindir)/sane-config - $(INSTALL_PROGRAM) sane-find-scanner $(DESTDIR)$(bindir)/sane-find-scanner - $(INSTALL_PROGRAM) gamma4scanimage $(DESTDIR)$(bindir)/gamma4scanimage -+ $(INSTALL_PROGRAM) umax_pp $(DESTDIR)$(bindir)/umax_pp - - uninstall: - rm -f $(bindir)/sane-config $(bindir)/sane-find-scanner $(bindir)/gamma4scanimage + if CROSS_COMPILING + HOTPLUG = diff --git a/no-descriptions-external-hpoj.patch b/no-descriptions-external-hpoj.patch new file mode 100644 index 0000000..cf1eb52 --- /dev/null +++ b/no-descriptions-external-hpoj.patch @@ -0,0 +1,10 @@ +--- doc/Makefile.am.orig 2009-03-24 14:36:37.000000000 +0100 ++++ doc/Makefile.am 2009-06-10 14:47:53.000000000 +0200 +@@ -201,7 +201,6 @@ DESC_EXT_FILES = descriptions-external/b + descriptions-external/hp3770.desc \ + descriptions-external/hp8200.desc \ + descriptions-external/hpaio.desc \ +- descriptions-external/hpoj.desc \ + descriptions-external/lhii.desc \ + descriptions-external/mustek_a3p1.desc \ + descriptions-external/primascan.desc \ diff --git a/sane-backends-1.0.19.tar.bz2 b/sane-backends-1.0.19.tar.bz2 deleted file mode 100644 index 29d5c35..0000000 --- a/sane-backends-1.0.19.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ff8db743b8aab67e0b28e30f86af53c15df81b3bf9d61c26ae7d6338034105a -size 3345711 diff --git a/sane-backends-1.0.20.tar.bz2 b/sane-backends-1.0.20.tar.bz2 new file mode 100644 index 0000000..596f1d9 --- /dev/null +++ b/sane-backends-1.0.20.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba4eb97b177fe5b4168c4bad94457dea1194ddb37985b048bec1fd82a3cf5d8d +size 3714555 diff --git a/sane-backends.changes b/sane-backends.changes index 8c45749..651a5f0 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Wed Jun 10 15:25:58 CEST 2009 - jsmeix@suse.de + +- Upgraded to sane-backends version 1.0.20: + New backends: + canon_dr (Canon DR-series), coolscan3 (Nikon LS & Coolscan), + rts8891 (Umax & HP 44xx), xerox_mfp (Samsung/Xerox/Dell MFPs) + Many backends updated. + 75 more scanner models supported. + New (automake compatible) build system. + Avahi support. + More network scanners supported. + Epson backend deprecated, use epson2. + Coolscan2 backend deprecated, use coolscan3. + Internal SCSI, USB, threading, TCP & UDP code updates. + Updated HAL and udev support. + Improved saned configuration. + Scanimage updates. + Updated translations. + Documentation updates. + Bugfixes. + Note: + This is one more release of the SANE 1.0 series, compare + the below entry dated "Thu Feb 28 13:56:15 CET 2008". +- Re-enabled "autoreconf -fi" in the build section (it was + disabled because it failed for sane-backends-1.0.19). +- fix-uninitialized-variables.patch and + fix-sanei_scsi_find_devices.patch are obsolete since + sane-backends-1.0.20 because it is fixed in the source. +- Adapted install-umax_pp-tool.patch for the new build system + (now tools/Makefile.am instead of tools/Makefile.in). +- no-descriptions-external-hpoj.patch removes + descriptions-external/hpoj.desc from doc/Makefile.am + because it is intentionally removed from the sources + in the prep section to avoid confusion with its successor + hpaio.desc (since openSUSE 10.3 the package hp-officeJet + which provided the hpoj driver is dropped). + ------------------------------------------------------------------- Fri Jan 23 10:40:21 CET 2009 - jsmeix@suse.de diff --git a/sane-backends.spec b/sane-backends.spec index 72e60d2..ff03542 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -1,5 +1,5 @@ # -# spec file for package sane-backends (Version 1.0.19) +# spec file for package sane-backends (Version 1.0.20) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,8 +24,8 @@ License: GPL v2 only; GPL v2 or later; LGPL v2.1 or later; Public Domain, Group: Hardware/Scanner AutoReqProv: on Summary: SANE (Scanner Access Now Easy) Scanner Drivers -Version: 1.0.19 -Release: 102 +Version: 1.0.20 +Release: 1 Url: http://www.sane-project.org/ # URL for Source0: http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.19.tar.gz Source0: sane-backends-%{version}.tar.bz2 @@ -73,12 +73,12 @@ Patch2: fix-buffer-overflow.patch # Patch4 disables hw_ink_remain which causes a buffer overflow in fujitsu.c: # Patch4 is obsolete since sane-backends-1.0.19 because it is fixed in the source. # Patch5 fixes uninitialized variables in avision.c: -Patch5: fix-uninitialized-variables.patch +# Patch5 is obsolete since sane-backends-1.0.20 because it is fixed in the source. # Patch6 fixes an ambiguous post/pre increment in canon-sane.c: # Patch6 is obsolete since sane-backends-1.0.19 because it is fixed in the source. # Patch7 lets sanei_scsi_find_devices continue on to look at subsequent devices # if the attach callback returns anything other than SANE_STATUS_GOOD: -Patch7: fix-sanei_scsi_find_devices.patch +# Patch7 is obsolete since sane-backends-1.0.20 because it is fixed in the source. # Patch100... is SUSE specific stuff: # Patch100 lets the "canon" backend do scanner auto-recognition: Patch100: canon-backend-autoprobing.patch @@ -99,6 +99,9 @@ Patch101: disable-resmgr-support.patch # but not installed but it is needed to recover from a failed scan # with scanners which use the umax_pp backend, see http://bugs.debian.org/496833 Patch103: install-umax_pp-tool.patch +# Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am +# because it is intentionally removed from the sources in the prep section: +Patch104: no-descriptions-external-hpoj.patch # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build # The postinstall script requires this: @@ -279,11 +282,6 @@ Authors: %setup -q # Patch2 fixes too small arrays in backend/niash.c: %patch2 -# Patch5 fixes uninitialized variables in avision.c: -%patch5 -# Patch7 lets sanei_scsi_find_devices continue on to look at subsequent devices -# if the attach callback returns anything other than SANE_STATUS_GOOD: -%patch7 # Patch100... is SUSE specific stuff: # Patch100 lets the "canon" backend do scanner auto-recognition: %patch100 @@ -291,6 +289,9 @@ Authors: %patch101 # Patch103 installs tools/umax_pp as /usr/bin/umax_pp: %patch103 +# Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am +# because it is intentionally removed from the sources in the prep section: +%patch104 # Source100... is SUSE specific stuff: # Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc # because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is dropped. @@ -316,14 +317,16 @@ chmod u+x create_scanner_database %build %{?suse_update_config:%{suse_update_config -f}} -# 'autoreconf -fi' fails for sane-backends-1.0.19 with the message: -# aclocal: acinclude.m4:606: file m4/libtool.m4 does not exist +# 'autoreconf -fi' failed for sane-backends-1.0.19 with the message: +# "aclocal: acinclude.m4:606: file m4/libtool.m4 does not exist". # The m4 dir from CVS was not included in the 1.0.18 tar, so it was # not included in 1.0.19 either, but it has new files since 1.0.18. # It is a bit strange because autoconf never complained before. # Because it is not clear whether or not 'autoreconf -fi' is best -# and because it builds without it, it is simply disabled for now: -#autoreconf -fi +# and because it builds without it, it was simply disabled for sane-backends-1.0.19. +# Now sane-backends-1.0.20 provides a new automake compatible build system +# so that 'autoreconf -fi' works again: +autoreconf -fi export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DGIMP_ENABLE_COMPAT_CRUFT=1 -fno-strict-aliasing" export LDFLAGS="-L/%_lib $LDFLAGS" # Disable locking because /var/lock/sane/ would be a world-writable directory: @@ -623,6 +626,41 @@ exit 0 %{_sysconfdir}/udev/rules.d/56-sane-backends-autoconfig.rules %changelog +* Wed Jun 10 2009 jsmeix@suse.de +- Upgraded to sane-backends version 1.0.20: + New backends: + canon_dr (Canon DR-series), coolscan3 (Nikon LS & Coolscan), + rts8891 (Umax & HP 44xx), xerox_mfp (Samsung/Xerox/Dell MFPs) + Many backends updated. + 75 more scanner models supported. + New (automake compatible) build system. + Avahi support. + More network scanners supported. + Epson backend deprecated, use epson2. + Coolscan2 backend deprecated, use coolscan3. + Internal SCSI, USB, threading, TCP & UDP code updates. + Updated HAL and udev support. + Improved saned configuration. + Scanimage updates. + Updated translations. + Documentation updates. + Bugfixes. + Note: + This is one more release of the SANE 1.0 series, compare + the below entry dated "Thu Feb 28 13:56:15 CET 2008". +- Re-enabled "autoreconf -fi" in the build section (it was + disabled because it failed for sane-backends-1.0.19). +- fix-uninitialized-variables.patch and + fix-sanei_scsi_find_devices.patch are obsolete since + sane-backends-1.0.20 because it is fixed in the source. +- Adapted install-umax_pp-tool.patch for the new build system + (now tools/Makefile.am instead of tools/Makefile.in). +- no-descriptions-external-hpoj.patch removes + descriptions-external/hpoj.desc from doc/Makefile.am + because it is intentionally removed from the sources + in the prep section to avoid confusion with its successor + hpaio.desc (since openSUSE 10.3 the package hp-officeJet + which provided the hpoj driver is dropped). * Fri Jan 23 2009 jsmeix@suse.de - Do no longer add a generic entry for SCSI scanners to the HAL fdi file 70-scanner.fdi because this @@ -1215,7 +1253,7 @@ exit 0 - skipped parport-scanner for ppc and sparc * Mon Nov 06 2000 freitag@suse.de - fixed Copyright/License-Field in SpecFile -* Thu Nov 02 2000 ro@suse.de +* Fri Nov 03 2000 ro@suse.de - fix neededforbuild for new package-names * Thu Nov 02 2000 freitag@suse.de - new version 1.0.3