luci-0.8: merge r3854

diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile
index 8bb33499055e7971e8a6c4b335b5c1906a0888cb..9928c546e460bf58a88fa0382b5296b9bdca453e 100644 (file)
--- a/contrib/package/olsrd-luci/Makefile
+++ b/contrib/package/olsrd-luci/Makefile
@@ -11,19 +11,19 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASENAME:=olsrd
 PKG_NAME:=$(PKG_BASENAME)-luci
-PKG_VERSION:=0.5.6-r2+hg1724
-PKG_RELEASE:=2
-
-PKG_HGREV:=cac1df64dcd5
-PKG_SOURCE:=$(PKG_HGREV).tar.gz
-PKG_SOURCE_URL:=http://gredler.at/hg/olsrd-0.5.6/archive
-PKG_MD5SUM:=95af2d8d6075f74d379b752fb8dda3de
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_BASENAME)-0-5-6-$(PKG_HGREV)
-
-#PKG_SOURCE:=$(PKG_BASENAME)-$(PKG_VERSION).tar.bz2
-#PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5
-#PKG_MD5SUM:=64b439cde30f48764f02cdd8766aba40
-#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_BASENAME)-$(PKG_VERSION)
+PKG_VERSION:=0.5.6-r3
+PKG_RELEASE:=1
+
+#PKG_HGREV:=cac1df64dcd5
+#PKG_SOURCE:=$(PKG_HGREV).tar.gz
+#PKG_SOURCE_URL:=http://gredler.at/hg/olsrd-0.5.6/archive
+#PKG_MD5SUM:=95af2d8d6075f74d379b752fb8dda3de
+#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_BASENAME)-0-5-6-$(PKG_HGREV)
+
+PKG_SOURCE:=$(PKG_BASENAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5
+PKG_MD5SUM:=0935688fa0fb5b0e073fe53ec654c5b2
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_BASENAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk