luci-0.9: remove luci-diag-* and luci-voice-* from 8.09 for now

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 26db2d02d7045ae57fcaba53af9d5dd495eb77c9..262a7438b056053941298ffecc1ab38db8518ae5 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -516,50 +516,6 @@ define Package/luci-app-statistics/install
        $(call Package/luci/install/template,$(1),applications/luci-statistics)
 endef
 
-define Package/luci-app-diag-core
-  $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-core 
-  TITLE:=LuCI Diagnostics Tools (Core)
-endef
-
-define Package/luci-app-diag-devinfo
-  $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-app-diag-core +smap +netdiscover +mac-to-devinfo +httping +smap-to-devinfo +netdiscover-to-devinfo
-  TITLE:=LuCI Diagnostics Tools (Device Info)
-endef
-
-define Package/luci-app-voice-core
-  $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-core 
-  TITLE:=LuCI Voice Software (Core)
-endef
-
-define Package/luci-app-voice-diag
-  $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-app-voice-core +luci-app-diag-devinfo
-  TITLE:=LuCI Voice Software (Diagnostics)
-endef
-
-define Package/luci-app-diag-devinfo/conffiles
-/etc/config/luci_devinfo
-endef
-
-define Package/luci-app-diag-core/install
-       $(call Package/luci/install/template,$(1),applications/luci-diag-core)
-endef
-
-define Package/luci-app-diag-devinfo/install
-       $(call Package/luci/install/template,$(1),applications/luci-diag-devinfo)
-endef
-
-define Package/luci-app-voice-core/install
-       $(call Package/luci/install/template,$(1),applications/luci-voice-core)
-endef
-
-define Package/luci-app-voice-diag/install
-       $(call Package/luci/install/template,$(1),applications/luci-voice-diag)
-endef
-
 define Package/luci-app-upnp
   $(call Package/luci/webtemplate)
   DEPENDS+=+luci-admin-core +PACKAGE_luci-app-upnp:miniupnpd
@@ -1007,18 +963,6 @@ endif
 ifneq ($(CONFIG_PACKAGE_luci-app-statistics),)
        PKG_SELECTED_MODULES+=applications/luci-statistics
 endif
-ifneq ($(CONFIG_PACKAGE_luci-app-voice-core),)
-       PKG_SELECTED_MODULES+=applications/luci-voice-core
-endif
-ifneq ($(CONFIG_PACKAGE_luci-app-voice-diag),)
-       PKG_SELECTED_MODULES+=applications/luci-voice-diag
-endif
-ifneq ($(CONFIG_PACKAGE_luci-app-diag-core),)
-       PKG_SELECTED_MODULES+=applications/luci-diag-core
-endif
-ifneq ($(CONFIG_PACKAGE_luci-app-diag-devinfo),)
-       PKG_SELECTED_MODULES+=applications/luci-diag-devinfo
-endif
 ifneq ($(CONFIG_PACKAGE_luci-app-upnp),)
        PKG_SELECTED_MODULES+=applications/luci-upnp
 endif
@@ -1171,10 +1115,6 @@ $(eval $(call BuildPackage,luci-app-olsr))
 $(eval $(call BuildPackage,luci-app-qos))
 $(eval $(call BuildPackage,luci-app-splash))
 $(eval $(call BuildPackage,luci-app-statistics))
-$(eval $(call BuildPackage,luci-app-diag-core))
-$(eval $(call BuildPackage,luci-app-diag-devinfo))
-$(eval $(call BuildPackage,luci-app-voice-core))
-$(eval $(call BuildPackage,luci-app-voice-diag))
 $(eval $(call BuildPackage,luci-app-upnp))
 $(eval $(call BuildPackage,luci-app-ntpc))
 $(eval $(call BuildPackage,luci-app-ddns))