From: acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 10 Aug 2009 23:33:14 +0000 (+0000)
Subject: [packages] sane-backends: Update to v1.0.20 (closes #5662)
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=e59080c3ca25a4c181190ebc91a3a9c9e7038429;p=packages.git

[packages] sane-backends: Update to v1.0.20 (closes #5662)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@17213 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/utils/sane-backends/Makefile b/utils/sane-backends/Makefile
index fc6bf3dd9..cef7efe74 100644
--- a/utils/sane-backends/Makefile
+++ b/utils/sane-backends/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sane-backends
-PKG_VERSION:=1.0.19
-PKG_RELEASE:=3
+PKG_VERSION:=1.0.20
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.sane-project.org/pub/sane/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_MD5SUM:=8c0936272dcfd4e98c51512699f1c06f
+PKG_MD5SUM:=a0cfdfdebca2feb4f2ba5d3418b15a42
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -51,7 +51,7 @@ define Package/sane-libs/description
 $(call Package/sane-backends/Default/description)
  This package contains the SANE shared libraries.
 endef
- 
+
 define Package/sane-frontends
   $(call Package/sane-backends/Default)
   SECTION:=utils
@@ -64,7 +64,7 @@ define Package/sane-frontends/description
 $(call Package/sane-backends/Default/description)
  This package contains the SANE frontends.
 endef
- 
+
 CONFIGURE_ARGS+= \
 	--enable-shared \
 	--enable-static \
@@ -72,7 +72,7 @@ CONFIGURE_ARGS+= \
 	--without-gphoto2 \
 	--disable-debug \
 
-define Build/Compile	
+define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
@@ -84,7 +84,7 @@ endef
 
 define Package/sane-backends/install
 	$(INSTALL_DIR) $(1)/etc/sane.d
-	$(CP) $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(1)/etc/sane.d/
+	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(1)/etc/sane.d/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
 endef
diff --git a/utils/sane-backends/patches/001-remove-unneeded.patch b/utils/sane-backends/patches/001-remove-unneeded.patch
index f398984d1..ec45a4e12 100644
--- a/utils/sane-backends/patches/001-remove-unneeded.patch
+++ b/utils/sane-backends/patches/001-remove-unneeded.patch
@@ -1,12 +1,11 @@
-diff -Nur sane-backends-1.0.16/Makefile.in sane-backends-1.0.16.patched/Makefile.in
---- sane-backends-1.0.16/Makefile.in	2005-07-17 13:52:54.000000000 +0200
-+++ sane-backends-1.0.16.patched/Makefile.in	2005-12-17 00:28:38.144022500 +0100
-@@ -33,7 +33,7 @@
- 
- @SET_MAKE@
- 
--SUBDIRS	= include lib sanei backend frontend tools doc po
-+SUBDIRS	= include lib sanei backend frontend
- 
- DISTFILES = AUTHORS COPYING ChangeLog ChangeLog-1.0.0 ChangeLog-1.0.1 \
-   ChangeLog-1.0.2 ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -244,7 +244,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = include lib sanei backend frontend tools doc po
++SUBDIRS = include lib sanei backend frontend
+ DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite
+ dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \
+  README README.aix README.beos README.darwin README.djpeg README.freebsd \