packages: sane-backends/sane-backends-link.patch, sane-backends/sane-backen...
qboosh
qboosh at pld-linux.org
Sun Nov 7 18:52:09 CET 2010
Author: qboosh Date: Sun Nov 7 17:52:09 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.0.21
- added link patch, updated pl.po-update patch
- hp_rts88xx addon backend already obsoleted by upstream hp3500+rts8891
- added upstream i18n patch
- enable pthread (needed by mustek_usb2 backend)
- separated v4l backend (libv4l dependency)
- -devel R: libusb-devel, libieee1284-devel (but not libv4l-devel)
---- Files affected:
packages/sane-backends:
sane-backends-link.patch (1.13 -> 1.14) , sane-backends-pl.po-update.patch (1.4 -> 1.5) , sane-backends.spec (1.131 -> 1.132) , sane-backends-1.0.21-i18n.patch (NONE -> 1.1) (NEW), sane-backends-hp_rts88xx-fixes.patch (1.4 -> NONE) (REMOVED), sane-backends-hp_rts88xx.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/sane-backends/sane-backends-link.patch
diff -u packages/sane-backends/sane-backends-link.patch:1.13 packages/sane-backends/sane-backends-link.patch:1.14
--- packages/sane-backends/sane-backends-link.patch:1.13 Sat May 31 00:22:20 2008
+++ packages/sane-backends/sane-backends-link.patch Sun Nov 7 18:52:04 2010
@@ -1,497 +1,31 @@
-diff -urbB sane-backends-1.0.16.org/acinclude.m4 sane-backends-1.0.16/acinclude.m4
---- sane-backends-1.0.16.org/acinclude.m4 2005-07-30 15:59:53.000000000 +0200
-+++ sane-backends-1.0.16/acinclude.m4 2005-08-09 18:07:30.781728672 +0200
-@@ -184,16 +184,18 @@
- # Checks for ieee1284 library, needed for canon_pp backend.
- AC_DEFUN([SANE_CHECK_IEEE1284],
- [
-+ IEEE1284_LIBS=
- AC_CHECK_HEADER(ieee1284.h, [
- AC_CACHE_CHECK([for libieee1284 >= 0.1.5], sane_cv_use_libieee1284, [
- AC_TRY_COMPILE([#include <ieee1284.h>], [
- 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"; IEEE1284_LIBS="-lieee1284"
- ],[sane_cv_use_libieee1284="no"])
- ],)
- ],)
-+ AC_SUBST(IEEE1284_LIBS)
- if test "$sane_cv_use_libieee1284" = "yes" ; then
- AC_DEFINE(HAVE_LIBIEEE1284,1,[Define to 1 if you have the `ieee1284' library (-lcam).])
- fi
-@@ -244,6 +246,7 @@
- # GPHOTO2 backends.
- AC_DEFUN([SANE_CHECK_JPEG],
- [
-+ JPEG_LIBS=
- AC_CHECK_LIB(jpeg,jpeg_start_decompress,
- [
- AC_CHECK_HEADER(jconfig.h,
-@@ -255,10 +258,11 @@
- #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"; JPEG_LIBS="-ljpeg";
- AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
- ],)
- ],)
-+ AC_SUBST(JPEG_LIBS)
- ])
-
- #
-@@ -283,11 +283,13 @@
- # Checks for tiff library dell1600n_net backend.
- AC_DEFUN([SANE_CHECK_TIFF],
- [
-+ TIFF_LIBS=
- AC_CHECK_LIB(tiff,TIFFFdOpen,
- [
- AC_CHECK_HEADER(tiffio.h,
-- [sane_cv_use_libtiff="yes"; LIBS="${LIBS} -ltiff"],)
-+ [sane_cv_use_libtiff="yes"; TIFF_LIBS="-ltiff"],)
- ],)
-+ AC_SUBST(TIFF_LIBS)
- ])
-
- #
-@@ -404,6 +410,7 @@
-
- ])
-
-+ GPHOTO2_LIBS=
- # If --with-gphoto2=yes (or not supplied), first check if
- # pkg-config exists, then use it to check if libgphoto2 is
- # present. If all that works, then see if we can actually link
-@@ -428,14 +435,14 @@
- 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="${saved_LIBS}"
- else
- HAVE_GPHOTO2=false
- fi
- fi
- fi
--
-+ AC_SUBST(GPHOTO2_LIBS)
- ])
-
- #
---- sane-backends-1.0.18/backend/Makefile.in.orig 2005-07-30 14:28:10.000000000 +0200
-+++ sane-backends-1.0.18/backend/Makefile.in 2005-09-22 12:22:51.000000000 +0200
-@@ -165,6 +165,341 @@
-
- .PHONY: all clean depend dist distclean install uninstall
-
-+libsane-abaton.la: abaton.lo abaton-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-agfafocus.la: agfafocus.lo agfafocus-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-apple.la: apple.lo apple-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-artec.la: artec.lo artec-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-artec_eplus48u.la: artec_eplus48u.lo artec_eplus48u-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-avision.la: avision.lo avision-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-bh.la: bh.lo bh-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-canon.la: canon.lo canon-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-canon630u.la: canon630u.lo canon630u-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-canon_pp.la: canon_pp.lo canon_pp-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @IEEE1284_LIBS@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-cardscan.la: cardscan.lo cardscan-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-coolscan.la: coolscan.lo coolscan-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-coolscan2.la: coolscan2.lo coolscan2-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-dc210.la: dc210.lo dc210-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @JPEG_LIBS@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-dc240.la: dc240.lo dc240-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @JPEG_LIBS@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-dell1600n_net.la: dell1600n_net.lo dell1600n_net-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @TIFF_LIBS@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-dmc.la: dmc.lo dmc-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-epson.la: epson.lo epson-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-epson2.la: epson2.lo epson2-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-epjitsu.la: epjitsu.lo epjitsu-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-fujitsu.la: fujitsu.lo fujitsu-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-genesys.la: genesys.lo genesys-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-gphoto2.la: gphoto2.lo gphoto2-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @GPHOTO2_LIBS@ @JPEG_LIBS@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-gt68xx.la: gt68xx.lo gt68xx-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-hp.la: hp.lo hp-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-hp3500.la: hp3500.lo hp3500-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-hp3900.la: hp3900.lo hp3900-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ @TIFF_LIBS@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-hp4200.la: hp4200.lo hp4200-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-hp5400.la: hp5400.lo hp5400-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-hp5590.la: hp5590.lo hp5590-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-hpljm1005.la: hpljm1005.lo hpljm1005-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-hpsj5s.la: hpsj5s.lo hpsj5s-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @IEEE1284_LIBS@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-hs2p.la: hs2p.lo hs2p-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-ibm.la: ibm.lo ibm-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-leo.la: leo.lo leo-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-lexmark.la: lexmark.lo lexmark-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-ma1509.la: ma1509.lo ma1509-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-matsushita.la: matsushita.lo matsushita-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-microtek.la: microtek.lo microtek-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-microtek2.la: microtek2.lo microtek2-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-mustek.la: mustek.lo mustek-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @IEEE1284_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-mustek_pp.la: mustek_pp.lo mustek_pp-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @IEEE1284_LIBS@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-mustek_usb.la: mustek_usb.lo mustek_usb-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-mustek_usb2.la: mustek_usb2.lo mustek_usb2-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-nec.la: nec.lo nec-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-niash.la: niash.lo niash-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-pie.la: pie.lo pie-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-pixma.la: pixma.lo pixma-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-plustek.la: plustek.lo plustek-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-plustek_pp.la: plustek_pp.lo plustek_pp-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @IEEE1284_LIBS@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-ricoh.la: ricoh.lo ricoh-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-s9036.la: s9036.lo s9036-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-sceptre.la: sceptre.lo sceptre-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-sharp.la: sharp.lo sharp-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-sm3600.la: sm3600.lo sm3600-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-sm3840.la: sm3840.lo sm3840-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-snapscan.la: snapscan.lo snapscan-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-sp15c.la: sp15c.lo sp15c-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-st400.la: st400.lo st400-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-stv680.la: stv680.lo stv680-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-tamarack.la: tamarack.lo tamarack-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-teco1.la: teco1.lo teco1-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-teco2.la: teco2.lo teco2-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-teco3.la: teco3.lo teco3-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-u12.la: u12.lo u12-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-umax.la: umax.lo umax-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
-+libsane-umax1220u.la: umax1220u.lo umax1220u-s.lo $(EXTRA) $(LIBOBJS)
-+ $(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) @USB_LIBS@ @LIBRESMGR@ \
-+ $(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
-+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
-+
- libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS)
- @$(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) \
- $(LDFLAGS) $(BACKENDLIBS) $^ @LIBTOOL_LINK_EXTRA@ -rpath $(libsanedir) \
-@@ -618,7 +618,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) $^ \
- $(addsuffix .lo,$(DLL_PRELOAD_EXTRAS)) @LIBTOOL_LINK_EXTRA@ \
- -rpath $(libdir) -version-info $(V_MAJOR):$(V_REV):$(V_MINOR)
-
---- sane-backends-1.0.16/configure.in.orig 2005-08-07 11:49:48.000000000 +0200
-+++ sane-backends-1.0.16/configure.in 2005-09-22 11:29:35.000000000 +0200
-@@ -128,15 +128,17 @@
-
- SANE_CHECK_MISSING_HEADERS
-
-+LIBRESMGR=
- AC_CHECK_HEADER(resmgr.h,[
- AC_CHECK_LIB(
- resmgr,
- rsm_open_device,[
- AC_DEFINE(HAVE_RESMGR,1,[define if you have the resmgr library])
-- LIBS="$LIBS -lresmgr"
-+ LIBRESMGR="-lresmgr"
- ]
- )
- ])
-+AC_SUBST(LIBRESMGR)
-
- dnl ***********************************************************************
- dnl Checks for types and structures
-@@ -261,10 +263,15 @@
-
- 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
-+ USB_LIBS=
-+ save_LIBS="$LIBS"
- AC_CHECK_LIB(usb, usb_interrupt_read)
-+ LIBS="$save_LIBS"
- if test "${ac_cv_lib_usb_usb_interrupt_read}" = "yes" ; then
- HAVE_LIBUSB="yes"
-+ USB_LIBS="-lusb"
- fi
-+ AC_SUBST(USB_LIBS)
- fi
-
- dnl disable Linux SCSI generic version 3 to avoid 32/64 bit problems
---- sane-backends-1.0.16/tools/Makefile.in.orig 2005-07-17 13:53:42.000000000 +0200
-+++ sane-backends-1.0.16/tools/Makefile.in 2005-09-22 11:48:57.000000000 +0200
-@@ -95,7 +95,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) @USB_LIBS@ @IEEE1284_LIBS@ @LIBRESMGR@
-
- gamma4scanimage: gamma4scanimage.o
- @$(LIBTOOL) $(MLINK) $(LINK) gamma4scanimage.o -lm
---- sane-backends-1.0.19/sanei/Makefile.in.orig 2008-02-03 07:59:36.000000000 +0100
-+++ sane-backends-1.0.19/sanei/Makefile.in 2008-05-30 21:40:36.179802265 +0200
-@@ -82,7 +82,7 @@
- $(COMPILE) $<
-
- .c.lo:
-- @$(LIBTOOL) $(MCOMP) $(COMPILE) -static $<
-+ $(LIBTOOL) $(MCOMP) $(COMPILE) $<
-
- all: $(TARGETS)
+--- sane-backends-1.0.21/backend/Makefile.am.orig 2010-11-06 21:29:14.551101613 +0100
++++ sane-backends-1.0.21/backend/Makefile.am 2010-11-07 10:26:58.167102452 +0100
+@@ -293,7 +293,7 @@
+ nodist_libsane_artec_eplus48u_la_SOURCES = artec_eplus48u-s.c
+ libsane_artec_eplus48u_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=artec_eplus48u
+ libsane_artec_eplus48u_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
+-libsane_artec_eplus48u_la_LIBADD = $(COMMON_LIBS) libartec_eplus48u.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_thread.lo $(MATH_LIB) $(USB_LIBS) $(PTHREAD_LIBS) $(RESMEG_LIBS)
++libsane_artec_eplus48u_la_LIBADD = $(COMMON_LIBS) libartec_eplus48u.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_thread.lo $(MATH_LIB) $(USB_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
+ EXTRA_DIST += artec_eplus48u.conf.in
+
+ libas6e_la_SOURCES = as6e.c as6e.h
+@@ -1089,7 +1089,7 @@
+ nodist_libsane_la_SOURCES = dll-s.c
+ libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
+ libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
+-libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo $(DL_LIBS) $(LIBV4L_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(GPHOTO2_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(AVAHI_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
++libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo $(DL_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
+
+ # WARNING: Automake is getting this wrong so have to do it ourselves.
+ libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo @SANEI_SANEI_JPEG_LO@
+--- sane-backends-1.0.21/tools/Makefile.am.orig 2010-04-05 15:18:06.000000000 +0200
++++ sane-backends-1.0.21/tools/Makefile.am 2010-11-07 11:59:31.659094909 +0100
+@@ -32,7 +32,7 @@
+ sane_find_scanner_SOURCES = sane-find-scanner.c check-usb-chip.c \
+ ../backend/sane_strstatus.c
+ sane_find_scanner_LDADD = ../sanei/libsanei.la ../lib/liblib.la \
+- @USB_LIBS@ @IEEE1284_LIBS@ @SCSI_LIBS@
++ @USB_LIBS@ @IEEE1284_LIBS@ @SCSI_LIBS@ @RESMGR_LIBS@
+ gamma4scanimage_SOURCES = gamma4scanimage.c
+ gamma4scanimage_LDADD = @MATH_LIB@
================================================================
Index: packages/sane-backends/sane-backends-pl.po-update.patch
diff -u packages/sane-backends/sane-backends-pl.po-update.patch:1.4 packages/sane-backends/sane-backends-pl.po-update.patch:1.5
--- packages/sane-backends/sane-backends-pl.po-update.patch:1.4 Sat May 31 00:22:20 2008
+++ packages/sane-backends/sane-backends-pl.po-update.patch Sun Nov 7 18:52:04 2010
@@ -1,924 +1,2853 @@
---- sane-backends-1.0.19/po/sane-backends.pl.po.orig 2007-12-19 11:47:04.000000000 +0100
-+++ sane-backends-1.0.19/po/sane-backends.pl.po 2008-05-30 18:27:05.190143919 +0200
-@@ -1,12 +1,12 @@
+--- sane-backends-1.0.21/po/pl.po.orig 2010-04-05 15:18:05.000000000 +0200
++++ sane-backends-1.0.21/po/pl.po 2010-11-06 21:27:30.311104966 +0100
+@@ -1,15 +1,16 @@
# Polish translation for SANE backend options
# Copyright (c) 2002-2003 Piotr Gogolewski
# Piotr Gogolewski <docent at panoramix.net.pl>, 2003-2005.
-# Jakub Bogusz <qboosh at pld-linux.org>, 2005-2006.
-+# Jakub Bogusz <qboosh at pld-linux.org>, 2005-2008.
++# Jakub Bogusz <qboosh at pld-linux.org>, 2005-2010.
msgid ""
msgstr ""
-"Project-Id-Version: sane-backends 1.0.18\n"
-+"Project-Id-Version: sane-backends 1.0.19\n"
++"Project-Id-Version: sane-backends 1.0.21\n"
"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2007-12-17 22:31+0100\n"
-+"POT-Creation-Date: 2008-05-30 17:50+0200\n"
- "PO-Revision-Date: 2007-12-17 23:03+0100\n"
+-"POT-Creation-Date: 2010-02-27 20:43-0500\n"
+-"PO-Revision-Date: 2007-12-17 23:03+0100\n"
++"POT-Creation-Date: 2010-04-25 21:48-0400\n"
++"PO-Revision-Date: 2010-11-06 19:33+0100\n"
"Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
-@@ -213,39 +213,39 @@
- #: .tmp/canon.c:146 .tmp/canon-sane.c:1323
++"Language: pl\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+@@ -22,13 +23,12 @@
+ #: ../include/sane/saneopts.h:156
+ #, no-c-format
+ msgid "Standard"
+-msgstr ""
++msgstr "Standardowe"
+
+ #: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
+-#: ../backend/epson.c:3284 ../backend/epson2.c:1269
+-#: ../backend/genesys.c:5527 ../backend/gt68xx.c:703
+-#: ../backend/hp3500.c:975 ../backend/hp-option.c:3297
+-#: ../backend/leo.c:823 ../backend/lexmark.c:189 ../backend/ma1509.c:551
++#: ../backend/epson.c:3284 ../backend/epson2.c:1269 ../backend/genesys.c:5554
++#: ../backend/gt68xx.c:703 ../backend/hp3500.c:975 ../backend/hp-option.c:3297
++#: ../backend/leo.c:823 ../backend/lexmark.c:190 ../backend/ma1509.c:551
+ #: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
+ #: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
+ #: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:144
+@@ -42,23 +42,22 @@
+ msgstr "Krawędzie obszaru skanowania"
+
+ #: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
+-#: ../backend/canon.c:1492 ../backend/genesys.c:5578
+-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
+-#: ../backend/leo.c:871 ../backend/ma1509.c:599
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sane-backends/sane-backends-link.patch?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sane-backends/sane-backends-pl.po-update.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sane-backends/sane-backends.spec?r1=1.131&r2=1.132&f=u
More information about the pld-cvs-commit
mailing list