SOURCES (DEVEL): sane-backends-link.patch, sane-backends-locale-na...

[saq]

Author: saq                          Date: Fri Aug  5 23:33:21 2005 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- updated for 20050805

---- Files affected:
SOURCES:
   sane-backends-link.patch (1.7 -> 1.7.2.1) , sane-backends-locale-names.patch (1.2 -> 1.2.2.1) 

---- Diffs:

================================================================
Index: SOURCES/sane-backends-link.patch
diff -u SOURCES/sane-backends-link.patch:1.7 SOURCES/sane-backends-link.patch:1.7.2.1
--- SOURCES/sane-backends-link.patch:1.7	Mon Nov  8 00:54:04 2004
+++ SOURCES/sane-backends-link.patch	Sat Aug  6 01:33:16 2005
@@ -69,7 +69,7 @@
  #
 --- sane-backends-1.0.14/backend/Makefile.in.orig	Mon Nov 10 19:15:47 2003
 +++ sane-backends-1.0.14/backend/Makefile.in	Fri Nov 28 13:29:02 2003
-@@ -153,6 +153,141 @@
+@@ -153,6 +153,151 @@
  
  .PHONY: all clean depend dist distclean install uninstall
  
@@ -123,6 +123,11 @@
 +	$(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@ \
++	$(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) \
@@ -188,6 +193,11 @@
 +	$(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@ \
++	$(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@ \
 +	$(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
@@ -225,13 +235,13 @@
 +++ sane-backends-1.0.12-pre1/configure.in	Sun Feb  2 00:31:03 2003
 @@ -203,10 +203,15 @@
  
- dnl we need both libusb header and a libusb providing usb_get_busses
+ 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_get_busses)
+   AC_CHECK_LIB(usb, usb_interrupt_read)
 +  LIBS="$save_LIBS"
-   if test "${ac_cv_lib_usb_usb_get_busses}" = "yes" ; then
+   if test "${ac_cv_lib_usb_usb_interrupt_read}" = "yes" ; then
      HAVE_LIBUSB="yes"
 +    USB_LIBS="-lusb"
    fi

================================================================
Index: SOURCES/sane-backends-locale-names.patch
diff -u SOURCES/sane-backends-locale-names.patch:1.2 SOURCES/sane-backends-locale-names.patch:1.2.2.1
--- SOURCES/sane-backends-locale-names.patch:1.2	Mon Nov  8 00:54:04 2004
+++ SOURCES/sane-backends-locale-names.patch	Sat Aug  6 01:33:16 2005
@@ -4,8 +4,8 @@
  #
  # See po/README for documentation.
  
--ALL_LINGUAS = bg cs da de es fi fr it nl no pt ru sv 
-+ALL_LINGUAS = bg cs da de es fi fr it nl nb pt ru sv 
+-ALL_LINGUAS = bg cs da de es fi fr it nl no pl pt ru sv 
++ALL_LINGUAS = bg cs da de es fi fr it nl nb pl pt ru sv 
  
  SRC_FILES = ../include/sane/saneopts.h ../backend/artec_eplus48u.c \
    ../backend/avision.h \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/sane-backends-link.patch?r1=1.7&r2=1.7.2.1&f=u
    http://cvs.pld-linux.org/SOURCES/sane-backends-locale-names.patch?r1=1.2&r2=1.2.2.1&f=u