add dependency on sane-libs to sane-backends, don't package dev shlibs, bump release...

SVN-Revision: 5591

diff --git a/utils/sane-backends/Makefile b/utils/sane-backends/Makefile
index e74409199aae3bcb78b777c2b24309a83fd23811..abccacb9fe2e7abd9ab0a3c947b6567d8b409089 100644 (file)
--- a/utils/sane-backends/Makefile
+++ b/utils/sane-backends/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sane-backends
 PKG_VERSION:=1.0.17
 
 PKG_NAME:=sane-backends
 PKG_VERSION:=1.0.17

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.sane-project.org/pub/sane/$(PKG_NAME)-$(PKG_VERSION)/
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.sane-project.org/pub/sane/$(PKG_NAME)-$(PKG_VERSION)/


@@ -22,28 +22,28 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

+define Package/sane-backends/Default
+  TITLE:=Scanner Access Now Easy
+  DESCRIPTION:=\
+       SANE (Scanner Access Now Easy) is a universal scanner interface.
+  URL:=http://www.sane-project.org/
+endef
+

 define Package/sane-backends
 define Package/sane-backends

+  $(call Package/sane-backends/Default)

   SECTION:=utils
   CATEGORY:=Utilities
   SECTION:=utils
   CATEGORY:=Utilities

-  TITLE:=Scanner Access Now Easy (backends)
-  DESCRIPTION:=\
-       SANE (Scanner Access Now Easy) is a universal scanner interface.
-  URL:=http://www.sane-project.org
+  DEPENDS:=+sane-libs
+  TITLE+= (backends)

 endef
 
 define Package/sane-libs
 endef
 
 define Package/sane-libs

- SECTION:=libs
- CATEGORY:=Libraries
- TITLE:=Scanner Access Now Easy (libraries)
- DESCRIPTION:=\
-       SANE (Scanner Access Now Easy) is a universal scanner interface.
- URL:=http://www.sane-project.org
+  $(call Package/sane-backends/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= (libraries)

 endef
  
 endef
  

-define Package/sane-backends/conffiles
-/etc/sane.d/saned.conf
-endef
-

 define Build/Configure
        $(call Build/Configure/Default, \
                --disable-ipv6 \
 define Build/Configure
        $(call Build/Configure/Default, \
                --disable-ipv6 \


@@ -59,6 +59,10 @@ define Build/Compile
                all install
 endef
 
                all install
 endef
 

+define Package/sane-backends/conffiles
+/etc/sane.d/saned.conf
+endef
+

 define Package/sane-backends/install   
        install -d -m0755 $(1)/etc/sane.d
        $(CP) $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(1)/etc/sane.d/
 define Package/sane-backends/install   
        install -d -m0755 $(1)/etc/sane.d
        $(CP) $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(1)/etc/sane.d/


@@ -67,8 +71,10 @@ define Package/sane-backends/install
 endef
 
 define Package/sane-libs/install
 endef
 
 define Package/sane-libs/install

-       install -d -m0755 $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+       install -d -m0755 $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsane.so.* $(1)/usr/lib/
+       install -d -m0755 $(1)/usr/lib/sane
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/sane/libsane-*.so.* $(1)/usr/lib/sane/

 endef
 
 $(eval $(call BuildPackage,sane-backends))
 endef
 
 $(eval $(call BuildPackage,sane-backends))