uci: sync with trunk

backport of r35013, r33861, r33660

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@35195 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/uci/Makefile b/package/uci/Makefile
index 06dbe88..029e636 100644 (file)
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -7,20 +7,25 @@
 
 include $(TOPDIR)/rules.mk
 
-UCI_VERSION=2012-03-28
+UCI_VERSION=2013-01-04
 UCI_RELEASE=1
 
 PKG_NAME:=uci
 PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
 PKG_RELEASE:=1
-PKG_REV:=af2665866061c63ba63335b43aa6ff5102d4e492
+PKG_REV:=e4516d01a7d2b0a5a8def7b5791c7d4032138287
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=git://nbd.name/uci.git
 PKG_SOURCE_SUBDIR:=uci-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=git
-PKG_MIRROR_MD5SUM:=0ee76d8f79cf99f5539fd090a4e65646
+PKG_MIRROR_MD5SUM:=c7c4fd6723b607ae7fa039a1078fe7d5
+
+PKG_LICENSE:=LGPLv2.1 GPLv2
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 
 PKG_BUILD_PARALLEL:=0
 
@@ -79,7 +84,6 @@ define Build/InstallDev
        $(CP) $(PKG_BUILD_DIR)/uci{,_config,map}.h $(1)/usr/include
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/libuci.a $(1)/usr/lib
        $(CP) $(PKG_BUILD_DIR)/libucimap.a $(1)/usr/lib
 endef