--- sane-backends-1.0.19.orig/debian/libsane-dev.doc-base +++ sane-backends-1.0.19/debian/libsane-dev.doc-base @@ -0,0 +1,16 @@ +Document: libsane-dev +Title: SANE Standard +Author: Andreas Beck and David Mosberger +Abstract: 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). +Section: Apps/Graphics + +Format: postscript +Files: /usr/share/doc/libsane-dev/sane.ps.gz --- sane-backends-1.0.19.orig/debian/control +++ sane-backends-1.0.19/debian/control @@ -0,0 +1,95 @@ +Source: sane-backends +Section: graphics +Priority: optional +Maintainer: Ubuntu Core developers +XSBC-Original-Maintainer: Julien BLACHE +Standards-Version: 3.7.3 +Build-Depends: debhelper (>= 5.0.0), dpatch, libgphoto2-2-dev, libltdl3-dev, libjpeg62-dev, libtiff4-dev, libusb-dev (>= 2:0.1.10a-9) [!hurd-i386], libieee1284-3-dev (>= 0.2.10-5) [!hurd-i386], libcam-dev [kfreebsd-i386 kfreebsd-amd64], gettext, texlive, texlive-latex-extra, autotools-dev, pkg-config, chrpath, xutils-dev +Homepage: http://www.sane-project.org + +Package: sane-utils +Section: graphics +Architecture: any +Depends: adduser (>= 3.47), ${shlibs:Depends} +Suggests: unpaper +Replaces: libsane (<< 1.0.11-4) +Description: API library for scanners -- utilities + 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 command line frontend scanimage, the saned + server and the sane-find-scanner utility, along with their documentation. + +Package: libsane +Section: libs +Architecture: any +Depends: adduser (>= 3.47), ${udev}, ${shlibs:Depends} +Recommends: sane-utils (>= ${binary:Version}) +Suggests: hpoj, hplip, libsane-extras (>= 1.0.19.1) +Replaces: libsane-extras (<< 1.0.18.14) +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. + +Package: libsane-dev +Section: libdevel +Architecture: any +Depends: libsane (= ${binary:Version}), libjpeg62-dev, libtiff4-dev, libusb-dev (>= 1:0.1.6a-1) [!hurd-i386], libieee1284-3-dev (>= 0.2.10-5) [!hurd-i386], ${libcam-dev}, libgphoto2-2-dev +Suggests: libsane-extras-dev (>= 1.0.19.1) +Replaces: libsane-extras-dev (<< 1.0.18.14), libsane-doc +Conflicts: libsane-doc +Description: API development library for scanners [development files] + 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 contains the files needed to build your applications + using SANE. + +Package: libsane-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: libsane (= ${binary:Version}) +Suggests: libsane-extras-dbg (>= 1.0.19.1) +Replaces: libsane-extras-dbg (<< 1.0.18.14) +Description: API development library for scanners [debug symbols] + 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 contains the debugging symbols for the SANE backends. + --- sane-backends-1.0.19.orig/debian/libsane-dev.install +++ sane-backends-1.0.19/debian/libsane-dev.install @@ -0,0 +1,8 @@ +usr/include/ +usr/lib/sane/*.a +usr/lib/sane/*.so +usr/lib/*.a +usr/lib/*.so +usr/bin/sane-config +usr/share/man/man1/sane-config.1 +usr/share/doc/*/* usr/share/doc/libsane-dev/ --- sane-backends-1.0.19.orig/debian/rules +++ sane-backends-1.0.19/debian/rules @@ -0,0 +1,191 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# Include dpatch rules +include /usr/share/dpatch/dpatch.make + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +ifeq ($(DEB_HOST_ARCH_OS),) + DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)) + ifeq ($(DEB_HOST_ARCH_OS),gnu) + DEB_HOST_ARCH_OS := hurd + endif +endif + + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +autotools: autotools-stamp +autotools-stamp: + -rm -f config.sub config.guess + ln -s /usr/share/misc/config.sub config.sub + ln -s /usr/share/misc/config.guess config.guess + touch autotools-stamp + +config.status: autotools-stamp configure + dh_testdir + + # Add here commands to configure the package. + LDFLAGS="-Wl,-Bsymbolic-functions" \ + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --datadir=\$${prefix}/share \ + --mandir=\$${prefix}/share/man \ + --with-docdir=\$${prefix}/share/doc/libsane \ + --disable-locking \ + --enable-static \ + --with-gphoto2 \ + --enable-translations + + # generate POT file for translators + (cd po && make sane-backends.pot) + +build: build-stamp +build-stamp: patch-stamp config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + touch build-stamp + +clean: real-clean unpatch +real-clean: + dh_testdir + dh_testroot + rm -f autotools-stamp build-stamp + + # Autoconf-generated files + rm -f include/byteorder.h include/_stdint.h + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + + rm -f debian/libsane.install debian/libsane.docs debian/libsane.dirs debian/libsane.udev + rm -f config.sub config.guess + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k +ifeq (linux,$(DEB_HOST_ARCH_OS)) + cp debian/libsane.dirs.linux debian/libsane.dirs +endif + dh_installdirs + + # Add here commands to install the package into debian/tmp + $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr \ + sysconfdir=$(CURDIR)/debian/tmp/etc \ + docdir=$(CURDIR)/debian/tmp/usr/share/doc/libsane + + # remove /usr/lib/sane/libsane.so.1 (libtool side-effect ?) + rm -f debian/tmp/usr/lib/sane/libsane.so.1 + + # remove libsane-dll, same as regular libsane + rm -f debian/tmp/usr/lib/sane/libsane-dll.* + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + + # install only the manpages for the backends which have been built + cp debian/libsane.install.in debian/libsane.install + ls debian/tmp/usr/lib/sane/*.so | sed -e "s#.*/lib\([^.]\+\)[.]so#usr/share/man/man5/\1.5#" | { while read mp; do \ + test -e debian/tmp/$$mp && echo $$mp >> debian/libsane.install; done } + + dh_install --sourcedir=debian/tmp + +ifeq (kfreebsd,$(DEB_HOST_ARCH_OS)) + echo README.freebsd > debian/libsane.docs +endif +ifeq (linux,$(DEB_HOST_ARCH_OS)) + echo README.linux > debian/libsane.docs +endif + + dh_installdocs + + rm -f debian/libsane/etc/sane.d/saned.conf + + # move the html files into html/ + install -d debian/libsane-dev/usr/share/doc/libsane-dev/html + mv debian/libsane-dev/usr/share/doc/libsane-dev/*.html debian/libsane-dev/usr/share/doc/libsane-dev/html/ + + # create the PATH_SANE_DATA_DIR/gt68xx directory in libsane + install -d debian/libsane/usr/share/sane/gt68xx + + # create the /etc/sane.d/dll.d directory in libsane + install -d debian/libsane/etc/sane.d/dll.d + +ifeq (linux,$(DEB_HOST_ARCH_OS)) + # udev support + # Generate the udev rules file + # disable udev support in Ubuntu; hal sets dynamic ACLs on the devices + #$(CURDIR)/tools/sane-desc -s $(CURDIR)/doc/descriptions -m udev > $(CURDIR)/debian/libsane.udev + #dh_installudev + + # Generate a modprobe blacklist for scanner and hpusbscsi + echo "blacklist scanner" > $(CURDIR)/debian/libsane/etc/modprobe.d/libsane + echo "blacklist hpusbscsi" >> $(CURDIR)/debian/libsane/etc/modprobe.d/libsane +endif + + # install HAL fdi + install -m 644 -D $(CURDIR)/tools/hal/libsane.fdi $(CURDIR)/debian/libsane/usr/share/hal/fdi/preprobe/10osvendor/20-libsane.fdi + + # remove rpath from the binaries (wonderful tool !) + chrpath -d debian/sane-utils/usr/sbin/saned + chrpath -d debian/sane-utils/usr/bin/scanimage + + # install the xerox script as an example + dh_installexamples -plibsane tools/README tools/xerox + +# dh_installdebconf +# dh_installmenu +# dh_installman +# dh_installinfo +# dh_undocumented + dh_installchangelogs ChangeLog + dh_link + dh_strip -plibsane --dbg-package=libsane-dbg + dh_strip -Nlibsane + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps +ifeq (linux,$(DEB_HOST_ARCH_OS)) + dh_gencontrol -- -Vudev="udev (>= 0.88-1) | makedev (>= 2.3.1-58)" +else + ifeq (kfreebsd,$(DEB_HOST_ARCH_OS)) + dh_gencontrol -- -Vlibcam-dev="libcam-dev" + else + dh_gencontrol + endif +endif + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install patch unpatch real-clean autotools --- sane-backends-1.0.19.orig/debian/changelog +++ sane-backends-1.0.19/debian/changelog @@ -0,0 +1,1665 @@ +sane-backends (1.0.19-1ubuntu2) hardy; urgency=low + + * debian/control: Demote libsane-extras-dbg from Depends: to Suggests, too. + + -- Martin Pitt Fri, 29 Feb 2008 14:20:58 +0100 + +sane-backends (1.0.19-1ubuntu1) hardy; urgency=low + + * Merge with Debian unstable to pull in the final release. (LP: #193265) + Remaining Ubuntu changes: + - debian/rules: Link using -Bsymbolic-functions (startup time + optimization). + - debian/{libsane.install.in,libsane-dev.install,rules}: Install + documentation into libsane-dev instead of libsane to save CD space. + - debian/rules: Do not install the udev rules, since hal now provides + dynamic ACLs on device nodes. (See hardy-hardware-detection spec.) + - debian/rules: Install hal FDI. (LP #180794, forwarded to Debian #466540) + - debian/libsane.postinst: Do not create the scanner group. + - debian/libsane.postinst: Remove obsolete udev rules on upgrade. This + needs to be kept until after Hardy's release. + * debian/control: Demote libsane-extras from Depends: to Suggests: again, as + long as this package is in universe. + + -- Martin Pitt Tue, 19 Feb 2008 14:12:24 +0100 + +sane-backends (1.0.19-1) unstable; urgency=low + + * New upstream release. + + New backends: cardscan (Corex Cardscan 800c), epjitsu (Epson-based + Fujitsu), epson2 (various Epson scanners), hp3900 (HP ScanJet 3970 and + more), hp5590 (HP ScanJet 5590 and more), hpljm1005 (HP LaserJet M1005 + and more), hs2p (Ricoh IS400 series) + + Fix for the pixma backend (closes: #459663). + + Regression fix for the avision backend (closes: #458478, #458932). + * debian/patches/02_hurd_no_plustek_pp.dpatch: + + Removed; merged upstream. + * debian/patches/11_minimum_linkage.dpatch: + + Updated. + * debian/patches/12_new_configure.dpatch: + + Updated. + * debian/control: + + Adjust libsane-extras dependencies for 1.0.19. + + -- Julien BLACHE Tue, 12 Feb 2008 21:44:19 +0100 + +sane-backends (1.0.19~cvs20071213-5) unstable; urgency=low + + * debian/control: + + Build-Depends: xutils-dev instead of xutils. + + Depend on libsane-extras{,-dev,-dbg} to help fix up the buggy udev rules + in libsane-extras. + + Promote libgphoto2-2-dev to Depends: for libsane-dev. + * debian/patches/02_hurd_no_plustek_pp.dpatch: + + Added; do not build plustek_pp on Hurd (closes: #457378). + * debian/patches/12_new_configure.dpatch: + + Updated. + + -- Julien BLACHE Mon, 07 Jan 2008 12:07:27 +0100 + +sane-backends (1.0.19~cvs20071213-4ubuntu2) hardy; urgency=low + + * debian/rules: Install hal FDI, so that hal will automatically apply ACLs + to the USB device node, and to fix desktop integration. (LP: #180794) + + -- Martin Pitt Tue, 19 Feb 2008 13:26:07 +0100 + +sane-backends (1.0.19~cvs20071213-4ubuntu1) hardy; urgency=low + + * Merge with Debian unstable. Cleaned most of the huge delta, which was + either obsolete or just noise. + * Install the documentation into libsane-dev instead of new package + libsane-doc, add the Conflicts/Replaces, and drop the large build system + patch to build -doc. + * Remaining Ubuntu changes: + - debian/rules: Link using -Bsymbolic-functions (startup time + optimization). + - debian/{libsane.install.in,libsane-dev.install,rules}: Install + documentation into libsane-dev instead of libsane to save CD space. + * Do not install the udev rules, since hal now provides dynamic ACLs on + device nodes. (See hardy-hardware-detection spec.) + * debian/libsane.postinst: Do not create the scanner group. + * debian/libsane.postinst: Remove obsolete udev rules on upgrade. + + -- Martin Pitt Wed, 02 Jan 2008 16:45:30 +0100 + +sane-backends (1.0.19~cvs20071213-4) unstable; urgency=low + + * debian/patches/11_minimum_linkage.dpatch: + + Updated; add libcam for coolscan & umax, remove it for cardscan. + + -- Julien BLACHE Mon, 31 Dec 2007 14:11:34 +0100 + +sane-backends (1.0.19~cvs20071213-3) unstable; urgency=low + + * debian/control: + + Tighten relationship with libsane-extras due to the udev rules renaming. + + -- Julien BLACHE Fri, 28 Dec 2007 11:45:30 +0100 + +sane-backends (1.0.19~cvs20071213-2) unstable; urgency=low + + * debian/rules: + + Generate udev rules as debian/libsane.udev, clean as needed. + + Use dh_installudev. + + Remove libsane-dll.* from /usr/lib/sane; libsane.so and libsane-dll.so + are the same backend. + * debian/libsane.postinst: + + Remove udev installation code. + * debian/libsane.preinst: + + Added; handle upgrade from previous udev code to dh_installudev. + * debian/patches/11_minimum_linkage.dpatch: + + Added; only link backends to the libraries they need. + * debian/patches/12_new_configure.dpatch: + + Added; new configure script. + * debian/patches/12_gphoto2_link_backend_only.dpatch: + + Removed; obsoleted by 11_minimum_linkage.dpatch. + * debian/patches/13_new_configure.dpatch: + + Removed; now 12_new_configure.dpatch. + + -- Julien BLACHE Tue, 25 Dec 2007 22:58:26 +0100 + +sane-backends (1.0.19~cvs20071213-1) unstable; urgency=low + + * New CVS snapshot. + + New backend: hp3900. + * debian/control: + + Bump Standards-Version to 3.7.3 (no changes). + + Bump libsane-extras{,-dev} dependencies/conflicts/replaces to 1.0.18.13. + + Remove module-init-tools recommendation, enforced by udev which is a + dependency. + * debian/rules: + + Remove ${module-init-tools} substvar. + + -- Julien BLACHE Thu, 13 Dec 2007 21:59:02 +0100 + +sane-backends (1.0.19~cvs20071028-1ubuntu1) hardy; urgency=low + + * Merge with Debian; remaining changes: + - debian/libsane.README.Debian: Retain note regarding udev rule, + - debian/libsane.dirs.linux: Retain etc/sane.d, + - debian/libsane.postinst: Clean, rediff, + - debian/rules: Account for difference in udev rule filename, + - debian/sane-utils.README.Debian: Merge note regarding USB + scanners. + - Move the user documentation to a separate libsane-doc package. + * Link using -Bsymbolic-functions. + * Set Ubuntu maintainer address. + + -- Matthias Klose Thu, 06 Dec 2007 11:43:26 +0000 + +sane-backends (1.0.19~cvs20071028-1) unstable; urgency=low + + * New CVS snapshot. + + All backends now declare OPT_NUM_OPTS of type SANE_TYPE_INT (closes: #448162). + + Fixed USB IDs for the Epson CX-6600 (closes: #419349). + + Added USB IDs for the Epson DX-6000 (closes: #442051). + * debian/control: + + libsane-dev Recommends: libgphoto2-2-dev. + + -- Julien BLACHE Sun, 28 Oct 2007 11:17:36 +0100 + +sane-backends (1.0.19~cvs20070730-1) unstable; urgency=low + + * New CVS snapshot. + + Workaround for CONFIG_USB_SUSPEND (closes: #434276). + * debian/control, debian/rules: + + Make libsane depend on makedev | udev on Linux (closes: #428220). + * debian/libsane.postinst: + + Change MAKEDEV invocation to invoke /dev/MAKEDEV instead of /sbin/MAKEDEV. + * debian/control: + + Do not {build-,}depend on libusb-dev nor libieee1284-dev on hurd-i386 + (closes: #434575). + + Use ${binary:Version} instead of ${Source-Version}. + * debian/rules: + + Do not ignore make distclean errors. + * debian/patches/30_sanei_scsi_sg_ioctl.dpatch: + + Removed; merged upstream. + + -- Julien BLACHE Mon, 30 Jul 2007 14:03:13 +0200 + +sane-backends (1.0.19~cvs20070505-3ubuntu2) gutsy; urgency=low + + * Move the user documentation to a separate libsane-doc package. + + -- Matthias Klose Fri, 05 Oct 2007 11:53:26 +0200 + +sane-backends (1.0.19~cvs20070505-3ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/control: Adhere to DebianMaintainerField, + - debian/libsane.README.Debian: Retain note regarding udev rule, + - debian/libsane.dirs.linux: Retain etc/sane.d, + - debian/libsane.postinst: Clean, rediff, + - debian/rules: Account for difference in udev rule filename, + - debian/sane-utils.README.Debian: Merge note regarding USB + scanners. + + -- Daniel T Chen Wed, 23 May 2007 04:58:00 -0400 + +sane-backends (1.0.19~cvs20070505-3) unstable; urgency=low + + * debian/patches/30_sanei_scsi_sg_ioctl.dpatch: + + Added; use the SG_IO ioctl interface instead of the asynchronous + read/write SG3 interface. This allows the use of SCSI scanners in + mixed 32/64bit environments, thanks to the ioctl 32bit compatibility + layer taking care of the 32/64bit sg_hdr conversion (closes: #420193). + + If you own a SCSI scanner, please report back on this change; especially + if, compared to the previous version (1.0.19~cvs20070505-2): + - the scanner backtracks more than it used to with the previous version + - you see weird errors OR you see no error and you should be seeing some + - performance sucks + - resulting image is broken in one way or another + - ... + + -- Julien BLACHE Sun, 20 May 2007 10:46:00 +0200 + +sane-backends (1.0.19~cvs20070505-2ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/control: Adhere to DebianMaintainerField, + - debian/libsane.README.Debian: Retain note regarding udev rule, + - debian/libsane.dirs.linux: Retain etc/sane.d, + - debian/libsane.postinst: Clean, rediff, + - debian/patches/00list: Don't include 25_udev_rules_line_length + or 30_udev_long_comment_lines (subsumed by new upstream + version: 1.0.19~cvs20070421-1), + - debian/rules: Account for difference in udev rule filename, + - debian/sane-utils.README.Debian: Merge note regarding USB + scanners. + + -- Daniel T Chen Fri, 18 May 2007 05:49:07 -0400 + +sane-backends (1.0.19~cvs20070505-2) unstable; urgency=low + + * debian/patches/01_disable_epson2.dpatch: + + Added; disable epson2 backend by default (closes: #422697). + + -- Julien BLACHE Sat, 12 May 2007 10:37:11 +0200 + +sane-backends (1.0.19~cvs20070505-1) unstable; urgency=low + + * New CVS snapshot. + + New backend: hp5590. + * debian/patches/31_epson_remove_check.dpatch: + + Removed; merged upstream. + + -- Julien BLACHE Sat, 05 May 2007 20:37:07 +0200 + +sane-backends (1.0.19~cvs20070421-1) unstable; urgency=low + + * debian/control: + + Update Build-Depends for the TeXLive migration. + + Removed old Conflicts. + + Upgrade libsane-extras minimum version to 1.0.18.6. + * debian/rules: + + Drop hotplug support. + + Drop code for Sarge backports. + * debian/libsane.postinst: + + Remove old hotplug-ng files, code taken from Ubuntu. + * debian/libsane.README.Debian, debian/sane-utils.README.Debian: + + Removed hotplug notes. + * debian/patches/03_usb_perms_664.dpatch: + + Removed; merged upstream. + * debian/patches/11_hotplug_wait_for_device.dpatch: + + Removed; not needed anymore. + * debian/patches/30_udev_long_comment_lines.dpatch: + + Removed; merged upstream. + * debian/patches/32_microtek2_add_check.dpatch: + + Removed; merged upstream. + * debian/patches/33_manpages_fixes.dpatch: + + Removed; merged upstream. + + -- Julien BLACHE Sat, 21 Apr 2007 13:33:26 +0200 + +sane-backends (1.0.18-6) unstable; urgency=low + + * Enable libieee1284 support on kFreeBSD-amd64 (closes: #413178). + * debian/control: + + Build-depend on libieee1284-3-dev (>= 0.2.10-5) for all architectures. + + libsane-dev depends on libieee1284-3-dev (>= 0.2.10-5) for all architectures. + * debian/rules: + + Remove the libieee1284-3-dev substitution variable. + + -- Julien BLACHE Sat, 3 Mar 2007 11:39:33 +0100 + +sane-backends (1.0.18-5) unstable; urgency=medium + + * debian/patches/32_microtek2_add_check.dpatch: + + Added; Add missing return status check, preventing a segfault later + on (closes: #398153). + * debian/patches/33_manpages_fixes.dpatch: + + Added; fix man warnings in some manpages. + + -- Julien BLACHE Mon, 8 Jan 2007 19:52:22 +0100 + +sane-backends (1.0.18-4) unstable; urgency=medium + + * debian/patches/31_epson_remove_check.dpatch: + + Added; Remove bogus check in epson backend get_identity2_information() + affecting Stylus CX5xxx models (closes: #399119, #402444). + * debian/sane-utils.README.Debian: + + Fix typo, the manpage for saned is in section 8 not 1. + * debian/control: + + libsane-dbg is Priority: extra. + + Remove Uploaders. + + Thank you Aurélien JARNO for your help during these years. + + -- Julien BLACHE Sat, 6 Jan 2007 18:46:43 +0100 + +sane-backends (1.0.18-3ubuntu1) edgy; urgency=low + + * Merge from Debian unstable. The remaining Ubuntu changes are: + - debian/{libsane,sane-utils}.README.Debian: Remove hotplug + references, + - debian/{libsane.dirs.linux,rules}: Ship udev rules only, + - debian/libsane.postinst: Clean up old hotplug directories + (not bailing where they're non-empty), + - debian/patches/30_udev_long_comment_lines.dpatch: Prefer + to debian/patches/25_udev_rules_line_length.dpatch, + (Closes Ubuntu: #56317, #59141, #59390, #59753). + + -- Daniel T Chen Tue, 05 Sep 2006 11:13:22 +0100 + +sane-backends (1.0.18-3) unstable; urgency=low + + * debian/patches/30_udev_long_comment_lines.dpatch: + + Added; split very long comment lines in the udev rules file + (closes: #376859). + * debian/libsane.README.Debian: + + Updated; udev no longer sets permissions on /proc/bus/usb/xxx/yyy, + /dev/bus/usb/xxx/yyy is used instead now. + + -- Julien BLACHE Sun, 30 Jul 2006 20:40:09 +0200 + +sane-backends (1.0.18-2ubuntu2) edgy; urgency=low + + * Fix udev rules file to not exceed udev's buffer length. + + -- Tollef Fog Heen Tue, 5 Sep 2006 10:28:48 +0200 + +sane-backends (1.0.18-2ubuntu1) edgy; urgency=low + + * Merge from debian unstable, remaining changes: + - ship udev rules only. + + -- Scott James Remnant Mon, 10 Jul 2006 16:48:42 +0100 + +sane-backends (1.0.18-2) unstable; urgency=low + + * debian/control: + + Build-Depends: libltdl3-dev, needed to link with libgphoto2-2. + + sane-utils Suggests: unpaper. + + -- Julien BLACHE Tue, 4 Jul 2006 09:09:04 +0200 + +sane-backends (1.0.18-1) unstable; urgency=low + + * New upstream release. + + New backends: dell1600n_net, hp3500, pixma, stv680 (closes: #360303). + + Canon LiDE 60 USBids added to the genesys description file (closes: #366871). + * debian/patches/01_usbids.dpatch: + + Removed; merged upstream. + * debian/patches/26_manpages_spelling_fixes.dpatch: + + Removed; merged upstream. + * debian/patches/25_glibc_sys_io_h.dpatch: + + Removed; merged upstream. + * debian/patches/03_usb_perms_664.dpatch: + + Updated; the convert-usermap.sh scripts are gone. + * debian/patches/04_udev_rules_fix.dpatch: + + Removed; merged upstream. + * debian/rules: + + Use sane-desc to generate the udev rules file and the hotplug data file. + + Improve manpage list generation for the libsane package. + * debian/control: + + Build-Depends: libtiff4-dev, for the dell1600n_net backend. + + -- Julien BLACHE Mon, 3 Jul 2006 20:30:17 +0200 + +sane-backends (1.0.17-4) unstable; urgency=low + + * debian/compat: + + Bumped DH_COMPAT to 5. + * debian/control: + + Bumped Standards-Version to 3.7.2 (no changes). + + Build-Depend on debhelper (>= 5.0.0) for DH_COMPAT=5. + + New libsane-dbg binary for debugging symbols (closes: #366767). + * debian/rules: + + Tell dh_strip to put debugging symbols into libsane-dbg. + + -- Julien BLACHE Fri, 26 May 2006 13:40:01 +0200 + +sane-backends (1.0.17-3) unstable; urgency=low + + * debian/control: + + Add ${libieee1284-3-dev} to libsane-dev Depends: (closes: #364294). + + -- Julien BLACHE Sat, 22 Apr 2006 19:58:12 +0200 + +sane-backends (1.0.17-2) unstable; urgency=low + + [ Aurélien JARNO ] + * debian/control: + + Build-depends: libcam-dev on kfreebsd-i386 and kfreebsd-amd64. + + Build-depends: !libieee1284-dev on kfreebsd-amd64. + + libsane-dev depends: libcam-dev on GNU/kFreeBSD. + * debian/patches/25_glibc_sys_io_h.dpatch: + + New; check for GNU libc instead of Linux kernel. + + [ Julien BLACHE ] + * debian/patches/02_udev_rules.dpatch: + + Removed; coldplugging now works OK, the hotplug script aren't needed + anymore (closes: #359800). + * debian/patches/03_usb_perms_664.dpatch: + + Updated. + * debian/patches/04_udev_rules_fix.dpatch: + + Added; fix udev rules file so that the rules only run for ACTION=add + on the usb subsystem (closes: #359797). + * debian/patches/01_usbids.dpatch: + + Added; add Epson Stylus CX7800 USB IDs (closes: #350436). + * debian/patches/26_manpages_spelling_fixes.dpatch: + + Added; various spelling fixes to the manpages (closes: #357568). + * debian/control: + + Removed Conflicts: on very old SANE versions. + + Recommends: module-init-tools (>= 3.2.2-1) (closes: #344541). + + Recommends: udev (>= 0.88-1) for a version of udev with working + coldplugging support. Let me know if the version can be lowered, + thanks. + * debian/rules: + + Add variable substitution for module-init-tools on Linux. + + Add version to the udev variable substitution. + + -- Julien BLACHE Thu, 13 Apr 2006 21:40:58 +0200 + +sane-backends (1.0.17-1ubuntu4) dapper; urgency=low + + * Add Canon LIDE 60 to hotplug.usermap (which gets turned into + libsane.rules) + + -- Scott James Remnant Thu, 6 Apr 2006 06:27:59 +0100 + +sane-backends (1.0.17-1ubuntu3) dapper; urgency=low + + * Avoid failing if old hotplug directories have already been removed. + + -- Colin Watson Thu, 5 Jan 2006 00:35:09 +0000 + +sane-backends (1.0.17-1ubuntu2) dapper; urgency=low + + * Use rmdir --parents --ignore-fail-on-non-empty to clean up old hotplug + directories, thereby suppressing annoying error messages. + + -- Colin Watson Wed, 4 Jan 2006 19:43:05 +0000 + +sane-backends (1.0.17-1ubuntu1) dapper; urgency=low + + [ Ongoing Merge Process ] + * Resynchronise with Debian. + + [ Scott James Remnant ] + * Remove /etc/hotplug/blacklist.d/libsane; including this will only + confuse people if documentation tells them to edit it, if it's not + present they might look elsewhere rather than giving up. + * Remove /etc/hotplug and /etc/hotplug.d files from the packages + for similar reasons. + * Rename /etc/modprobe.d/libsane to blacklist-scanner to match our naming + for these. + * Rename /etc/udev/rules.d/libsane.rules to 45-libsane.rules so it actually + happens in the right place. + * Drop debian/patches/02_udev_rules.patch, the hotplug script does nothing + by default. + + -- Scott James Remnant Wed, 4 Jan 2006 17:35:07 +0000 + +sane-backends (1.0.17-1) unstable; urgency=low + + Julien BLACHE: + * New upstream release. + + New backends: hp4200, lexmark, mustek_usb2. + + Now ignores EBUSY on set_configuration for real (closes: #332281). + + Fixed USB IDs for BearPaw 2448 TA Plus to use only lowercase letters (closes: #341046). + * debian/patches/01_hotplug_usbids.dpatch: + + Removed; merged upstream. + * debian/patches/02_tools_udev.dpatch: + + Removed; merged upstream. + * debian/patches/02_udev_rules.dpatch: + + Added; add a RUN rule to run the hotplug.d script (for coldplugging). + * debian/control: + + Build-Depends: xutils as makedepend is now used by the build system. + + Adjust conflicts/suggests for libsane-extras. + + Aurélien JARNO: + * debian/patches/03_usb_perms_664.dpatch: + + Added; lsusb needs read access to USB devices to work properly. + + -- Julien BLACHE Sun, 18 Dec 2005 17:09:47 +0100 + +sane-backends (1.0.16-5) unstable; urgency=low + + * debian/patches/02_tools_udev.dpatch: + + Run the hotplug.d script to ensure a working coldplug (closes: #334068). + * debian/patches/30_misc_fixes.dpatch: + + Fix a typo in sane-find-scanner(1) (closes: #310333). + * debian/patches/34_sanei_usb_ignore_set_config_ebusy.dpatch: + + Ignore EBUSY on set_configuration to better accomodate MFC devices (closes: #332281). + * debian/libsane.postrm: + + Remove /etc/udev/rules.d/025_libsane.rules on purge (closes: #333569). + + -- Julien BLACHE Thu, 27 Oct 2005 20:25:16 +0200 + +sane-backends (1.0.16-5ubuntu2) dapper; urgency=low + + * Do new-style udev with the rules directly in /etc/udev/rules.d and no + symlink mess. + + -- Tollef Fog Heen Tue, 20 Dec 2005 12:56:02 +0100 + +sane-backends (1.0.16-5ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + + -- Tollef Fog Heen Mon, 28 Nov 2005 10:56:43 +0100 + +sane-backends (1.0.16-5) unstable; urgency=low + + * debian/patches/02_tools_udev.dpatch: + + Run the hotplug.d script to ensure a working coldplug (closes: #334068). + * debian/patches/30_misc_fixes.dpatch: + + Fix a typo in sane-find-scanner(1) (closes: #310333). + * debian/patches/34_sanei_usb_ignore_set_config_ebusy.dpatch: + + Ignore EBUSY on set_configuration to better accomodate MFC devices (closes: #332281). + * debian/libsane.postrm: + + Remove /etc/udev/rules.d/025_libsane.rules on purge (closes: #333569). + + -- Julien BLACHE Thu, 27 Oct 2005 20:25:16 +0200 + +sane-backends (1.0.16-4) unstable; urgency=low + + * debian/patches/02_tools_udev.dpatch: + + Fix broken tools/udev/convert-usermap.sh script. + + -- Julien BLACHE Wed, 28 Sep 2005 22:59:41 +0200 + +sane-backends (1.0.16-3) unstable; urgency=low + + * The udev release. Thanks to Marco d'Itri for his help. + * debian/patches/02_tools_udev.dpatch: + + Added; adds tools/udev from CVS. + * debian/rules: + + Generate the udev rules file for libsane and install it. + + Generate a modprobe blacklist (same as the hotplug blacklist). + * debian/libsane.postinst: + + Symlink the udev rules file under /etc/udev/rules.d; do that only once. + * debian/control: + + Recommends: hotplug | udev + + -- Julien BLACHE Wed, 28 Sep 2005 22:42:38 +0200 + +sane-backends (1.0.16-2) unstable; urgency=low + + * debian/patches/11_hotplug_wait_for_device.dpatch: + + Bump timeout to 25 seconds. + * debian/patches/01_hotplug_usbids.dpatch: + + Added; pulled from CVS (closes: #323607). + * debian/patches/32_plustek_update.dpatch: + + Supersedes 32_add_lide25.dpatch; plustek backend update, adds LiDE 25 + support and fixes LiDE 20 support. + * debian/patches/33_sm3600_update.dpatch: + + Added; pulled from CVS, sm3600 adapted to sanei_usb. + + -- Julien BLACHE Sun, 28 Aug 2005 18:33:18 +0200 + +sane-backends (1.0.16-1) unstable; urgency=low + + Julien BLACHE: + * New upstream release. + + New backends: sm3840, genesys. + + Fixed typos in manpages (closes: #310332, #310333). + * Patches removed (integrated upstream): + + 01_hotplug_usbids.dpatch + + 02_tools_hotplug-ng.dpatch + + 03_manpages_fixes.dpatch + + Most of 30_misc_fixes.dpatch + + 31_gt68xx_fixes.dpatch + + 32_snapscan_update.dpatch + + 33_avision_update.dpatch + + 34_plustek_update.dpatch + + 35_libusbscanner_2.6_fixes.dpatch + + 36_sane-find-scanner_message.dpatch + + 37_epson_usbids.dpatch + * debian/libsane.postinst: + + Removed the udev check, it's broken and MAKEDEV now does the Right + Thing (tm) on its own (closes: #310216). + + Remove anything debconf-related. + * debian/control: + + Bumped Standards-Version to 3.6.2 (no changes). + + Update the conflict on libsane-extras. + + Downgrade Depends: sane-utils to Recommends: sane-utils now that Sarge + has been released. + + Drop dependency on debconf. + * debian/rules: + + Generate sane-backends.pot, patch from Martin Pitt (closes: #313527). + + Comment call to dh_installdebconf, we don't use debconf anymore. + + Aurélien JARNO: + * DEB_HOST_GNU_SYSTEM replaced by DEB_HOST_ARCH_OS. + * Get rid of debian/control.in by using the -V option of dpkg-gencontrol. + + -- Julien BLACHE Sun, 7 Aug 2005 15:00:05 +0200 + +sane-backends (1.0.15-10) unstable; urgency=low + + * debian/patches/01_hotplug_usbids.dpatch: + + Updated; added Genius ColorPage Vivid3XE (closes: #305993). + + Added Microtek ScanMaker 3700 (closes: #307952). + + Added Epson Stylus RX620 (closes: #308867). + * debian/patches/11_hotplug_wait_for_device.dpatch: + + Added; try to wait for the device to appear in the FS (closes: #302891). + * debian/patches/30_misc_fixes.dpatch: + + Updated; fixed "device model referenced not duplicated" in the v4l + backend (closes: #306458). + * debian/control.in: + + Build-Depend on a fixed libusb. + + -- Julien BLACHE Sun, 22 May 2005 11:09:19 +0200 + +sane-backends (1.0.15-9ubuntu6) breezy; urgency=low + + * Switch back to /etc/hotplug/usb/ script since the handling of + /etc/hotplug.d/usb is broken: + - Deactivate 02_tools_hotplug-ng.dpatch + - debian/rules: Install files from tools/hotplug/ again. + - debian/libsane.postinst: Delete the transitional removal of hotplug + scripts, remove the hotplug-ng script instead. + - Ubuntu #16232 + + -- Martin Pitt Tue, 27 Sep 2005 15:17:36 +0200 + +sane-backends (1.0.15-9ubuntu5) breezy; urgency=low + + * debian/rules: Adapt to new dpkg. Check DEB_HOST_GNU_SYSTEM for + "linux-gnu", not "linux". This brings back the hotplug map and makes the + package actually work again. + + -- Martin Pitt Mon, 25 Jul 2005 19:53:06 +0000 + +sane-backends (1.0.15-9ubuntu4) breezy; urgency=low + + * debian/patches/39_more_hotplug_usbids.dpatch: + - Added to 00list to be actually applied. + - Added HP ScanJet 7400c (Ubuntu #11326) + + -- Martin Pitt Wed, 15 Jun 2005 15:51:00 +0200 + +sane-backends (1.0.15-9ubuntu3) breezy; urgency=low + + * debian/rules: Automatically create a POT file. + + -- Martin Pitt Fri, 10 Jun 2005 12:40:34 +0000 + +sane-backends (1.0.15-9ubuntu2) breezy; urgency=low + + * Remove 34_sysfs_libusbscanner.dpatch (changes integrated into another + patch upstream) + + -- Matt Zimmerman Fri, 6 May 2005 19:11:22 -0700 + +sane-backends (1.0.15-9ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + - Move additional usbids into a separate patch, rather than patching + the existing patch + + -- Matt Zimmerman Fri, 6 May 2005 14:05:21 -0700 + +sane-backends (1.0.15-9) unstable; urgency=low + + * debian/patches/22_dll_backend_conf.dpatch: + + Process /etc/sane.d/dll.d first, so that those backends will be loaded + last. This will prevent buggy extras backends to perturb other backends. + * debian/patches/03_manpages_fixes.dpatch: + + Fix a typo in sane(7), reported by A Costa (closes: #302675). + + Fix 3 typos in scanimage(1), also reported by A Costa (closes: #302334). + + -- Julien BLACHE Wed, 20 Apr 2005 16:17:20 +0200 + +sane-backends (1.0.15-8) unstable; urgency=low + + Aurélien Jarno: + * Drop support for the scanner kernel module. Switch to libusb NOW. + + Drop the devfs config file, remove /etc/devfs/conf.d/devfs + in libsane.postinst. + * Transition to the new hotplug hook scheme (pulled from CVS), which is + compatible with both hotplug and hotplug-ng. + + Remove /etc/hotplug/usb/libsane.usermap and /etc/hotplug/usb/libusbscanner + in libsane.postinst. + + Conflicts with libsane-extras (<< 1.0.15.7) to avoid partial upgrades, as + 1.0.15.7 is the version compatible with the new hotplug script. + + Julien Blache: + * Added support for GNU/kFreeBSD (closes: #297979). + + debian/rules: generate control at clean time. + + debian/rules: install README.{linux,freebsd} depending on the system. + + debian/patches/23_unneeded_doc.dpatch: do not install OS-specific READMEs. + + debian/control.in: do not depend on makedev on !linux (via debian/rules). + + debian/libsane.postinst: do not create device nodes on !linux. + * debian/rules: + + Install only the manpages for the backends which have been built. + + Cut the head of libsane.usermap to remove the comments pertaining to the + old usermap format. + * debian/libsane.README.Debian: + + Updated to relfect the hotplug changes. + * debian/libsane.postinst: + + Do not create device nodes when udev is in use. + + -- Julien BLACHE Sun, 6 Mar 2005 00:36:43 +0100 + +sane-backends (1.0.15-7) unstable; urgency=low + + Julien BLACHE: + * debian/patches/22_dll.conf_debian.dpatch + + Removed; renamed to 22_dll_backend_conf.dpatch. + * debian/patches/22_dll_backend_conf.dpatch + + Added; adds a Debian-specific comment to the dll.conf file, and patches + the dll backend to look for pieces of dll.conf in the /etc/sane.d/dll.d + directory; this is a facility for packages providing external backends, + like libsane-extras, hpoj and hplip. + + Aurélien Jarno: + * debian/patches/01_hotplug_usbids.dpatch + + Added Epson Corp. Stylus CX6600 to libsane.usermap (closes: #293082). + + -- Julien BLACHE Mon, 21 Feb 2005 16:43:41 +0100 + +sane-backends (1.0.15-6) unstable; urgency=low + + * debian/control + + Recommends: hotplug (was Suggests: hotplug). + + Suggests: hpoj, hplip. + * debian/rules + + Blacklist the scanner module wrt hotplug. + * debian/libsane.README.Debian + + Explain that the scanner module is going away, and that we're now + blacklisting it wrt hotplug upon installation of the package. + + * debian/patches/01_hotplug_usbids.dpatch + + Updated; added Epson Stylus RX-425. + * debian/patches/37_epson_usbids.dpatch + + Added; adds Epson Stylus RX-425. + * debian/patches/30_misc_fixes.dpatch + + Updated; added initialization of dev->scanning in coolscan.c. + * debian/patches/02_manpages_fixes.dpatch + + Added; manpages fixes from esr. + * debian/patches/32_snapscan_deinterlacer.dpatch + + Removed; renamed to 32_snapscan_update.dpatch. + * debian/patches/32_snapscan_update.dpatch + + Added; contains all of the previous 32_snapscan_deinterlacer.dpatch, + plus it adds support for the Epson Perfection 1270, BenQ 5250C and + quality calibration for the Epson Perfection 2480. + * debian/patches/22_dll.conf_debian.dpatch + + Updated; added the sm3840 backend provided by libsane-extras and the + hpaio backend provided by hplip (closes: #291435). + * debian/patches/38_artec_e+48_conf.dpatch + + Added; adds proper configuration for the Umax AstraSlim SE. + + -- Julien BLACHE Sat, 22 Jan 2005 13:54:58 +0100 + +sane-backends (1.0.15-5) unstable; urgency=medium + + * debian/patches/34_plustek_update.dpatch: + + Added; pulled from CVS, contains fixes for Epson Perfection 1260 + scanners (closes: #290029). + * debian/patches/35_libusbscanner_2.6_fixes.dpatch: + + Added; applied patch from Martin Pitt to use sysfs to determine the + device number, instead of guessing it in a semi-broken way + (closes: #289666). + * debian/patches/36_sane-find-scanner_message.dpatch + + Added; adds a "make sure your scanner is powered up and plugged in" + message to sane-find-scanner (closes: #287592). + + -- Julien BLACHE Wed, 12 Jan 2005 17:48:30 +0100 + +sane-backends (1.0.15-4ubuntu2) hoary; urgency=low + + * Updated 01_hotplug_usbids.dpatch: Add support for Epson Stylus CX6600 to + the USB usermap. (Ubuntu #6051) + + -- Martin Pitt Tue, 1 Feb 2005 09:58:21 +0100 + +sane-backends (1.0.15-4ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Scott James Remnant Wed, 22 Dec 2004 13:11:39 +0000 + +sane-backends (1.0.15-4) unstable; urgency=medium + + * debian/control: + + Added build-dependency on pkg-config (closes: #286140). + * debian/patches/13_new_configure.dpatch: + + Fixed; remove unwanted autom4te.cache directory from the patch + (closes: #286143). + + -- Julien BLACHE Sun, 19 Dec 2004 18:08:23 +0100 + +sane-backends (1.0.15-3) unstable; urgency=low + + * debian/patches/31_gt68xx_fixes.dpatch: + + Updated; added a fix for Mustek BearPaw 2448 TA/CS Plus scanners + (closes: #284674). + * debian/patches/33_avision_update.dpatch: + + Added; improved avision backend from CVS. + + -- Julien BLACHE Thu, 9 Dec 2004 16:01:50 +0100 + +sane-backends (1.0.15-2ubuntu1) hoary; urgency=low + + * debian/patches/33_sysfs_libusbscanner.dpatch: + + Added; use sysfs to look up device numbers instead of guesstimating them + (Ubuntu bug #1485) + + -- Martin Pitt Tue, 7 Dec 2004 11:45:14 +0100 + +sane-backends (1.0.15-2) unstable; urgency=low + + * debian/patches/01_hotplug_usbids.dpatch: + + Added; taken from CVS, adds missing USB IDs to the hotplug scripts + (closes: #280821, #281003). + * debian/patches/31_gt68xx_fixes.dpatch: + + Added; taken from CVS, fixes incorrect mode check for some scanners + (closes: #281061). + * debian/patches/30_misc_fixes.dpatch: + + Added; miscellaneous fixes from CVS/sane-devel. + * debian/patches/32_snapscan_deinterlacer.dpatch: + + Added; taken from CVS, adds a deinterlacer filter to the snapscan + backend, which is needed to scan at 2400 DPI with some scanners. + + -- Julien BLACHE Sun, 14 Nov 2004 15:39:36 +0100 + +sane-backends (1.0.15-1) unstable; urgency=low + + * New upstream release. + + Patch for Microtek Phantom C6 on PowerPC merged upstream + (closes: #274523). + + New backend: niash. + * debian/control: + + Update conflicts/replaces on libsane-extras 1.0.15.1. + * debian/patches/01_libusbscanner.dpatch: + + Removed; taken from CVS, included in this version. + * debian/patches/02_epson_usbids.dpatch: + + Removed; taken from CVS, included in this version. + * debian/patches/03_hotplug_usbids.dpatch: + + Removed; merged upstream. + * debian/patches/11_libtool_unneeded_checks.dpatch: + + Removed. + * debian/patches/12_gphoto2_link_backend_only.dpatch: + + Updated; revert unwanted backend/Makefile.in patch causing an incorrect + rpath in /usr/lib/libsane.la (closes: #279082). + * debian/patches/13_new_configure.dpatch: + + Updated. + * debian/patches/22_dll.conf_debian.dpatch: + + Updated; the niash backend is now part of SANE. + * debian/patches/25_saned_man_section.dpatch: + + Removed; merged upstream. + * debian/patches/26_scanimage_batch.dpatch: + + Removed; merged upstream. + * debian/patches/27_snapscan-usb_count_urb.dpatch: + + Removed; taken from CVS, included in this version. + * debian/sane-utils.README.Debian: + + Fix reference to /usr/share/doc/libsane/README.Debian.gz + (closes: #278670). + + -- Julien BLACHE Tue, 9 Nov 2004 23:28:23 +0100 + +sane-backends (1.0.14-7) unstable; urgency=medium + + * Co-maintainer upload. + * debian/patches/27_snapscan-usb_count_urb.dpatch: + + Added, backported from CVS: Don't enforce even number of URB packages + on snapscan 1212u_2 (closes: #250885). + * debian/patches/03_hotplug_usbids.dpatch: + + Added Epson Corp. Stylus CX6400 to libsane.usermap (closes: #293946). + + -- Aurelien Jarno Mon, 9 Aug 2004 11:17:13 +0200 + +sane-backends (1.0.14-6) unstable; urgency=medium + + * Urgency=medium as this revision will fix the upgrade path from Woody. + * debian/control: + + Removed obsolete gcc-3.3 build-depends (closes: #262245). + + Upgraded the sane-utils recommendation to a dependency as an upgrade + path from Woody (closes: #263408). + * debian/rules: + + Create /etc/hotplug/blacklist.d/libsane to prevent hotplug + from loading the no-longer-needed hpusbscsi module (closes: #260734). + * debian/patches/03_hotplug_usbids.dpatch: + + Added; adds HP ScanJet 5300C to libsane.usermap (closes: #260736). + * debian/patches/26_scanimage_batch.dpatch: + + Added; adds possibility to interrupt a batch scan in scanimage by + pressing ^D (closes: #260230). + + -- Julien BLACHE Wed, 4 Aug 2004 22:12:40 +0200 + +sane-backends (1.0.14-5) unstable; urgency=low + + * debian/patches/02_epson_usbids.dpatch + + Put back the USB IDs for the Perfection 1650, remove the USB IDs for the + Perfection 1250, which now really fixes the bug. + + -- Julien BLACHE Sun, 13 Jun 2004 13:48:27 +0200 + +sane-backends (1.0.14-4) unstable; urgency=low + + * debian/libsane.postinst + + modutils is Required, not Essential; replace kernelversion (provided by + modutils) by uname -r | cut (closes: #254140). + + -- Julien BLACHE Sun, 13 Jun 2004 12:12:02 +0200 + +sane-backends (1.0.14-3) unstable; urgency=low + + * debian/libsane.postinst + + Do not create /dev/usb/scanner* if running a 2.6 kernel. + * debian/patches/02_espon_usbids.dpatch + + Remove USB IDs for Perfection 1250 and 1260; these scanners are handled + by the plustek backend (pulled from CVS) (closes: #248859). + * debian/patches/25_saned_man_section.dpatch + + Added; saned goes to /usr/sbin, its manpage should go to section 8. + + -- Julien BLACHE Fri, 11 Jun 2004 21:37:18 +0200 + +sane-backends (1.0.14-2) unstable; urgency=low + + * debian/patches/22_dll.conf_debian.dpatch + + Enable the hpoj backend by default (closes: #246985, #248379). + * debian/patches/01_libusbscanner.dpatch + + Pulled from CVS, fixes hotplug's lack of backward compatibility + (closes: #248770). + + -- Julien BLACHE Thu, 20 May 2004 20:25:18 +0200 + +sane-backends (1.0.14-1) unstable; urgency=low + + * New upstream release. + + USB IDs for EPSON Stylus CX5400 added (closes: #243295). + + USB IDs for Nikon CoolScan 5000 added (closes: #243792). + * debian/hotplug/* + + removed, integrated upstream (tools/hotplug). + * debian/patches/01_mustek_pp_unified.dpatch + + removed, integrated in this release. + * debian/patches/02_hp_backend_usb_fix.dpatch + + removed, integrated in this release. + * debian/rules + + install the provided hotplug script and config file. + + -- Julien BLACHE Sat, 1 May 2004 16:26:47 +0200 + +sane-backends (1.0.13-4) unstable; urgency=low + + * debian/patches/02_hp_backend_usb_fix.dpatch + + added, pulled from CVS, fixes USB problems on kernel 2.6 (closes: #242188). + * Updated libsane.usermap from CVS (closes: #242090). + * Updated README.Debian, fixed a couple of typos. + + -- Julien BLACHE Sun, 11 Apr 2004 10:31:41 +0200 + +sane-backends (1.0.13-3) unstable; urgency=low + + * debian/libsane.config, debian/libsane.templates, debian/po: + + Removed, we don't use debconf anymore. + * debian/postinst: + + Fixed the /dev/usb/parport0 typo that should have read /dev/parport0. + Thanks to Tore Anderson for catching this one. + + Removed anything debconf-related, only purge whatever is left in the + debconf DB (closes: #224597). + + -- Julien BLACHE Sat, 20 Dec 2003 18:44:37 +0100 + +sane-backends (1.0.13-2) unstable; urgency=low + + * debian/patches: order of the patches changed (slightly). + + 01_mustek_pp_unified.dpatch: scan area fixes. + + -- Julien BLACHE Mon, 1 Dec 2003 19:19:19 +0100 + +sane-backends (1.0.13-1) unstable; urgency=low + + * New upstream release. + * debian/patches: + + 20_net.c_fixes.dpatch : removed, merged upstream. + + 21_gt68xx_uhci_fixes.dpatch : ditto. + + 04_hp5400_sanei_config2.dpatch : ditto. + + 03_new_configure : updated. + + 04_mustek_pp_unified: added; with this patch the mustek_pp backend + supports both CIS and CCD scanners (closes: #190998). + * debconf: + + Direct users to README.Debian.gz instead of README.Debian + (closes: #217347). + + Added Japanese translation (closes: #214040). + + Added Dutch translation (closes: #218905). + + Added German translation, thanks to Dirk Ritter and debian-l10n-german. + * debian/sane-utils.README.Debian: + + More details about the saned user and group, and the reason why the saned + user is not part of the scanner group by default (closes: #220024). + * debian/devfs/scanner: + + Added an example for SCSI devices, thanks to Dirk Ritter. + * debian/control: + + Standards-Version bumped to 3.6.1 (no changes). + * debian/rules, debian/compat: + + Switch to DH_COMPAT 4, and moved from dh_movefiles to dh_install. + * debian/control, debian/rules: + + Build-depend on chrpath and use it to remove rpath from the binaries. + + -- Julien BLACHE Mon, 24 Nov 2003 18:35:21 +0100 + +sane-backends (1.0.12-7) unstable; urgency=low + + * The "Maintainer's birthday" release. + * Simplified the needlessly complex debconf questions. Now use a multiselect + question instead of 3 independent questions. + + debian/libsane.templates: rewritten to use a multiselect type + + debian/libsane.config: ditto, try to convert from the older questions, + then purge them once done. + + debian/libsane.postinst: rewritten to parse the answer from the new + debconf thingy. + + debian/control: now Depends: debconf (>= 0.5.0) due to the use of db_fset + in debian/libsane.config. + * debian/libsane.postinst: use ':' as a separator for chown instead of '.'. + * debian/libsane.README.Debian: ditto. + * debian/control: only Suggests: hotplug (closes: #205291). + + -- Julien BLACHE Wed, 20 Aug 2003 14:03:14 +0200 + +sane-backends (1.0.12-6) unstable; urgency=low + + * Julien BLACHE + * debian/control + + Bumped Standards-Version to 3.6.0 (no changes). + + libsane depends on adduser (>= 3.47). + + libsane recommends hotplug. + * debian/libsane.templates: templates slightly rewritten to accomodate the + various debconf frontends (closes: #202744). + * debconf-related items: + + Switched debconf templates to debconf-po, thus build-depends on + debhelper (>= 4.1.16) (closes: #203669). + + Added french debconf translation based on translation from Michel + Grentzinger for sane-backends 1.0.12-5 + (closes: #203670). + * debian/libsane.postinst: + + Add a scanner system group, and chown root.scanner /dev/usb/scanner* if + we create them (closes: #201851). + * debian/libsane.README.Debian: + + Added a Setup paragraph, detailing permissions issues and solutions + implemented by this package. + * debian/sane-utils.README.Debian: + + Added, deals with permissions issues wrt the saned daemon. + * hotplug support: + + debian/hotplug/libusbscanner: added, hotplug script for scanners used + with libusb, courtesy of Max Kutny . Installed as + /etc/hotplug/usb/libusbscanner. + + debian/hotplug/libsane.usermap: example map file for use with hotplug. + Installed as /etc/hotplug/usb/libsane.usermap. + * Aurélien JARNO + * debian/devfs/scanner: + + Added, installed as /etc/devfs/conf.d/scanner. + + -- Julien BLACHE Wed, 6 Aug 2003 13:08:11 +0200 + +sane-backends (1.0.12-5) unstable; urgency=low + + * 21_gt68xx_uhci_fixes.dpatch : fix timeout with UHCI host controllers. + * debian/control: + + Added temporary Build-Dependency on gcc-3.3 (>= 3.3.1-0pre0), which should + fix the ICE on m68k. + * debian/rules: + + Should build with -O2 on m68k again. + + -- Julien BLACHE Wed, 2 Jul 2003 12:04:59 +0200 + +sane-backends (1.0.12-4) unstable; urgency=low + + * Julien BLACHE + * The "I fucking hate libtool" release. Prevent libtool from checking things + we do not need at all, such as a C++ or an F77 compiler. Sigh. + * Converted to dpatch. Build-depends on dpatch. + * Re-enable the gphoto2 backend, -but- do so that frontends do not get linked + against libgphoto2. Only the backend is linked against it. (closes: #195613) + * Thus, adds back the libgphoto2-2-dev build-dependency. + * Effectively move the html doc to the html subdir, instead of copying them + with dh_install. + * Aurélien JARNO + * Add autotools-stamp, so that configure won't be run twice. + * Do not link sanei_config2 in hp5400 : not needed (fixes an undefined + symbol, too). + + -- Julien BLACHE Tue, 3 Jun 2003 22:34:48 +0200 + +sane-backends (1.0.12-3) unstable; urgency=low + + * Fix the net backend so that it _does_ try all alternatives before giving + up connecting to the server (closes: #195396). + + -- Julien BLACHE Fri, 30 May 2003 19:22:54 +0200 + +sane-backends (1.0.12-2) unstable; urgency=low + + * Build with -O1 on m68k; -O2 triggers an ICE. + + -- Julien BLACHE Thu, 29 May 2003 11:36:41 +0200 + +sane-backends (1.0.12-1) unstable; urgency=low + + * New upstream release. + * Should now work on m68k. Yeah. (closes: #77356). + * sane(7) has been improved (closes: #188647). + * scanimage(1) has been fixed, wrt --batch. + * The hp5400 backend has been included, replaces libsane-extras (<< 1.0.12.1). + * IPv6 support. + * Standards-Version bumped to 3.5.10 (no changes). + * libsane-dev belongs to libdevel. + * Do not generate manpages and documentation we do not need. + + -- Julien BLACHE Sun, 25 May 2003 21:14:37 +0200 + +sane-backends (1.0.11-4) unstable; urgency=medium + + * Move saned.conf to the sane-utils package. Woops. (closes: #192742) + + -- Julien BLACHE Sat, 10 May 2003 08:41:23 +0200 + +sane-backends (1.0.11-3) unstable; urgency=medium + + * The "We want to enter testing" release. + * Do not build the gphoto2 backend. Gphoto2 is blocked by a bunch of other + packages (KDE, ...) and we're free of RC bugs. Enough. + * Moved libphoto2-2-dev to Build-Conflicts. + * Bumped shlibs. + + -- Julien BLACHE Sat, 3 May 2003 21:09:58 +0200 + +sane-backends (1.0.11-2) unstable; urgency=low + + * Ok, ok, do not tell how to configure libusb (closes: #180570). + * Do not print "Adding saned..." in sane-utils postinst when the user already + exists. + * Pulled fixed gphoto2 backend from CVS (closes: #180514). + + -- Julien BLACHE Thu, 13 Feb 2003 13:22:21 +0100 + +sane-backends (1.0.11-1) unstable; urgency=low + + * New upstream release. + * Security fixes to saned (closes: #180203). + * Added some debconf dialogs : + * /dev/parport* + * /dev/sg* + * note about /proc/bus/usb + + -- Julien BLACHE Sun, 9 Feb 2003 21:17:16 +0100 + +sane-backends (1.0.10-2) unstable; urgency=low + + * Fix postrm breakage (closes: #179586). + + -- Julien BLACHE Mon, 3 Feb 2003 12:39:14 +0100 + +sane-backends (1.0.10-1) unstable; urgency=low + + * New upstream release. + * Fixed sane-scsi manpage (closes: #174136). + * mustek_pp now has CIS support (closes: #152321). + * Added http://www.mostang.com/sane/sane-mfgs.html + as /usr/share/doc/libsane/supported.html (closes: #174131). + * New backends, previously included in libsane-extras : + * gt68xx + * artec_eplus48u (known as tevion9693usb) + * datadir is ${prefix}/share, not ${prefix}/share/sane. + * Remove /usr/lib/sane/libsane.so.1, as it's not libsane.so.1 (looks like + a libtool side-effect). + * Remove a couple more unwanted READMEs. + * Bumped Standards-Version to 3.5.8. + * Added a debconf dialog to create /dev/usb/* (closes: #177979). + * Added missing dependency on adduser to sane-utils. + + -- Julien BLACHE Sun, 2 Feb 2003 11:22:24 +0100 + +sane-backends (1.0.9-4) unstable; urgency=low + + * Pulled dll.c from CVS, fixes in-line comments (closes: #171521). + * Applied patch for Plustek backend rounding bug (closes: #172012). + + -- Julien BLACHE Mon, 9 Dec 2002 11:51:26 +0100 + +sane-backends (1.0.9-3) unstable; urgency=low + + * Rebuilt against new libgphoto2 package. + * Changed Uploaders: filed so that Aurélien's uploads won't be tagged as + NMU again. + * Do not generate debian/libsane.conffiles at build time, this is handled + by dh_installdeb automatically ; otherwise we end up with each conffile + being listed twice... + + -- Julien BLACHE Sun, 1 Dec 2002 11:29:43 +0100 + +sane-backends (1.0.9-2) unstable; urgency=low + + * Co-maintainer upload. + * Remove /etc/sane.d directory on purge (closes: bug#167603). + + -- Aurelien Jarno Mon, 4 Nov 2002 14:10:54 +0100 + +sane-backends (1.0.9-1) unstable; urgency=low + + * New upstream release. + * Video for Linux (v4l) backend cleanup (closes: #159634). + * Updated Avision backend (closes: #146054). + * Updated Epson backend (closes: #114017). + * Fixed char signedness in backend/plustek-usbshading.c (closes: #164464). + * Fixed debian/copyright (closes: #146057). + * Enabled translations. + * Do not install the upstream changelog twice. + * sane-utils does not create /home/saned. + * Fixed packages descriptions (wrt #165138). + + -- Julien BLACHE Thu, 24 Oct 2002 18:52:29 +0200 + +sane-backends (1.0.8-4) unstable; urgency=low + + * libsane-extras has its own source package now. + + -- Julien BLACHE Sun, 13 Oct 2002 10:49:54 +0200 + +sane-backends (1.0.8-3) unstable; urgency=low + + * New maintainers. + * New upstream release (closes: #162532, #149317). + * saned manpage mentions /usr/sbin/saned (closes: #141464). + * Symlinks for manpages are properly created (closes: #99551). + * Fixed hostnames handling in saned.conf (closes: #51171). + * HP backend update (closes: #116962). + * Backend loader respects LD_LIBRARY_PATH (closes: #143771). + * Path for Epson USB scanner corrected in conf file (closes: #154296, #154305). + * A test backend is included, safer than the pnm backend (closes: #139256). + * Umax backend fixed (closes: #158676). + * HP backend fixed, no longer segfaults (closes: 154827). + * Repackaged from scratch, using debhelper. + * Standards-Version bumped to 3.5.6. + * Do not include rpath informations in sane-config (closes: #143603). + * Fixed build problem wrt umask (closes: #95440). + * Updated libsane-dev Depends (closes: #142679). + * Fixed typos in umax_pp.conf (closes: #158742). + * Fixed hp.conf for some scanners (closes: #154828). + * Fixed README.Debian (closes: #146039). + * Fixed sane-plustek(5) manpage (closes: #159435). + * New package sane-utils, contains sane-find-scanner, scanimage and saned. + * sane-utils creates user and group saned (closes: #141465). + * New package libsane-extras, containing some extra backends + * hp4200 (v0.2p1) + * gt68xx (v1.0-23) + * niash (v20020217) (closes: #160327) + * tevion9693 (v0.0.9) + * Disabled translations until 1.0.9. + + -- Julien BLACHE Sat, 12 Oct 2002 10:28:09 +0200 + +sane-backends (1.0.8-2) unstable; urgency=low + + * Added build-depends on gettext(closes: #163681). + + -- Kevin Dalley Mon, 7 Oct 2002 09:32:21 -0700 + +sane-backends (1.0.8-1) unstable; urgency=low + + * New upstream release. Many n ew backends. Many more updated backends. + + -- Kevin Dalley Sun, 6 Oct 2002 18:09:28 -0700 + +sane-backends (1.0.7-3.2) unstable; urgency=high + + * Non-Maintainer Upload. + * Fix build on SPARC. + * Fix build on HPPA, although it's not RC (closes: Bug#138108). + + -- Julien BLACHE Sun, 7 Apr 2002 11:39:41 +0200 + +sane-backends (1.0.7-3.1) unstable; urgency=medium + + * Non-Maintainer Upload. + * Fixes compilation on Alpha, using the frontend/scanimage.c file from + the current CVS (close: Bug#138108). + * Applied patch submitted to #139509, regarding config.{sub,guess} issues + on MIPS (close: Bug#139509). + * Fixed lintian complaint wrt misplaced Conflicts: field in control file. + * Fixed lintian complaint about .comment section in /usr/lib/sane/*.so.*. + + -- Julien BLACHE Sun, 31 Mar 2002 20:24:48 +0200 + +sane-backends (1.0.7-3) unstable; urgency=low + + * link with libusb-0.1-4 (closes: #119393). + + -- Kevin Dalley Fri, 15 Mar 2002 18:31:08 +0000 + +sane-backends (1.0.7-2) unstable; urgency=low + + * stop link with libusb due to inconsistencies with versions of libusb + libraries. When libusb installation is cleaned up, then usb support + will be added again. Unfortunately, this re-opens bug #119393, though + with a lower severity. (closes: #138349). + + -- Kevin Dalley Thu, 14 Mar 2002 22:25:53 +0000 + +sane-backends (1.0.7-1) unstable; urgency=low + + * new upstream release of sane. + + * adds libusb, which includes ScanMaker 3600 drivers (closes: #119393). + * installs plustek-share.h so that plustek driver can be built (closes: + #72341) + + -- Kevin Dalley Thu, 14 Mar 2002 01:02:21 +0000 + +sane-backends (1.0.6-1) unstable; urgency=low + + * new upstream release of sane. + * new backends: gphoto2. + + -- Kevin Dalley Sun, 27 Jan 2002 23:30:19 -0800 + +sane-backends (1.0.5-3) unstable; urgency=low + + * rebuilt with new version of libgimp-1.2.2-2. + + -- Kevin Dalley Tue, 2 Oct 2001 22:31:15 -0700 + +sane-backends (1.0.5-2) unstable; urgency=low + + * removed incorrect build dependency on libc6-dev (closes: #108639). + + -- Kevin Dalley Thu, 16 Aug 2001 08:12:40 -0700 + +sane-backends (1.0.5-1) unstable; urgency=low + + * New backends: bh (Bell+Howell Copiscan II series), dc240 (Kodak DC240 + Digital Camera), sm3600 (Microtek ScanMaker 3600), umax_pp (Umax paralell + port scanners). + + * Fixed security bug in saned.c that allowed access to scanner without + password. + + -- Kevin Dalley Sat, 28 Jul 2001 12:38:46 -0700 + +sane-backends (1.0.4-2) unstable; urgency=low + + * increased timeout in sanei_scsi.c, which removes problem with 2.4 + kernel (closes: #84407). + + -- Kevin Dalley Thu, 31 May 2001 04:36:29 -0700 + +sane-backends (1.0.4-1) unstable; urgency=low + + * new upstream release of sane. + * as63driver added (closes: #69625). + + -- Kevin Dalley Sun, 28 Jan 2001 09:17:24 -0800 + +sane-gimp1.1 (1.0.3-4) unstable; urgency=low + + * link sane-gimp1.1 with libgimp1.1-1.1.29. + * change control files so that packages sane and sane-gimp1.1 are + explicitly described as working with gimp and gimp1.1 respectively. + The package sane now mentions the packages sane-gimp1.1 and vice + versa. + + -- Kevin Dalley Sun, 5 Nov 2000 13:56:49 -0800 + +sane (1.0.3-3) unstable; urgency=low + + * link sane-gimp1.1 with libgimp1.1-1.1.28, which is new library (closes: + #75029). + + * define GIMP_ENABLE_COMPAT_CRUFT to allow use of newer libgimp. + + -- Kevin Dalley Sun, 22 Oct 2000 21:52:29 -0700 + +sane (1.0.3-2) unstable; urgency=low + + * fix dependency in libsane-dev (closes: #71578). + * remove extraneous file which contains space in its name, which causes + patch and dpkg-source to fail. (closes: #71566, #71564, #71540). + + -- Kevin Dalley Fri, 22 Sep 2000 23:04:17 -0700 + +sane (1.0.3-1) unstable; urgency=low + + * new upstream release of sane + * new backends: mustek_pp, plustek, st400, v41 + * Many updated backends + * 16 bit support for scanimage. + + -- Kevin Dalley Sat, 2 Sep 2000 11:32:08 -0700 + +sane (1.0.2-1) unstable; urgency=low + + * new upstream release of sane + * Aliased and hidden backend support. + * Added Ricoh IS50 support. + * updated many backends. + * New Linux SCSI Generic driver. + * sane-gimp1.1 linked with libsane-1,1.22 (closes: #66544). + + -- Kevin Dalley Mon, 3 Jul 2000 23:38:42 -0700 + +sane (1.0.1-1999-10-21-12) frozen unstable; urgency=low + + * add libjpeg62-dev, tetex-bin, tetex-extra to Build-Depends (closes: + #61834, 61835). + + -- Kevin Dalley Wed, 5 Apr 2000 10:37:38 -0700 + +sane-gimp1.1 (1.0.1-1999-10-21-11) frozen unstable; urgency=low + + * Add Build-Depends to control files for sane and sane-gimp1.1 (closes: + #60923). + + -- Kevin Dalley Mon, 27 Mar 2000 03:16:55 -0800 + +sane (1.0.1-1999-10-21-10) frozen unstable; urgency=low + + * Improve description in control file (closes: #57032). + * link sane-gimp1.1 with libgimp1.1.17, which is the most recent + libgimp1.1 in frozen. + + -- Kevin Dalley Mon, 28 Feb 2000 02:37:20 +0000 + +sane (1.0.1-1999-10-21-9) frozen unstable; urgency=low + + * link sane-gimp1.1 with libgimp1.1.15, which is the most recent + libgimp1.1 in frozen. + + -- Kevin Dalley Sat, 22 Jan 2000 01:57:55 -0800 + +sane (1.0.1-1999-10-21-8) unstable; urgency=low + + * sane now conflicts with gimp1.1, which increases the chances of + getting the correct versions of gimp with each version of sane + (closes: #55070). Unfortunately, sane-gimp1.1 cannot conflict with + gimp, since gimp1.1 provides gimp. + + -- Kevin Dalley Sun, 16 Jan 2000 11:41:52 -0800 + +sane (1.0.1-1999-10-21-7) unstable; urgency=low + + * link with libgimp1.1.14 (closes: #53982) + * remove conflict of libsane-gimp1.1 with itself (closes: #49709). + * Each version of sane and sane-gimp1.1 now depend upon the same release + of libsane (closes: #50927). + * shlibs dependencies is updated to ">= 1.0.1-1999-10-21-7" to reduce + chances of problem #50927. + + -- Kevin Dalley Sun, 9 Jan 2000 13:22:57 -0800 + +sane (1.0.1-1999-10-21-6) unstable; urgency=low + + * add conflict between libsane and older version of sane, sane-gimp1.1 + due to moving documentation from sane to libsane (closes: #50735). + + -- Kevin Dalley Sat, 20 Nov 1999 15:15:30 -0400 + +sane (1.0.1-1999-10-21-5) unstable; urgency=low + + * added link for /usr/lib/libsane-dll.so, again. + + -- Kevin Dalley Fri, 19 Nov 1999 00:03:40 -0400 + +sane (1.0.1-1999-10-21-4) unstable; urgency=low + + * corrected problematic stripping of "libsane.la" (closes: #50099). + * move much of documentation from sane package to libsane and + libsane-dev package. + * move find-scanner to libsane + + -- Kevin Dalley Wed, 17 Nov 1999 23:08:44 -0400 + +sane (1.0.1-1999-10-21-3) unstable; urgency=low + + * added link for /usr/lib/libsane-dll.so + + -- Kevin Dalley Mon, 25 Oct 1999 01:24:30 -0700 + +sane (1.0.1-1999-10-21-2) unstable; urgency=low + + * corrected link of libsane.so.1 + + -- Kevin Dalley Sun, 24 Oct 1999 14:43:14 -0700 + +sane (1.0.1-1999-10-21-1) unstable; urgency=low + + * cvs server version from 1999-10-21 + * many bugs fixed in various backends + + -- Kevin Dalley Fri, 22 Oct 1999 22:06:52 -0700 + +sane (1.0.1-6) unstable; urgency=low + + * relink sane-gimp1.1 with libgimp1.1.10 + + -- Kevin Dalley Thu, 14 Oct 1999 23:33:18 -0700 + +sane (1.0.1-5) unstable; urgency=low + + * relink sane-gimp1.1 with libgimp1.1.9 + * separate sane-gimp1.1 from sane + + -- Kevin Dalley Sun, 10 Oct 1999 03:42:37 -0700 + +sane (1.0.1-4) unstable; urgency=low + + * added sane-gimp1.1 (used with gimp1.1) at the same time as sane for + gimp-1.0.x. + + -- Kevin Dalley Wed, 30 Jun 1999 00:54:57 -0700 + +sane (1.0.1-3) unstable; urgency=low + + * try to fix problems with shared libraries. Install libsane-dll.so in + /usr/lib so that programs linked with libsane will run. (Needed to + fix xsane bug #37756). + + -- Kevin Dalley Mon, 31 May 1999 22:15:16 -0700 + +sane (1.0.1-2) unstable; urgency=low + + * remove dependencies for libsane + + -- Kevin Dalley Fri, 30 Apr 1999 23:08:50 -0700 + +sane (1.0.1-1) unstable; urgency=low + + * version 1.0.1 + * new backend for Sharp scanner + * update backends for Kodak DC25, HP, Microtek, Micro, Mustek, Nikon + Coolscan, snapscan, UMAX. + * fixes problem with HP scanner (closes #32516) + * includes backend for dc210 (closes #31377) + + -- Kevin Dalley Tue, 27 Apr 1999 01:24:33 -0700 + +sane (1.00-2) unstable; urgency=low + + * removed examples directory. Moved examples/tools to tools directory. + + -- Kevin Dalley Mon, 5 Apr 1999 02:04:53 -0700 + +sane (1.00-1) unstable; urgency=low + + * 1.00 is released + * artec is back in dll.conf + * many more scanner supported and more changes + + -- Kevin Dalley Sat, 5 Dec 1998 01:00:30 -0800 + +sane (0.74-2) unstable; urgency=low + + * temporarily comment out artec in dll.conf, due to bad interaction with + Umax scanner. If artec is used as a scanner, uncomment artec from + dll.conf + * automatically generates conffiles, thanks for + Roman.Hodek@informatik.uni-erlangen.de (fixes bug #26545) + * fixes problem with creation of /usr/share/sane during build process + (bug #26314) + + -- Kevin Dalley Sun, 20 Sep 1998 18:00:28 -0700 + +sane (0.74-1) unstable; urgency=low + + * first release of 0.74 + + -- Kevin Dalley Sat, 22 Aug 1998 23:06:26 -0700 + +sane (0.72-1) frozen unstable; urgency=low + + * first official release which supports libgtk1-0.99.9 + + -- Kevin Dalley Fri, 10 Apr 1998 02:29:52 -0700 + +sane (0.71-2) frozen unstable; urgency=low + + * fixed spelling in control files (fixes bug# 19003) + * modified to match latest change in libgtk-0.99.5 + * change datadir to /usr/share/sane + * compatible with libgtk1-0.99.8 (fixes bug #19595) + + -- Kevin Dalley Sun, 22 Mar 1998 19:44:10 -0800 + +sane (0.71-1) unstable; urgency=low + + * new release, which adds support for the following scanners: + Polaroid Digital Microscope Camera (DMC) backend + Apple scanner backend + Nikon CoolScan backend + * removed execute permission in doc directory (fixes: bug #17949) + * modified manual page referring to symbolic link of xscanimage (fixes: + bug #18071) + + -- Kevin Dalley Fri, 27 Feb 1998 23:03:08 -0800 + +sane (0.70-1) unstable; urgency=low + + * update to version 0.70 of sane, adds AGFA SnapScan backend, updates + UMAX backend + + * add patches 2-5 to SnapScan backend which allows other scanners + to work + + -- Kevin Dalley Sat, 31 Jan 1998 17:32:53 -0800 + +sane (0.69-2) unstable; urgency=low + + * correct umax-scanner.h so that Astra 1200S is legal + + -- Kevin Dalley Sun, 25 Jan 1998 09:44:45 -0800 + +sane (0.69-1) unstable; urgency=low + + * update to version 0.69 of sane + + -- Kevin Dalley Fri, 23 Jan 1998 20:24:01 -0800 + +sane (0.68-4) unstable; urgency=low + + * modified gtkglue.c to correspond with changes to libgtk1 + + -- Kevin Dalley Tue, 6 Jan 1998 22:24:14 -0800 + +sane (0.68-3) unstable; urgency=low + + * change plug-in directory to 0.99 to match gimp changes, add explicit + gimp dependency. + * added README.debian + * install find-scanner + * install many documentation files + + -- Kevin Dalley Fri, 2 Jan 1998 21:51:52 -0800 + +sane (0.68-2) unstable; urgency=low + + * corrected control file + + -- Kevin Dalley Sun, 21 Dec 1997 18:26:23 -0800 + +sane (0.68-1) unstable; urgency=low + + * update to version 0.68 of sane + + -- Kevin Dalley Fri, 5 Dec 1997 00:42:27 -0800 + +sane (0.67-1) unstable; urgency=low + + * first Debian release of sane + + -- Kevin Dalley Tue, 18 Nov 1997 21:38:41 -0800 + + --- sane-backends-1.0.19.orig/debian/libsane.dirs.linux +++ sane-backends-1.0.19/debian/libsane.dirs.linux @@ -0,0 +1,2 @@ +etc/udev/rules.d +etc/modprobe.d --- sane-backends-1.0.19.orig/debian/sane-utils.install +++ sane-backends-1.0.19/debian/sane-utils.install @@ -0,0 +1,9 @@ +etc/sane.d/saned.conf +usr/sbin/saned +usr/bin/sane-find-scanner +usr/bin/scanimage +usr/bin/gamma4scanimage +usr/share/man/man8/saned.8 +usr/share/man/man1/scanimage.1 +usr/share/man/man1/sane-find-scanner.1 +usr/share/man/man1/gamma4scanimage.1 --- sane-backends-1.0.19.orig/debian/compat +++ sane-backends-1.0.19/debian/compat @@ -0,0 +1 @@ +5 --- sane-backends-1.0.19.orig/debian/sane-utils.postinst +++ sane-backends-1.0.19/debian/sane-utils.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +# create saned user/group if they do not exist +if [ "$1" = "configure" ] && ! getent passwd | grep -q "^saned:"; then + echo "Adding saned group and user..." + adduser --quiet --system --no-create-home --group saned || true +fi + + +#DEBHELPER# + --- sane-backends-1.0.19.orig/debian/libsane.preinst +++ sane-backends-1.0.19/debian/libsane.preinst @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +## Transition from the old-style udev setup to the old-style dh_installudev setup +## Then dh_installudev will take care of the transition to the new dh_installudev setup +if [ "$1" = install ] || [ "$1" = upgrade ]; then + if [ -e "/etc/udev/rules.d/025_libsane.rules" ]; then + mv /etc/udev/rules.d/025_libsane.rules /etc/udev/rules.d/z60_libsane.rules + fi +fi + +#DEBHELPER# --- sane-backends-1.0.19.orig/debian/sane-utils.README.Debian +++ sane-backends-1.0.19/debian/sane-utils.README.Debian @@ -0,0 +1,32 @@ +sane-utils (sane-backends) for Debian : +--------------------------------------- + +This package contains various utilities shipped with sane-backends, among +which saned, the network scanner daemon. + +This package added a saned user and a saned group to your system ; it is highly +recommended to run saned as user and group saned and NEVER EVER as root. + +To run saned as user and group saned, see man 8 saned. + + +To operate in this setup, saned must be able to access to your scanner ; +different setups are possible, depending on who should be able to access to the +scanner : + + * saned users only : + => device owned by saned:root or saned:saned + * saned users and local users : + => device owned by saned:scanner, with local users added to the scanner group + * local users only : + => device owned by root:scanner, local users added to the scanner group + +Note that by default the saned users is not part of the scanner group. + +If you intend to use saned with a USB scanner, note that the permissions for +USB scanners are handled by udev. + +See /usr/share/doc/libsane/README.Debian.gz for more information on setting up +appropriate permissions. + +-- Julien BLACHE , Tue, 17 Apr 2007 21:33:43 +0200 --- sane-backends-1.0.19.orig/debian/libsane.postinst +++ sane-backends-1.0.19/debian/libsane.postinst @@ -0,0 +1,74 @@ +#!/bin/sh -e + +purge_devfs() { + if [ -f "/etc/devfs/conf.d/scanner" ] ; then + rm -f /etc/devfs/conf.d/scanner + rmdir --parents --ignore-fail-on-non-empty /etc/devfs/ + fi +} + +purge_hotplug() { + if [ -f "/etc/hotplug/usb/libsane.usermap" ] ; then + rm -f /etc/hotplug/usb/libsane.usermap + fi + if [ -f "/etc/hotplug/usb/libusbscanner" ] ; then + rm -f /etc/hotplug/usb/libusbscanner + fi +} + +purge_hotplugng() { + if [ -f "/etc/hotplug.d/usb/libsane.hotplug" ]; then + rm -f /etc/hotplug.d/usb/libsane.hotplug + rmdir -p --ignore-fail-on-non-empty /etc/hotplug.d/usb + fi + + if [ -f "/etc/hotplug/blacklist.d/libsane" ]; then + rm -f /etc/hotplug/blacklist.d/libsane + rmdir -p --ignore-fail-on-non-empty /etc/hotplug/blacklist.d + fi + + if [ -f "/etc/sane.d/hotplug/libsane.db" ]; then + rm -f /etc/sane.d/hotplug/libsane.db + rmdir -p --ignore-fail-on-non-empty /etc/sane.d/hotplug + fi +} + +case "$1" in + configure) + + if [ "$(uname -s)" = "Linux" ]; then + # remove devfs config as scanning through usbscanner is not supported anymore + purge_devfs + # remove old hotplug scripts + purge_hotplug + # remove old hotplug-ng scripts + purge_hotplugng + # remove old udev rules + if dpkg --compare-versions "$2" lt-nl "1.0.19~cvs20071213-4ubuntu1"; then + rm -f /etc/udev/rules.d/45-libsane.rules + fi + + if [ -e /dev/MAKEDEV ]; then + # create /dev/parport* + if [ ! -c /dev/parport0 ]; then + (cd /dev && ./MAKEDEV parport) || true + fi + # create /dev/sg* + if [ ! -c /dev/sg0 ]; then + (cd /dev && ./MAKEDEV sg) || true + fi + fi + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "$0 called with unknown argument '$1'" >&2 + exit 1 + ;; +esac + + +#DEBHELPER# --- sane-backends-1.0.19.orig/debian/patches/22_dll_backend_conf.dpatch +++ sane-backends-1.0.19/debian/patches/22_dll_backend_conf.dpatch @@ -0,0 +1,239 @@ +#!/bin/sh -e +## 03_dll.conf_debian.dpatch by Julien BLACHE +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: dll.conf comments for Debian +## DP: Patch to the dll backend to look for pieces of dll.conf inside the +## DP: /etc/sane.d/dll.d/ directory. This is a facility for packages providing +## DP: external backends (like libsane-extras, hpoj and hplip). + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad sane-backends-1.0.19~cvs20071213~/backend/dll.c sane-backends-1.0.19~cvs20071213/backend/dll.c +--- sane-backends-1.0.19~cvs20071213~/backend/dll.c 2007-11-23 11:12:01.000000000 +0100 ++++ sane-backends-1.0.19~cvs20071213/backend/dll.c 2007-12-13 21:30:31.468481793 +0100 +@@ -95,6 +95,8 @@ + #endif + + #include ++#include ++#include + + #include "sane/sane.h" + #include "sane/sanei.h" +@@ -720,12 +722,113 @@ + } + + ++static void ++read_config (const char *conffile) ++{ ++ FILE *fp; ++ char config_line[PATH_MAX]; ++ char *backend_name; ++ ++ fp = sanei_config_open (conffile); ++ if (!fp) ++ { ++ DBG (1, "sane_init/read_config: Couldn't open config file (%s): %s\n", ++ conffile, strerror (errno)); ++ return; /* don't insist on config file */ ++ } ++ ++ DBG (5, "sane_init/read_config: reading %s\n", conffile); ++ while (sanei_config_read (config_line, sizeof (config_line), fp)) ++ { ++ char *comment; ++ SANE_String_Const cp; ++ ++ cp = sanei_config_get_string (config_line, &backend_name); ++ /* ignore empty lines */ ++ if (!backend_name || cp == config_line) ++ { ++ if (backend_name) ++ free (backend_name); ++ continue; ++ } ++ /* ignore line comments */ ++ if (backend_name[0] == '#') ++ { ++ free (backend_name); ++ continue; ++ } ++ /* ignore comments after backend names */ ++ comment = strchr (backend_name, '#'); ++ if (comment) ++ *comment = '\0'; ++ add_backend (backend_name, 0); ++ free (backend_name); ++ } ++ fclose (fp); ++} ++ ++static void ++read_dlld (void) ++{ ++ DIR *dlld; ++ struct dirent *dllconf; ++ struct stat st; ++ char conffile[PATH_MAX]; ++ size_t len, plen; ++ ++ DBG (5, "sane_init/read_dlld: processing %s ...\n", ++ STRINGIFY(PATH_SANE_CONFIG_DIR) "/dll.d"); ++ ++ /* Debian specific: read files under $sysconfdir/sane.d/dll.d */ ++ dlld = opendir (STRINGIFY(PATH_SANE_CONFIG_DIR) "/dll.d"); ++ ++ if (dlld == NULL) ++ { ++ DBG (1, "sane_init/read_dlld: opendir failed: %s\n", ++ strerror (errno)); ++ return; ++ } ++ ++ plen = strlen (STRINGIFY(PATH_SANE_CONFIG_DIR)) + 1; ++ ++ while ((dllconf = readdir (dlld)) != NULL) ++ { ++ /* dotfile (or directory) */ ++ if (dllconf->d_name[0] == '.') ++ continue; ++ ++ len = strlen (dllconf->d_name); ++ ++ /* backup files */ ++ if ((dllconf->d_name[len-1] == '~') ++ || (dllconf->d_name[len-1] == '#')) ++ continue; ++ ++ snprintf (conffile, PATH_MAX, "%s/dll.d/%s", ++ STRINGIFY (PATH_SANE_CONFIG_DIR), dllconf->d_name); ++ ++ DBG (5, "sane_init/read_dlld: considering %s\n", conffile); ++ ++ if (lstat (conffile, &st) != 0) ++ continue; ++ ++ if (!S_ISREG (st.st_mode)) ++ continue; ++ ++ /* expects a path relative to PATH_SANE_CONFIG_DIR */ ++ read_config (conffile+plen); ++ } ++ ++ closedir (dlld); ++ ++ DBG (5, "sane_init/read_dlld: done.\n"); ++} ++ + SANE_Status + sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize) + { + #ifndef __BEOS__ + char config_line[PATH_MAX]; +- char *backend_name; + size_t len; + FILE *fp; + int i; +@@ -762,42 +865,12 @@ + *version_code = SANE_VERSION_CODE (SANE_DLL_V_MAJOR, SANE_DLL_V_MINOR, + SANE_DLL_V_BUILD); + +- fp = sanei_config_open (DLL_CONFIG_FILE); +- if (!fp) +- { +- DBG (1, "sane_init: Couldn't open config file (%s): %s\n", +- DLL_CONFIG_FILE, strerror (errno)); +- return SANE_STATUS_GOOD; /* don't insist on config file */ +- } +- +- DBG (5, "sane_init: reading %s\n", DLL_CONFIG_FILE); +- while (sanei_config_read (config_line, sizeof (config_line), fp)) +- { +- char *comment; +- SANE_String_Const cp; +- +- cp = sanei_config_get_string (config_line, &backend_name); +- /* ignore empty lines */ +- if (!backend_name || cp == config_line) +- { +- if (backend_name) +- free (backend_name); +- continue; +- } +- /* ignore line comments */ +- if (backend_name[0] == '#') +- { +- free (backend_name); +- continue; +- } +- /* ignore comments after backend names */ +- comment = strchr (backend_name, '#'); +- if (comment) +- *comment = '\0'; +- add_backend (backend_name, 0); +- free (backend_name); +- } +- fclose (fp); ++ /* ++ * Read dll.conf & dll.d ++ * Read dll.d first, so that the extras backends will be tried last ++ */ ++ read_dlld (); ++ read_config (DLL_CONFIG_FILE); + + fp = sanei_config_open (DLL_ALIASES_FILE); + if (!fp) +diff -urNad sane-backends-1.0.19~cvs20071213~/backend/dll.conf.in sane-backends-1.0.19~cvs20071213/backend/dll.conf.in +--- sane-backends-1.0.19~cvs20071213~/backend/dll.conf.in 2007-12-13 21:30:29.941481743 +0100 ++++ sane-backends-1.0.19~cvs20071213/backend/dll.conf.in 2007-12-13 21:30:31.468481793 +0100 +@@ -1,3 +1,10 @@ ++# /etc/sane.d/dll.conf - Configuration file for the SANE dynamic backend loader ++# ++# On Debian systems, the dll backend will also look for pieces of configuration ++# in the /etc/sane.d/dll.d directory -- packages providing backends should drop ++# a config file similar to dll.conf in this directory. ++# ++ + # enable the next line if you want to allow access through the network: + net + abaton +@@ -46,7 +53,6 @@ + nec + niash + pie +-pint + pixma + plustek + #plustek_pp +@@ -72,11 +78,4 @@ + #umax_pp + umax1220u + v4l +-# +-# The following backends are not included in the sane-backends distribution +-# If you want to use them, download them from their webpages and read their +-# documentation +-# +-# HP OfficeJet backend homepage: http://hpoj.sf.net/ +-# Uncomment the following line if hpoj is installed: +-#hpoj ++ --- sane-backends-1.0.19.orig/debian/patches/12_new_configure.dpatch +++ sane-backends-1.0.19/debian/patches/12_new_configure.dpatch @@ -0,0 +1,743 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 12_new_configure.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: New configure script, includes changes made to configure.in by previous patches. + +@DPATCH@ +diff -urNad sane-backends-1.0.19~/configure sane-backends-1.0.19/configure +--- sane-backends-1.0.19~/configure 2008-02-11 00:02:31.000000000 +0100 ++++ sane-backends-1.0.19/configure 2008-02-12 21:30:12.625390160 +0100 +@@ -849,12 +849,20 @@ + DL_LIB + DYNAMIC_FLAG + USE_LINKS +-INSTALL_LOCKPATH +-LOCKPATH_GROUP ++LIBM ++LIBCAM ++LIBJPEG ++LIBTIFF ++LIBIEEE1284 ++LIBPTHREAD + HAVE_GPHOTO2 + GPHOTO2_LDFLAGS ++LIBGPHOTO2 ++INSTALL_LOCKPATH ++LOCKPATH_GROUP + ALLOCA + LIBOBJS ++LIBUSB + LN_S + ECHO + AR +@@ -1509,8 +1517,8 @@ + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-docdir=DIR documentation [PREFIX/doc/sane-VERSION] +- --with-group use the specified group for lock dir [default=uucp] + --with-gphoto2 include the gphoto2 backend [default=yes] ++ --with-group use the specified group for lock dir [default=uucp] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-pic try to use only PIC/non-PIC objects [default=use + both] +@@ -6396,7 +6404,6 @@ + esac + + +- + { echo "$as_me:$LINENO: checking for sqrt in -lm" >&5 + echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6; } + if test "${ac_cv_lib_m_sqrt+set}" = set; then +@@ -6459,22 +6466,20 @@ + { echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5 + echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6; } + if test $ac_cv_lib_m_sqrt = yes; then +- cat >>confdefs.h <<_ACEOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_LIBM 1 + _ACEOF +- +- LIBS="-lm $LIBS" +- ++ LIBM="-lm" + fi + + +-{ echo "$as_me:$LINENO: checking for scsireq_enter in -lscsi" >&5 +-echo $ECHO_N "checking for scsireq_enter in -lscsi... $ECHO_C" >&6; } +-if test "${ac_cv_lib_scsi_scsireq_enter+set}" = set; then ++{ echo "$as_me:$LINENO: checking for cam_open_device in -lcam" >&5 ++echo $ECHO_N "checking for cam_open_device in -lcam... $ECHO_C" >&6; } ++if test "${ac_cv_lib_cam_cam_open_device+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lscsi $LIBS" ++LIBS="-lcam $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -6488,11 +6493,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char scsireq_enter (); ++char cam_open_device (); + int + main () + { +-return scsireq_enter (); ++return cam_open_device (); + ; + return 0; + } +@@ -6515,37 +6520,37 @@ + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then +- ac_cv_lib_scsi_scsireq_enter=yes ++ ac_cv_lib_cam_cam_open_device=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_scsi_scsireq_enter=no ++ ac_cv_lib_cam_cam_open_device=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_scsi_scsireq_enter" >&5 +-echo "${ECHO_T}$ac_cv_lib_scsi_scsireq_enter" >&6; } +-if test $ac_cv_lib_scsi_scsireq_enter = yes; then +- cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBSCSI 1 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_cam_cam_open_device" >&5 ++echo "${ECHO_T}$ac_cv_lib_cam_cam_open_device" >&6; } ++if test $ac_cv_lib_cam_cam_open_device = yes; then ++ cat >>confdefs.h <<\_ACEOF ++#define HAVE_LIBCAM 1 + _ACEOF ++ LIBCAM="-lcam" ++fi ++ # FreeBSD 3+ needs this + +- LIBS="-lscsi $LIBS" + +-fi +- # FreeBSD needs this + +-{ echo "$as_me:$LINENO: checking for cam_open_device in -lcam" >&5 +-echo $ECHO_N "checking for cam_open_device in -lcam... $ECHO_C" >&6; } +-if test "${ac_cv_lib_cam_cam_open_device+set}" = set; then ++{ echo "$as_me:$LINENO: checking for scsireq_enter in -lscsi" >&5 ++echo $ECHO_N "checking for scsireq_enter in -lscsi... $ECHO_C" >&6; } ++if test "${ac_cv_lib_scsi_scsireq_enter+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lcam $LIBS" ++LIBS="-lscsi $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -6559,11 +6564,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char cam_open_device (); ++char scsireq_enter (); + int + main () + { +-return cam_open_device (); ++return scsireq_enter (); + ; + return 0; + } +@@ -6586,29 +6591,30 @@ + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then +- ac_cv_lib_cam_cam_open_device=yes ++ ac_cv_lib_scsi_scsireq_enter=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_cam_cam_open_device=no ++ ac_cv_lib_scsi_scsireq_enter=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_cam_cam_open_device" >&5 +-echo "${ECHO_T}$ac_cv_lib_cam_cam_open_device" >&6; } +-if test $ac_cv_lib_cam_cam_open_device = yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_scsi_scsireq_enter" >&5 ++echo "${ECHO_T}$ac_cv_lib_scsi_scsireq_enter" >&6; } ++if test $ac_cv_lib_scsi_scsireq_enter = yes; then + cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBCAM 1 ++#define HAVE_LIBSCSI 1 + _ACEOF + +- LIBS="-lcam $LIBS" ++ LIBS="-lscsi $LIBS" + + fi +- # FreeBSD 3+ needs this ++ # FreeBSD needs this ++ + if test "`uname`" != "IRIX" -a "`uname`" != "IRIX64"; then + { echo "$as_me:$LINENO: checking for library containing gethostbyaddr" >&5 + echo $ECHO_N "checking for library containing gethostbyaddr... $ECHO_C" >&6; } +@@ -6861,6 +6867,7 @@ + # OS/2 needs -lsyslog, BeOS needs -lbe + fi + ++ + { echo "$as_me:$LINENO: checking for jpeg_start_decompress in -ljpeg" >&5 + echo $ECHO_N "checking for jpeg_start_decompress in -ljpeg... $ECHO_C" >&6; } + if test "${ac_cv_lib_jpeg_jpeg_start_decompress+set}" = set; then +@@ -7073,7 +7080,7 @@ + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "sane_correct_jpeg_lib_version_found" >/dev/null 2>&1; then +- sane_cv_use_libjpeg="yes"; LIBS="${LIBS} -ljpeg"; ++ sane_cv_use_libjpeg="yes"; LIBJPEG="-ljpeg"; + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + else +@@ -7091,6 +7098,8 @@ + + + ++ ++ + { echo "$as_me:$LINENO: checking for TIFFFdOpen in -ltiff" >&5 + echo $ECHO_N "checking for TIFFFdOpen in -ltiff... $ECHO_C" >&6; } + if test "${ac_cv_lib_tiff_TIFFFdOpen+set}" = set; then +@@ -7285,7 +7294,7 @@ + + fi + if test $ac_cv_header_tiffio_h = yes; then +- sane_cv_use_libtiff="yes"; LIBS="${LIBS} -ltiff" ++ sane_cv_use_libtiff="yes"; LIBTIFF="-ltiff" + fi + + +@@ -7294,6 +7303,8 @@ + + + ++ ++ + if test "${ac_cv_header_ieee1284_h+set}" = set; then + { echo "$as_me:$LINENO: checking for ieee1284.h" >&5 + echo $ECHO_N "checking for ieee1284.h... $ECHO_C" >&6; } +@@ -7467,7 +7478,7 @@ + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- sane_cv_use_libieee1284="yes"; LIBS="${LIBS} -lieee1284" ++ sane_cv_use_libieee1284="yes"; LIBIEEE1284="-lieee1284" + + else + echo "$as_me: failed program was:" >&5 +@@ -7495,6 +7506,8 @@ + + + ++ ++ + case "${host_os}" in + darwin*) # currently only enabled on MacOS X + use_pthread=yes +@@ -7656,6 +7669,7 @@ + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + ++ SANE_save_LIBS="${LIBS}" + + { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 + echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } +@@ -7727,7 +7741,6 @@ + + fi + +- have_pthread=yes + + + +@@ -7823,12 +7836,16 @@ + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +- ++ cat >>confdefs.h <<\_ACEOF ++#define HAVE_PTHREAD 1 ++_ACEOF ++ have_pthread=yes; LIBPTHREAD=-lpthread + else + have_pthread=no; use_pthread=no + fi + done + ++ LIBS="${SANE_save_LIBS}" + + fi + +@@ -7855,68 +7872,6 @@ + echo "${ECHO_T}$use_pthread" >&6; } + + +- LOCKPATH_GROUP=uucp +- use_locking=yes +- case "${host_os}" in +- os2* ) +- use_locking=no +- ;; +- esac +- +- # +- # we check the user +- # Check whether --enable-locking was given. +-if test "${enable_locking+set}" = set; then +- enableval=$enable_locking; +- if test $enableval = yes ; then +- use_locking=yes +- else +- use_locking=no +- fi +- +-fi +- +- if test $use_locking = yes ; then +- +-# Check whether --with-group was given. +-if test "${with_group+set}" = set; then +- withval=$with_group; LOCKPATH_GROUP="$withval" +- +-fi +- +- # check if the group does exist +- lasterror="" +- touch sanetest.file +- chgrp $LOCKPATH_GROUP sanetest.file 2>/dev/null || lasterror=$? +- rm -f sanetest.file +- if test ! -z "$lasterror"; then +- { echo "$as_me:$LINENO: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&5 +-echo "$as_me: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&2;} +- { echo "$as_me:$LINENO: WARNING: Locking feature will be disabled." >&5 +-echo "$as_me: WARNING: Locking feature will be disabled." >&2;} +- use_locking=no +- fi +- fi +- if test $use_locking = yes ; then +- INSTALL_LOCKPATH=install-lockpath +- +-cat >>confdefs.h <<\_ACEOF +-#define ENABLE_LOCKING 1 +-_ACEOF +- +- else +- INSTALL_LOCKPATH= +- fi +- { echo "$as_me:$LINENO: checking whether to enable device locking" >&5 +-echo $ECHO_N "checking whether to enable device locking... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $use_locking" >&5 +-echo "${ECHO_T}$use_locking" >&6; } +- if test $use_locking = yes ; then +- { echo "$as_me:$LINENO: Setting lockdir group to $LOCKPATH_GROUP" >&5 +-echo "$as_me: Setting lockdir group to $LOCKPATH_GROUP" >&6;} +- fi +- +- + + + +@@ -8040,9 +7995,9 @@ + if pkg-config --exists libgphoto2 ; then + with_gphoto2=`pkg-config --modversion libgphoto2` + CPPFLAGS="${CPPFLAGS} `pkg-config --cflags libgphoto2`" +- GPHOTO2_LIBS="`pkg-config --libs libgphoto2`" ++ LIBGPHOTO2="`pkg-config --libs libgphoto2`" + tmp_LIBS="" +-for param in ${GPHOTO2_LIBS}; do ++for param in ${LIBGPHOTO2}; do + case "${param}" in + -l*) + tmp_LIBS="${tmp_LIBS} ${param}" +@@ -8052,16 +8007,17 @@ + ;; + esac + done +-GPHOTO2_LIBS="${tmp_LIBS}" ++LIBGPHOTO2="${tmp_LIBS}" + unset tmp_LIBS + unset param + + LDFLAGS="$LDFLAGS $GPHOTO2_LDFLAGS" + ++ old_LIBS="$LIBS" ++ LIBS="$LIBS $LIBGPHOTO2" ++ + + +- saved_LIBS="${LIBS}" +- LIBS="${LIBS} ${GPHOTO2_LIBS}" + # Make sure we an really use the library + + for ac_func in gp_camera_init +@@ -8155,11 +8111,12 @@ + _ACEOF + HAVE_GPHOTO2=true + else +- LIBS="${saved_LIBS}" +- HAVE_GPHOTO2=false ++ HAVE_GPHOTO2=false + fi + done + ++ ++ LIBS="$old_LIBS" + else + HAVE_GPHOTO2=false + fi +@@ -8167,6 +8124,73 @@ + fi + + ++ ++ ++ ++ LOCKPATH_GROUP=uucp ++ use_locking=yes ++ case "${host_os}" in ++ os2* ) ++ use_locking=no ++ ;; ++ esac ++ ++ # ++ # we check the user ++ # Check whether --enable-locking was given. ++if test "${enable_locking+set}" = set; then ++ enableval=$enable_locking; ++ if test $enableval = yes ; then ++ use_locking=yes ++ else ++ use_locking=no ++ fi ++ ++fi ++ ++ if test $use_locking = yes ; then ++ ++# Check whether --with-group was given. ++if test "${with_group+set}" = set; then ++ withval=$with_group; LOCKPATH_GROUP="$withval" ++ ++fi ++ ++ # check if the group does exist ++ lasterror="" ++ touch sanetest.file ++ chgrp $LOCKPATH_GROUP sanetest.file 2>/dev/null || lasterror=$? ++ rm -f sanetest.file ++ if test ! -z "$lasterror"; then ++ { echo "$as_me:$LINENO: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&5 ++echo "$as_me: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&2;} ++ { echo "$as_me:$LINENO: WARNING: Locking feature will be disabled." >&5 ++echo "$as_me: WARNING: Locking feature will be disabled." >&2;} ++ use_locking=no ++ fi ++ fi ++ if test $use_locking = yes ; then ++ INSTALL_LOCKPATH=install-lockpath ++ ++cat >>confdefs.h <<\_ACEOF ++#define ENABLE_LOCKING 1 ++_ACEOF ++ ++ else ++ INSTALL_LOCKPATH= ++ fi ++ { echo "$as_me:$LINENO: checking whether to enable device locking" >&5 ++echo $ECHO_N "checking whether to enable device locking... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: result: $use_locking" >&5 ++echo "${ECHO_T}$use_locking" >&6; } ++ if test $use_locking = yes ; then ++ { echo "$as_me:$LINENO: Setting lockdir group to $LOCKPATH_GROUP" >&5 ++echo "$as_me: Setting lockdir group to $LOCKPATH_GROUP" >&6;} ++ fi ++ ++ ++ ++ + { echo "$as_me:$LINENO: checking for sane_init in -lsane" >&5 + echo $ECHO_N "checking for sane_init in -lsane... $ECHO_C" >&6; } + if test "${ac_cv_lib_sane_sane_init+set}" = set; then +@@ -11576,8 +11600,7 @@ + + + if test "${ac_cv_header_usb_h}" = "yes" && test "$USE_LIBUSB" = "yes" ; then +- +-{ echo "$as_me:$LINENO: checking for usb_interrupt_read in -lusb" >&5 ++ { echo "$as_me:$LINENO: checking for usb_interrupt_read in -lusb" >&5 + echo $ECHO_N "checking for usb_interrupt_read in -lusb... $ECHO_C" >&6; } + if test "${ac_cv_lib_usb_usb_interrupt_read+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -11639,12 +11662,10 @@ + { echo "$as_me:$LINENO: result: $ac_cv_lib_usb_usb_interrupt_read" >&5 + echo "${ECHO_T}$ac_cv_lib_usb_usb_interrupt_read" >&6; } + if test $ac_cv_lib_usb_usb_interrupt_read = yes; then +- cat >>confdefs.h <<_ACEOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_LIBUSB 1 + _ACEOF +- +- LIBS="-lusb $LIBS" +- ++ LIBUSB="-lusb" + fi + + if test "${ac_cv_lib_usb_usb_interrupt_read}" = "yes" ; then +@@ -11652,6 +11673,7 @@ + fi + fi + ++ + if sparc64 -q > /dev/null 2>&1 ; then + + cat >>confdefs.h <<\_ACEOF +@@ -12423,7 +12445,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 12426 "configure"' > conftest.$ac_ext ++ echo '#line 12448 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -14866,11 +14888,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14869: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14891: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14873: \$? = $ac_status" >&5 ++ echo "$as_me:14895: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -15134,11 +15156,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15137: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15159: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15141: \$? = $ac_status" >&5 ++ echo "$as_me:15163: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -15238,11 +15260,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15241: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15263: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15245: \$? = $ac_status" >&5 ++ echo "$as_me:15267: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -17546,7 +17568,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:20011: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:19993: \$? = $ac_status" >&5 ++ echo "$as_me:20015: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -20090,11 +20112,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:20093: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:20115: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:20097: \$? = $ac_status" >&5 ++ echo "$as_me:20119: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -21660,11 +21682,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:21663: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:21685: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:21667: \$? = $ac_status" >&5 ++ echo "$as_me:21689: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -21764,11 +21786,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:21767: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:21789: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:21771: \$? = $ac_status" >&5 ++ echo "$as_me:21793: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -23966,11 +23988,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:23969: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:23991: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:23973: \$? = $ac_status" >&5 ++ echo "$as_me:23995: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -24234,11 +24256,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:24237: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:24259: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:24241: \$? = $ac_status" >&5 ++ echo "$as_me:24263: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -24338,11 +24360,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:24341: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:24363: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:24345: \$? = $ac_status" >&5 ++ echo "$as_me:24367: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -27957,22 +27979,22 @@ + DL_LIB!$DL_LIB$ac_delim + DYNAMIC_FLAG!$DYNAMIC_FLAG$ac_delim + USE_LINKS!$USE_LINKS$ac_delim +-INSTALL_LOCKPATH!$INSTALL_LOCKPATH$ac_delim +-LOCKPATH_GROUP!$LOCKPATH_GROUP$ac_delim ++LIBM!$LIBM$ac_delim ++LIBCAM!$LIBCAM$ac_delim ++LIBJPEG!$LIBJPEG$ac_delim ++LIBTIFF!$LIBTIFF$ac_delim ++LIBIEEE1284!$LIBIEEE1284$ac_delim ++LIBPTHREAD!$LIBPTHREAD$ac_delim + HAVE_GPHOTO2!$HAVE_GPHOTO2$ac_delim + GPHOTO2_LDFLAGS!$GPHOTO2_LDFLAGS$ac_delim ++LIBGPHOTO2!$LIBGPHOTO2$ac_delim ++INSTALL_LOCKPATH!$INSTALL_LOCKPATH$ac_delim ++LOCKPATH_GROUP!$LOCKPATH_GROUP$ac_delim + ALLOCA!$ALLOCA$ac_delim + LIBOBJS!$LIBOBJS$ac_delim ++LIBUSB!$LIBUSB$ac_delim + LN_S!$LN_S$ac_delim + ECHO!$ECHO$ac_delim +-AR!$AR$ac_delim +-RANLIB!$RANLIB$ac_delim +-STRIP!$STRIP$ac_delim +-DLLTOOL!$DLLTOOL$ac_delim +-AS!$AS$ac_delim +-OBJDUMP!$OBJDUMP$ac_delim +-CXX!$CXX$ac_delim +-CXXFLAGS!$CXXFLAGS$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -28014,6 +28036,14 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++AR!$AR$ac_delim ++RANLIB!$RANLIB$ac_delim ++STRIP!$STRIP$ac_delim ++DLLTOOL!$DLLTOOL$ac_delim ++AS!$AS$ac_delim ++OBJDUMP!$OBJDUMP$ac_delim ++CXX!$CXX$ac_delim ++CXXFLAGS!$CXXFLAGS$ac_delim + ac_ct_CXX!$ac_ct_CXX$ac_delim + CXXCPP!$CXXCPP$ac_delim + F77!$F77$ac_delim +@@ -28035,7 +28065,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 27; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --- sane-backends-1.0.19.orig/debian/patches/21_sane-config.in_no_rpath.dpatch +++ sane-backends-1.0.19/debian/patches/21_sane-config.in_no_rpath.dpatch @@ -0,0 +1,43 @@ +#!/bin/sh -e +## 02_sane-config.in_no_rpath.dpatch by Julien BLACHE +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Do not output rpath in --ldflags. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad sane-backends-1.0.19~cvs20071213~/tools/sane-config.in sane-backends-1.0.19~cvs20071213/tools/sane-config.in +--- sane-backends-1.0.19~cvs20071213~/tools/sane-config.in 2007-12-25 22:50:55.000000000 +0100 ++++ sane-backends-1.0.19~cvs20071213/tools/sane-config.in 2007-12-25 22:52:02.244891946 +0100 +@@ -7,12 +7,12 @@ + PACKAGE="@PACKAGE@" + scriptname="sane-config" + +-LINKER_RPATH="@LINKER_RPATH@" ++LINKER_RPATH="" + + prefix="@prefix@" + exec_prefix="@exec_prefix@" + +-LIBS="@LIBS@ @DL_LIB@" ++LIBS="@LIBS@" + pkgincludedir="@pkgincludedir@" + pkglibdir="@pkglibdir@" + includedir="@includedir@" --- sane-backends-1.0.19.orig/debian/patches/01_disable_epson2.dpatch +++ sane-backends-1.0.19/debian/patches/01_disable_epson2.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_disable_epson2.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Disable the epson2 backend by default. + +@DPATCH@ +diff -urNad sane-backends-1.0.19~/backend/dll.conf.in sane-backends-1.0.19/backend/dll.conf.in +--- sane-backends-1.0.19~/backend/dll.conf.in 2008-01-18 02:27:22.000000000 +0100 ++++ sane-backends-1.0.19/backend/dll.conf.in 2008-02-12 21:18:36.597390953 +0100 +@@ -21,7 +21,7 @@ + dmc + epjitsu + epson +-epson2 ++#epson2 + fujitsu + #gphoto2 + genesys --- sane-backends-1.0.19.orig/debian/patches/24_sane-desc.c_debian_mods.dpatch +++ sane-backends-1.0.19/debian/patches/24_sane-desc.c_debian_mods.dpatch @@ -0,0 +1,73 @@ +#!/bin/sh -e +## 05_sane-desc.c_debian_mods.dpatch by Julien BLACHE +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Do not link to HTML manpages, we do not have them installed. Also, +## DP: do not use sane.png, as it's not distributed in the source tarball. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad sane-backends-1.0.19~cvs20071213~/tools/sane-desc.c sane-backends-1.0.19~cvs20071213/tools/sane-desc.c +--- sane-backends-1.0.19~cvs20071213~/tools/sane-desc.c 2007-07-30 12:58:08.000000000 +0200 ++++ sane-backends-1.0.19~cvs20071213/tools/sane-desc.c 2007-12-13 21:31:29.719481442 +0100 +@@ -25,7 +25,7 @@ + + #define SANE_DESC_VERSION "3.3" + +-#define MAN_PAGE_LINK "http://www.sane-project.org/man/%s.5.html" ++#define MAN_PAGE_LINK "/usr/share/doc/libsane/html/%s.5.html" + #define COLOR_MINIMAL "\"#B00000\"" + #define COLOR_BASIC "\"#FF9000\"" + #define COLOR_GOOD "\"#90B000\"" +@@ -2362,8 +2362,8 @@ + printf ("
\n"); + } + if (be->manpage) +- printf ("Manual page: %s
\n", be->manpage, be->manpage); ++ printf ("Manual page:" ++ "%s
\n", be->manpage); + + if (be->comment) + printf ("Comment: %s
\n", be->comment); +@@ -2597,9 +2597,9 @@ + + printf ("\n"); + if (model_record->be->manpage) +- printf ("%s\n", +- model_record->be->manpage, model_record->be->manpage); ++ printf ("" ++ "%s\n", ++ model_record->be->manpage); + else + printf ("?\n"); + +@@ -2624,8 +2624,8 @@ + printf + ("\n" + "\n" +- "
\n" +- "\"SANE\"\n"); ++ "
\n"); ++ /* "\"SANE\"\n"); */ + printf ("

%s

\n", title); + printf ("
\n" "
\n"); + printf ("%s\n", intro); --- sane-backends-1.0.19.orig/debian/patches/00list +++ sane-backends-1.0.19/debian/patches/00list @@ -0,0 +1,8 @@ +01_disable_epson2 +11_minimum_linkage +12_new_configure +21_sane-config.in_no_rpath +22_dll_backend_conf +23_unneeded_doc +24_sane-desc.c_debian_mods + --- sane-backends-1.0.19.orig/debian/patches/11_minimum_linkage.dpatch +++ sane-backends-1.0.19/debian/patches/11_minimum_linkage.dpatch @@ -0,0 +1,288 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_minimum_linkage.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Link backends only with whatever libraries they need. + +@DPATCH@ +diff -urNad sane-backends-1.0.19~/acinclude.m4 sane-backends-1.0.19/acinclude.m4 +--- sane-backends-1.0.19~/acinclude.m4 2008-02-12 21:40:39.597459626 +0100 ++++ sane-backends-1.0.19/acinclude.m4 2008-02-12 21:40:40.993390629 +0100 +@@ -200,7 +200,7 @@ + struct parport p; char *buf; + ieee1284_nibble_read(&p, 0, buf, 1); + ], +- [sane_cv_use_libieee1284="yes"; LIBS="${LIBS} -lieee1284" ++ [sane_cv_use_libieee1284="yes"; LIBIEEE1284="-lieee1284" + ],[sane_cv_use_libieee1284="no"]) + ],) + ],) +@@ -235,10 +235,11 @@ + ]) + AC_CHECK_HEADERS(pthread.h, + [ ++ SANE_save_LIBS="${LIBS}" + AC_CHECK_LIB(pthread,pthread_create) +- have_pthread=yes + AC_CHECK_FUNCS([pthread_create pthread_kill pthread_join pthread_detach pthread_cancel pthread_testcancel], +- ,[ have_pthread=no; use_pthread=no ]) ++ [ AC_DEFINE(HAVE_PTHREAD, 1) have_pthread=yes; LIBPTHREAD=-lpthread ] ,[ have_pthread=no; use_pthread=no ]) ++ LIBS="${SANE_save_LIBS}" + ],) + + if test $use_pthread = yes ; then +@@ -270,7 +271,7 @@ + #if JPEG_LIB_VERSION >= 61 + sane_correct_jpeg_lib_version_found + #endif +- ],[sane_cv_use_libjpeg="yes"; LIBS="${LIBS} -ljpeg"; ++ ],[sane_cv_use_libjpeg="yes"; LIBJPEG="-ljpeg"; + AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]) + ],) + ],) +@@ -282,7 +283,7 @@ + AC_CHECK_LIB(tiff,TIFFFdOpen, + [ + AC_CHECK_HEADER(tiffio.h, +- [sane_cv_use_libtiff="yes"; LIBS="${LIBS} -ltiff"],) ++ [sane_cv_use_libtiff="yes"; LIBTIFF="-ltiff"],) + ],) + ]) + +@@ -449,18 +450,20 @@ + if pkg-config --exists libgphoto2 ; then + with_gphoto2=`pkg-config --modversion libgphoto2` + CPPFLAGS="${CPPFLAGS} `pkg-config --cflags libgphoto2`" +- GPHOTO2_LIBS="`pkg-config --libs libgphoto2`" +- SANE_EXTRACT_LDFLAGS(GPHOTO2_LDFLAGS, GPHOTO2_LIBS) ++ LIBGPHOTO2="`pkg-config --libs libgphoto2`" ++ SANE_EXTRACT_LDFLAGS(GPHOTO2_LDFLAGS, LIBGPHOTO2) + LDFLAGS="$LDFLAGS $GPHOTO2_LDFLAGS" + ++ old_LIBS="$LIBS" ++ LIBS="$LIBS $LIBGPHOTO2" ++ + AC_SUBST(GPHOTO2_LDFLAGS) + +- saved_LIBS="${LIBS}" +- LIBS="${LIBS} ${GPHOTO2_LIBS}" + # Make sure we an really use the library + AC_CHECK_FUNCS(gp_camera_init,HAVE_GPHOTO2=true, +- [ LIBS="${saved_LIBS}" +- HAVE_GPHOTO2=false ]) ++ [ HAVE_GPHOTO2=false ]) ++ ++ LIBS="$old_LIBS" + else + HAVE_GPHOTO2=false + fi +diff -urNad sane-backends-1.0.19~/backend/Makefile.in sane-backends-1.0.19/backend/Makefile.in +--- sane-backends-1.0.19~/backend/Makefile.in 2008-02-12 21:40:39.622690918 +0100 ++++ sane-backends-1.0.19/backend/Makefile.in 2008-02-12 21:44:12.611390365 +0100 +@@ -51,7 +51,7 @@ + CPPFLAGS = @CPPFLAGS@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ +-BACKENDLIBS = @LIBS@ @DL_LIB@ ++BACKENDLIBS = @LIBS@ + DEFS = @DEFS@ + DYNAMIC_FLAG=@DYNAMIC_FLAG@ + USE_LINKS=@USE_LINKS@ +@@ -212,7 +212,7 @@ + + libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS) + @$(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) \ +- $(LDFLAGS) $(BACKENDLIBS) $^ @LIBTOOL_LINK_EXTRA@ -rpath $(libsanedir) \ ++ $(LDFLAGS) $(BACKENDLIBS) $^ $(ADDLIB-$*) @LIBTOOL_LINK_EXTRA@ -rpath $(libsanedir) \ + -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG) + + %-s.lo: %-s.c +@@ -318,7 +318,7 @@ + echo "};" >> $@ + + libsane.la: dll.lo dll-s.lo $(EXTRA) $(addsuffix .lo,$(DLL_PRELOAD)) $(LIBOBJS) +- @$(LIBTOOL) $(MLINK) $(CC) -o $@ $(LDFLAGS) $(BACKENDLIBS) $^ \ ++ @$(LIBTOOL) $(MLINK) $(CC) -o $@ $(LDFLAGS) $(BACKENDLIBS) @DL_LIB@ $^ \ + $(addsuffix .lo,$(DLL_PRELOAD_EXTRAS)) @LIBTOOL_LINK_EXTRA@ \ + -rpath $(libdir) -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) + +@@ -347,6 +347,88 @@ + EXTRA_lexmark = lexmark_low + EXTRA_pixma = pixma_io_sanei pixma_common pixma_mp150 pixma_mp730 pixma_mp750 + ++# Additional library dependencies ++LIBGPHOTO2 = @LIBGPHOTO2@ ++LIBUSB = @LIBUSB@ ++LIBIEEE1284 = @LIBIEEE1284@ ++LIBCAM = @LIBCAM@ ++LIBJPEG = @LIBJPEG@ ++LIBTIFF = @LIBTIFF@ ++LIBM = @LIBM@ ++LIBPTHREAD = @LIBPTHREAD@ ++LIBDL = @DL_LIB@ ++ ++ADDLIB-abaton = $(LIBCAM) ++ADDLIB-agfafocus = $(LIBCAM) ++ADDLIB-apple = $(LIBCAM) ++ADDLIB-artec = $(LIBCAM) ++ADDLIB-artec_eplus48u = $(LIBM) $(LIBUSB) ++ADDLIB-avision = $(LIBM) $(LIBUSB) $(LIBCAM) ++ADDLIB-bh = $(LIBCAM) ++ADDLIB-canon = $(LIBM) $(LIBCAM) ++ADDLIB-canon630u = $(LIBM) $(LIBUSB) ++ADDLIB-canon_pp = $(LIBIEEE1284) ++ADDLIB-cardscan = $(LIBUSB) ++ADDLIB-coolscan = $(LIBM) $(LIBCAM) ++ADDLIB-coolscan2 = $(LIBM) $(LIBUSB) $(LIBCAM) ++ADDLIB-dc25 = $(LIBM) ++ADDLIB-dc210 = $(LIBJPEG) ++ADDLIB-dc240 = $(LIBJPEG) ++ADDLIB-dell1600n_net = $(LIBJPEG) $(LIBTIFF) ++ADDLIB-dll = $(LIBDL) ++ADDLIB-dmc = $(LIBCAM) ++ADDLIB-epjitsu = $(LIBUSB) ++ADDLIB-epson = $(LIBUSB) $(LIBCAM) ++ADDLIB-epson2 = $(LIBUSB) $(LIBCAM) ++ADDLIB-fujitsu = $(LIBM) $(LIBUSB) $(LIBCAM) ++ADDLIB-genesys = $(LIBM) $(LIBUSB) ++ADDLIB-gphoto2 = $(LIBGPHOTO2) $(LIBJPEG) ++ADDLIB-gt68xx = $(LIBM) $(LIBUSB) ++ADDLIB-hp = $(LIBUSB) $(LIBCAM) ++ADDLIB-hp3500 = $(LIBUSB) ++ADDLIB-hp3900 = $(LIBM) $(LIBUSB) $(LIBTIFF) ++ADDLIB-hp4200 = $(LIBM) $(LIBUSB) ++ADDLIB-hp5400 = $(LIBUSB) ++ADDLIB-hp5590 = $(LIBUSB) ++ADDLIB-hpljm1005 = $(LIBM) $(LIBUSB) ++ADDLIB-hpsj5s = $(LIBIEEE1284) ++ADDLIB-ibm = $(LIBCAM) ++ADDLIB-leo = $(LIBCAM) ++ADDLIB-lexmark = $(LIBUSB) ++ADDLIB-ma1509 = $(LIBUSB) ++ADDLIB-matsushita = $(LIBCAM) ++ADDLIB-microtek = $(LIBM) $(LIBCAM) ++ADDLIB-microtek2 = $(LIBM) $(LIBCAM) ++ADDLIB-mustek = $(LIBIEEE1284) $(LIBCAM) ++ADDLIB-mustek_pp = $(LIBM) $(LIBIEEE1284) ++ADDLIB-mustek_usb = $(LIBUSB) ++ADDLIB-mustek_usb2 = $(LIBM) $(LIBPTHREAD) $(LIBUSB) ++ADDLIB-nec = $(LIBM) $(LIBCAM) ++ADDLIB-niash = $(LIBM) $(LIBUSB) ++ADDLIB-pie = $(LIBCAM) ++ADDLIB-pixma = $(LIBM) $(LIBUSB) ++ADDLIB-plustek = $(LIBM) $(LIBUSB) ++ADDLIB-plustek_pp = $(LIBM) $(LIBIEEE1284) ++ADDLIB-ricoh = $(LIBCAM) ++ADDLIB-s9036 = $(LIBCAM) ++ADDLIB-sceptre = $(LIBCAM) ++ADDLIB-sharp = $(LIBM) $(LIBCAM) ++ADDLIB-sm3600 = $(LIBUSB) ++ADDLIB-sm3840 = $(LIBM) $(LIBUSB) $(LIBCAM) ++ADDLIB-snapscan = $(LIBM) $(LIBUSB) $(LIBCAM) ++ADDLIB-sp15c = $(LIBCAM) ++ADDLIB-st400 = $(LIBCAM) ++ADDLIB-stv680 = $(LIBUSB) ++ADDLIB-tamarack = $(LIBCAM) ++ADDLIB-teco1 = $(LIBCAM) ++ADDLIB-teco2 = $(LIBCAM) ++ADDLIB-teco3 = $(LIBCAM) ++ADDLIB-u12 = $(LIBM) $(LIBUSB) ++ADDLIB-umax = $(LIBM) $(LIBUSB) $(LIBCAM) ++ADDLIB-umax1220u = $(LIBM) $(LIBUSB) ++ADDLIB-umax_pp = $(LIBM) ++ ++ + # When preloading dll, we need to add in all preloaded objects: + libsane-dll.la: $(addsuffix .lo,$(DLL_PRELOAD)) + libsane-dll.la: $(addsuffix .lo,$(DLL_PRELOAD_EXTRAS)) +diff -urNad sane-backends-1.0.19~/configure.in sane-backends-1.0.19/configure.in +--- sane-backends-1.0.19~/configure.in 2008-02-12 21:40:39.656236560 +0100 ++++ sane-backends-1.0.19/configure.in 2008-02-12 21:40:40.994390544 +0100 +@@ -99,9 +99,13 @@ + dnl *********************************************************************** + SANE_CHECK_DLL_LIB + dnl Checks for Backend libraries. +-AC_CHECK_LIB(m,sqrt) ++AC_CHECK_LIB(m,sqrt, [ AC_DEFINE(HAVE_LIBM, 1) LIBM="-lm"]) ++AC_SUBST(LIBM) ++AC_CHECK_LIB(cam, cam_open_device, [AC_DEFINE(HAVE_LIBCAM, 1) LIBCAM="-lcam"]) # FreeBSD 3+ needs this ++AC_SUBST(LIBCAM) ++ + AC_CHECK_LIB(scsi, scsireq_enter) # FreeBSD needs this +-AC_CHECK_LIB(cam, cam_open_device) # FreeBSD 3+ needs this ++ + dnl IRIX sometimes has SYSVR3/4 network DSOs, but we do not need or want + dnl to use them! + if test "`uname`" != "IRIX" -a "`uname`" != "IRIX64"; then +@@ -109,12 +113,24 @@ + AC_SEARCH_LIBS(socket, socket) + AC_SEARCH_LIBS(syslog, syslog be) # OS/2 needs -lsyslog, BeOS needs -lbe + fi ++ + SANE_CHECK_JPEG ++AC_SUBST(LIBJPEG) ++ + SANE_CHECK_TIFF ++AC_SUBST(LIBTIFF) ++ + SANE_CHECK_IEEE1284 ++AC_SUBST(LIBIEEE1284) ++ + SANE_CHECK_PTHREAD +-SANE_CHECK_LOCKING ++AC_SUBST(LIBPTHREAD) ++ + SANE_CHECK_GPHOTO2 ++AC_SUBST(LIBGPHOTO2) ++ ++SANE_CHECK_LOCKING ++ + dnl check sane to make sure we don't have two installations + AC_CHECK_LIB(sane, sane_init, LIBSANE_EXISTS="yes") + +@@ -291,11 +307,12 @@ + + dnl we need both libusb header and a libusb providing usb_interrupt_read + if test "${ac_cv_header_usb_h}" = "yes" && test "$USE_LIBUSB" = "yes" ; then +- AC_CHECK_LIB(usb, usb_interrupt_read) ++ AC_CHECK_LIB(usb, usb_interrupt_read, [ AC_DEFINE(HAVE_LIBUSB, 1) LIBUSB="-lusb" ]) + if test "${ac_cv_lib_usb_usb_interrupt_read}" = "yes" ; then + HAVE_LIBUSB="yes" + fi + fi ++AC_SUBST(LIBUSB) + + dnl disable Linux SCSI generic version 3 to avoid 32/64 bit problems + if sparc64 -q > /dev/null 2>&1 ; then +diff -urNad sane-backends-1.0.19~/tools/Makefile.in sane-backends-1.0.19/tools/Makefile.in +--- sane-backends-1.0.19~/tools/Makefile.in 2008-02-12 21:40:39.689765472 +0100 ++++ sane-backends-1.0.19/tools/Makefile.in 2008-02-12 21:40:40.994390544 +0100 +@@ -72,6 +72,10 @@ + # Library routines that should be part of libc, but aren't on some systems: + LIBLIB = ../lib/liblib.a + ++LIBUSB = @LIBUSB@ ++LIBIEEE1284 = @LIBIEEE1284@ ++LIBCAM = @LIBCAM@ ++ + DISTFILES = Makefile.in RenSaneDlls.cmd README libtool-get-dll-ext \ + mustek600iin-off.c sane-config.in sane-desc.c check-usb-chip.c \ + sane-find-scanner.c umax_pp.c xerox gamma4scanimage.c check-po.awk +@@ -104,7 +108,7 @@ + ../sanei/sanei_scsi.lo ../sanei/sanei_usb.lo ../sanei/sanei_init_debug.lo \ + ../sanei/sanei_config.lo + @$(LIBTOOL) $(MLINK) $(LINK) sane-find-scanner.o check-usb-chip.o \ +- ../backend/sane_strstatus.lo $(LIBSANEI) $(LIBLIB) $(LIBS) ++ ../backend/sane_strstatus.lo $(LIBSANEI) $(LIBLIB) $(LIBS) $(LIBUSB) $(LIBIEEE1284) $(LIBCAM) + + gamma4scanimage: gamma4scanimage.o + @$(LIBTOOL) $(MLINK) $(LINK) gamma4scanimage.o -lm +@@ -115,7 +119,7 @@ + + umax_pp: umax_pp.o ../backend/umax_pp_low.o + @$(LIBTOOL) $(MLINK) $(LINK) umax_pp.o ../backend/umax_pp_low.o \ +- $(LIBSANEI) $(LIBLIB) $(LIBS) ++ $(LIBSANEI) $(LIBLIB) $(LIBS) -lm + sane-desc: sane-desc.o + @$(LIBTOOL) $(MLINK) $(LINK) sane-desc.o $(LIBSANEI) $(LIBLIB) + --- sane-backends-1.0.19.orig/debian/patches/23_unneeded_doc.dpatch +++ sane-backends-1.0.19/debian/patches/23_unneeded_doc.dpatch @@ -0,0 +1,63 @@ +#!/bin/sh -e +## 04_unneeded_doc.dpatch by Julien BLACHE +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Do not generate some documentation we do not want; do not include +## DP: sane.png in the html documentation, as it is not distributed in the +## DP: source tarball. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad sane-backends-1.0.19~cvs20071213~/doc/Makefile.in sane-backends-1.0.19~cvs20071213/doc/Makefile.in +--- sane-backends-1.0.19~cvs20071213~/doc/Makefile.in 2007-12-13 21:16:33.000000000 +0100 ++++ sane-backends-1.0.19~cvs20071213/doc/Makefile.in 2007-12-13 21:31:07.239481854 +0100 +@@ -42,7 +42,7 @@ + sane-dc25.5 sane-dmc.5 sane-epson.5 sane-hp.5 sane-gphoto2.5 \ + sane-leo.5 sane-lexmark.5 sane-matsushita.5 sane-microtek.5 \ + sane-microtek2.5 sane-mustek.5 sane-nec.5 sane-net.5 sane-pie.5 \ +- sane-pint.5 sane-pnm.5 sane-umax.5 sane-qcam.5 sane-scsi.5 \ ++ sane-umax.5 sane-qcam.5 sane-scsi.5 \ + sane-artec.5 sane-fujitsu.5 sane-sharp.5 sane-s9036.5 \ + sane-tamarack.5 sane-ricoh.5 sane-avision.5 sane-plustek.5 \ + sane-st400.5 sane-mustek_pp.5 sane-dc210.5 sane-v4l.5 \ +@@ -58,12 +58,8 @@ + SECT7 = sane.7 + SECT8 = saned.8 + MANPAGES = $(SECT1) $(SECT5) $(SECT7) $(SECT8) +-READMES = README AUTHORS COPYING ChangeLog LICENSE NEWS PROBLEMS \ +- PROJECTS README README.aix README.beos README.darwin README.freebsd \ +- README.djpeg \ +- README.hp-ux README.linux README.netbsd README.openbsd README.os2 \ +- README.solaris README.unixware2 README.unixware7 README.windows README.zeta +-DOCS = backend-writing.txt sane.ps sane.dvi ++READMES = README AUTHORS NEWS PROBLEMS PROJECTS ++DOCS = backend-writing.txt sane.ps + BACKDIRS= canon leo matsushita mustek mustek_usb plustek u12 umax sceptre teco \ + gt68xx niash mustek_usb2 + LATEX = TEXINPUTS=$(srcdir):$$TEXINPUTS @LATEX@ +@@ -73,7 +69,7 @@ + MAN2HTML= nroff -man |\ + man2html -compress -topm 6 -botm 6 -nodepage -title $${page} \ + -cgiurl '$$title.$$section.html'|\ +- sed 's,,

