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 bd917f0..6509f76 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
 
 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
 
   URL:=http://www.asterisk.org/
 endef
 

diff --git a/contrib/package/cyassl-luci/Makefile b/contrib/package/cyassl-luci/Makefile
index 6d1b6a6..7c23eb4 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)
 
 define Package/libcyassl-luci
   $(call Package/cyassl-luci/Default)

-  SECTION:=libs
-  SUBMENU:=SSL
-  CATEGORY:=Libraries
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=Libraries

   TITLE+= (library)
 endef
 
   TITLE+= (library)
 endef
 

diff --git a/contrib/package/freifunk-p2pblock/Makefile b/contrib/package/freifunk-p2pblock/Makefile
index 0da9a32..3189f0c 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
 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
   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 e4cb550..4876a94 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
 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
   TITLE:=Freifunk Ad-Hoc watchdog daemon
   DEPENDS:=libuci
 endef

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 8107ff7..868f305 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -54,36 +54,36 @@ endef
 ### Templates ###
 
 define Package/luci/libtemplate
 ### 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>
   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)
   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)
   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)
   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)
   DEPENDS:=+luci-web
 endef
 
 define Package/luci/webtemplate
   $(call Package/luci/libtemplate)

-  SUBMENU:=LuCI Components
+  SUBMENU:=Components

 endef
 
 
 endef
 
 


@@ -406,7 +406,7 @@ endef
 
 define Package/luci-mod-freifunk
   $(call Package/luci/fftemplate)
 
 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
 
   TITLE:=LuCI Freifunk module
 endef
 

diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile
index 29c0740..5928dfe 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
 
 
 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>
        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 ee0ac13..82beeb8 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
 $(eval $(call Download,tzcode))
 
 define Package/zoneinfo/default

-  SUBMENU:=Zones (ZoneInfo)
+  SUBMENU:=ZoneInfo

   TITLE:=Zone Information
   TITLE:=Zone Information

-  SECTION:=net
-  CATEGORY:=Network
+  SECTION:=luci
+  CATEGORY:=LuCI

 endef
 
 define Package/zoneinfo-core
 endef
 
 define Package/zoneinfo-core