luci-0.11: merge outstanding trunk changes

[project/luci.git] / contrib / package / freifunk-p2pblock / Makefile

diff --git a/contrib/package/freifunk-p2pblock/Makefile b/contrib/package/freifunk-p2pblock/Makefile
index 918d6a95eae179ea7555ecc87b9ee45609945a6e..6bf3a9610412b3290036d7c0992786cc5351f04e 100644 (file)
--- a/contrib/package/freifunk-p2pblock/Makefile
+++ b/contrib/package/freifunk-p2pblock/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2009 Andreas Seidler <tetzlav@subsignal.org>
+# Copyright (C) 2012 Jo-Philipp Wich <xm@subsignal.org>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,17 +9,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-p2pblock
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/freifunk-p2pblock
-  SECTION:=net
-  CATEGORY:=Network
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=9. Freifunk
   TITLE:=Freifunk p2pblock Addon
-  DEPENDS:=+iptables-mod-filter +l7-protocols +iptables-mod-conntrack-extra
+  DEPENDS:=+iptables-mod-filter +iptables-mod-ipp2p +l7-protocols +iptables-mod-conntrack-extra
 endef
 
 define Package/freifunk-p2pblock/description
@@ -40,7 +42,7 @@ define Package/freifunk-p2pblock/install
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/freifunk-p2pblock.init $(1)/etc/init.d/freifunk-p2pblock
        $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_BIN) ./files/freifunk-p2pblock.config $(1)/etc/config/freifunk-p2pblock
+       $(INSTALL_DATA) ./files/freifunk-p2pblock.config $(1)/etc/config/freifunk_p2pblock
 endef
 
 $(eval $(call BuildPackage,freifunk-p2pblock))