contrib/package: reorganize menu structure and move everything to an own LuCI categor...

diff --git a/contrib/package/asterisk-xip/Makefile b/contrib/package/asterisk-xip/Makefile
index bd917f09b9e69116f2f1edac780f02fd5eefd236..6509f7685db5fff0f13eabe6771a841e066e3694 100644 (file)
--- a/contrib/package/asterisk-xip/Makefile
+++ b/contrib/package/asterisk-xip/Makefile
@@ -35,8 +35,9 @@ STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar, \
 
 define Package/asterisk14-xip/Default
   SUBMENU:=asterisk14-xip (Complete Open Source PBX), v1.4.x
-  SECTION:=net
-  CATEGORY:=Network
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=Asterisk
   URL:=http://www.asterisk.org/
 endef
 

diff --git a/contrib/package/cyassl-luci/Makefile b/contrib/package/cyassl-luci/Makefile
index 6d1b6a655bdb72136a8678e425a48e164e9e2a03..7c23eb4b79df35e684dcf32e4de9cc667137b1a9 100644 (file)
--- a/contrib/package/cyassl-luci/Makefile
+++ b/contrib/package/cyassl-luci/Makefile
@@ -27,9 +27,9 @@ endef
 
 define Package/libcyassl-luci
   $(call Package/cyassl-luci/Default)
-  SECTION:=libs
-  SUBMENU:=SSL
-  CATEGORY:=Libraries
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=Libraries
   TITLE+= (library)
 endef
 

diff --git a/contrib/package/freifunk-p2pblock/Makefile b/contrib/package/freifunk-p2pblock/Makefile
index 0da9a32ffa881e49cc097810f12132f48fef0731..3189f0c8994d1d82441ac976122270690bc06493 100644 (file)
--- a/contrib/package/freifunk-p2pblock/Makefile
+++ b/contrib/package/freifunk-p2pblock/Makefile
@@ -15,8 +15,9 @@ 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:=Freifunk
   TITLE:=Freifunk p2pblock Addon
   DEPENDS:=+iptables-mod-filter +l7-protocols +iptables-mod-conntrack-extra
 endef

diff --git a/contrib/package/freifunk-watchdog/Makefile b/contrib/package/freifunk-watchdog/Makefile
index e4cb550f6cca7858713ac4352f352a54dc5e4bc8..4876a94de13077942436e04d0257d54915133d8d 100644 (file)
--- a/contrib/package/freifunk-watchdog/Makefile
+++ b/contrib/package/freifunk-watchdog/Makefile
@@ -16,8 +16,9 @@ PKG_BUILD_DEPENDS := uci
 include $(INCLUDE_DIR)/package.mk
 
 define Package/freifunk-watchdog
-  SECTION:=utils
-  CATEGORY:=Utilities
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=Freifunk
   TITLE:=Freifunk Ad-Hoc watchdog daemon
   DEPENDS:=libuci
 endef

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 8107ff7bb004a9c0fe3bf69e30fb02dc5e02b29f..868f305060e6dbdf41c11fc74fb23b9bf74cb0f2 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -54,36 +54,36 @@ endef
 ### Templates ###
 
 define Package/luci/libtemplate
-  SECTION:=admin
-  CATEGORY:=Administration
+  SECTION:=luci
+  CATEGORY:=LuCI
   TITLE:=LuCI - Lua Configuration Interface
   URL:=http://luci.freifunk-halle.net/
   MAINTAINER:=Steven Barth <steven-at-midlink-dot-org>
-  SUBMENU:=LuCI Libraries
+  SUBMENU:=Libraries
   DEPENDS:=+luci-core
 endef
 
 define Package/luci/fftemplate
   $(call Package/luci/libtemplate)
-  SUBMENU:=LuCI Freifunk Support
+  SUBMENU:=Freifunk
   DEPENDS:=+luci-mod-freifunk
 endef
 
 define Package/luci/i18ntemplate
   $(call Package/luci/libtemplate)
-  SUBMENU:=LuCI Translations
+  SUBMENU:=Translations
   DEPENDS:=+luci-web
 endef
 
 define Package/luci/thtemplate
   $(call Package/luci/libtemplate)
-  SUBMENU:=LuCI Themes
+  SUBMENU:=Themes
   DEPENDS:=+luci-web
 endef
 
 define Package/luci/webtemplate
   $(call Package/luci/libtemplate)
-  SUBMENU:=LuCI Components
+  SUBMENU:=Components
 endef
 
 
@@ -406,7 +406,7 @@ endef
 
 define Package/luci-mod-freifunk
   $(call Package/luci/fftemplate)
-  DEPENDS:=+luci-admin-full +luci-json
+  DEPENDS:=+luci-admin-full +luci-json +PACKAGE_luci-mod-freifunk:freifunk-firewall
   TITLE:=LuCI Freifunk module
 endef
 

diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile
index 29c0740aa6a77914bdc358404c9ebe51debc1b05..5928dfe02ebb200e82ebc97316b088e2ebcb2629 100644 (file)
--- a/contrib/package/olsrd-luci/Makefile
+++ b/contrib/package/olsrd-luci/Makefile
@@ -33,8 +33,9 @@ include $(INCLUDE_DIR)/package.mk
 
 
 define Package/olsrd-luci/common_info
-       SECTION:=net
-       CATEGORY:=Network
+       SECTION:=luci
+       CATEGORY:=LuCI
+       SUBMENU:=Freifunk
        TITLE:=OLSR - Optimized Link State Routing Daemon
        URL:=http://www.olsr.org/
        MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>

diff --git a/contrib/package/zoneinfo/Makefile b/contrib/package/zoneinfo/Makefile
index ee0ac13d89b34016b9b03043bfb872dfa6bea94e..82beeb82e488222a15ef9586d6ce9b4aaf818ec9 100644 (file)
--- a/contrib/package/zoneinfo/Makefile
+++ b/contrib/package/zoneinfo/Makefile
@@ -30,10 +30,10 @@ endef
 $(eval $(call Download,tzcode))
 
 define Package/zoneinfo/default
-  SUBMENU:=Zones (ZoneInfo)
+  SUBMENU:=ZoneInfo
   TITLE:=Zone Information
-  SECTION:=net
-  CATEGORY:=Network
+  SECTION:=luci
+  CATEGORY:=LuCI
 endef
 
 define Package/zoneinfo-core