,' ++ sed 's,,,' + + ifeq (@CROSS_COMPILING@,no) + HTML_PAGES = sane-backends.html sane-backends-external.html \ --- sane-backends-1.0.19.orig/debian/libsane.install.in +++ sane-backends-1.0.19/debian/libsane.install.in @@ -0,0 +1,9 @@ +usr/share/man/man7 +usr/share/locale/ +usr/lib/sane/*.so.* +usr/lib/sane/*.la +usr/lib/*.so.* +usr/lib/*.la +etc/ +usr/share/man/man5/sane-scsi.5 +usr/share/man/man5/sane-usb.5 --- sane-backends-1.0.19.orig/debian/copyright +++ sane-backends-1.0.19/debian/copyright @@ -0,0 +1,50 @@ +This package was first debianized by Kevin Dalley . + +It is now maintained by Julien BLACHE +and Aurélien JARNO . + +It was downloaded from : ftp://ftp.mostang.com/pub/sane/ + +Upstream Authors : see /usr/share/doc/libsane/AUTHORS.gz + + +Verbatim copy of the LICENSE : + +******************************************************************************** +Mon Nov 30 22:41:58 1998 + +This files attempts to clarify the licensing situation for the SANE +distribution. In case of doubt, the copyright information contained +in each file overrides what is said here. + +SANE consists of three parts each of which has its own licensing +terms: + + * The frontend programs. + + These programs are generally protected by the GNU General Public + License. (See file COPYING.) + + * The backend libraries. + + Backend libraries are protected by the GNU General Public License (see + file COPYING), but as an exception, it is permissible to link against + such a library without affecting the licensing status of the program + that uses the libraries. For details, see the copyright notice at the + head of the backend files (e.g., backend/dll.c). + + Note that some of the backends have additional licensing constraints. + E.g., the DC210 backend uses JPG code that is licensed as described + in backend/djpeg.README.gz. + + * The SANE API and network protocol as put forth in the standard document. + + The standard is considered to be in the public domain. Anyone is free + to implement SANE interface conforming applications or libraries in + any way he or she sees fit. + +******************************************************************************** + +On Debian systems, the complete text of the GNU General Public License (the +"COPYING" file referred to above) can be found in the /usr/share/common-licenses/GPL +file. --- sane-backends-1.0.19.orig/debian/libsane.README.Debian +++ sane-backends-1.0.19/debian/libsane.README.Debian @@ -0,0 +1,162 @@ +libsane (sane-backends) for Debian : +------------------------------------ + +GENERAL +------- + +The configuration files for Debian releases of SANE are in /etc/sane.d. + +A Debian-specific patch is applied to the dll backend, so that the backend +checks for pieces of dll.conf in the /etc/sane.d/dll.d directory; this +facility is used by packages providing external backends (like libsane-extras, +hpoj or hplip) to "register" the backends they provide without much hassle. + +Each backend has a configuration file which specifies which devices, +access methods, options etc. should be used by this backend. The format +and content of each configuration file is documented in the manpage for +the backend, e.g. sane-plustek (5). + +For USB and some SCSI scanners, the parameters can be auto-detected, and +manual configuration is not required. If the auto-detection fails, read +the next paragraph. Again, see the manpage for your backend for more +information. + +For SCSI devices (mostly scanners), the configuration files use the +/dev/scanner device; /dev/scanner is a symbolic link to the appropriate +SCSI device node. It's up to you to create this symbolic link, once you +will have determined which device node it needs to point to. Use the +sane-find-scanner command in the sane-utils package to determine which +SCSI device your scanner is attached to. The sane-find-scanner utility +also discovers USB scanners. + +It can be a good idea to try running sane-find-scanner as root to ensure +there will be no permissions problems while attempting to detect your +devices. + + +DOCUMENTATION +------------- + +For information on configuring and trouble-shooting the various SANE +components, please refer to the manual pages listed below: + + Regarding: Read: + ----------------- ------------------------------------------ + General sane(7) -- your starting point + + scanimage scanimage(1) + xscanimage xscanimage(1) + saned saned(8) + xcam xcam(1) + + Dynamic loading sane-dll(5) + Backends See sane-(5). Each backend + comes with a manual page in section 5 of + the manual system. + + +SETUP +----- + +Note: this is only a proposed solution, you are free implement whatever access +control mechanism you see fit (eg. by using saned on localhost). + +This package added a scanner group to your system. We recommend you to add to +this group the users that should be able to access to your scanner(s), and to +make sure the appropriate device files (eg. /dev/sg0, ...) are owned by root +and the scanner group, with permissions set to 0660. + +You can change the ownership and permissions of the device files as follows : + chown root:scanner /dev/.... + chmod 0660 /dev/.... + + +If you intend to use a USB scanner, it is highly recommended that you install +the udev package, which will help you with setting up the permissions on +the device node referring to your scanner (under /dev/bus/usb/ -- libusb is +used to communicate with the scanner). + +The /etc/udev/libsane.rules file contains a list of USB scanners supported by +SANE, so everything should just work once udev will be running on your system. +If you scanner is missing from the list, see the top of the file for +instructions on how to add it to the list; feel free to file a bug report +(severity wishlist) against the libsane package to get your scanner added. + +udev will automatically set up the permissions and ownership on the device +node corresponding to your scanner according to the rules defined in the +libsane.rules file (default is root:scanner, 0664). If you want to execute +a script when your scanner is plugged in, add RUN+="/path/to/script" to the +rule matching your scanner. + +Changes made to the libsane.rules file will be preserved on upgrade. + +If you want to disable the udev support for libsane, remove the symlink +/etc/udev/rules.d/025_libsane.rules. + + + +TROUBLESHOOTING +--------------- + +If your scanner does not work, edit the file /etc/sane.d/dll.conf. +Verify that your scanner is not commented out. You may need to +comment out all other scanners in dll.conf. It shouldn't matter, but +sometimes it does. + +The most common cause for a non-working scanner is inappropriate +permissions on the device. So your first reflex should be to check the +permissions of the device used to access your scanner, e.g. /dev/sg0 +or the device pointed to by /dev/scanner. + + +If you encounter any problems with getting your device(s) recognized, +try setting the various environment variables that are there to assist +in debugging such problems. The environment variables are documented +in the relevant manual pages. For example, to get the maximum amount +of debug information when testing a Mustek scanner, set environment +variables SANE_DEBUG_DLL, SANE_DEBUG_MUSTEK, and SANE_DEBUG_SANEI_SCSI +to 128 and then invoke scanimage or whatever program you're trying to +debug. For a Mustek SCSI scanner at /dev/scanner, you might want to +invoke scanimage as follows: + + scanimage -d mustek:/dev/scanner -h + +If this works, you could try to acquire an image with: + + scanimage -d mustek:/dev/scanner > t.pnm + +If you are not sure what generic SCSI device your scanner is connected +to, try the command sane-find-scanner (sane-utils package). It is +normally sufficient to invoke the program without any arguments. Invoking +this command should produce output similar to this: + + $ sane-find-scanner + sane-find-scanner: found "MUSTEK MFC-06000CZ 1.01" at device /dev/sge + +sane-find-scanner will help you discover your USB scanner, too. + + +REPORTING BUGS +-------------- + +When reporting a bug, be it to the SANE developers or to the Debian bug +tracking system, pleases always provide: + - the full version of libsane + - the backend you're using + - the configuration of the backend + - the debug output, obtained by setting the environment variable + SANE_DEBUG_ to a value of 255 (see above, TROUBLESHOOTING) + +Without that, your bug report will take longer to be processed, because we'll +need to ask you for each of these items. Please help us help you. + + +UNSUPPORTED DEVICES AND SPECIFIC NOTES +-------------------------------------- + +If your scanner (or camera, or whatever) is not supported by the regular +SANE distribution, have a look at the libsane-extras package which contains +some backends not yet included in the regular SANE distribution. + + +-- Julien BLACHE , Tue, 17 Apr 2007 21:28:32 +0200 --- sane-backends-1.0.19.orig/debian/libsane.links +++ sane-backends-1.0.19/debian/libsane.links @@ -0,0 +1 @@ +usr/share/doc/libsane/html/sane-mfgs.html usr/share/doc/libsane/supported.html --- sane-backends-1.0.19.orig/debian/libsane.postrm +++ sane-backends-1.0.19/debian/libsane.postrm @@ -0,0 +1,11 @@ +#!/bin/sh -e + +#DEBHELPER# + +# remove directory /etc/sane.d/ +if [ "$1" = "purge" ]; then + echo "Removing directory /etc/sane.d/ ..." + rmdir --ignore-fail-on-non-empty /etc/sane.d/ +fi + + --- sane-backends-1.0.19.orig/debian/libsane.shlibs +++ sane-backends-1.0.19/debian/libsane.shlibs @@ -0,0 +1 @@ +libsane 1 libsane (>= 1.0.11-3)