Standardize package Config.in, change prompt to package name + short description...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@957 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/ulogd/Config.in b/package/ulogd/Config.in
index b6ef195..da0a347 100644 (file)
--- a/package/ulogd/Config.in
+++ b/package/ulogd/Config.in
@@ -1,20 +1,22 @@
 config BR2_PACKAGE_ULOGD
 config BR2_PACKAGE_ULOGD

-       tristate "ulogd - netfilter userspace logging daemon"
+       tristate "ulogd - Netfilter userspace logging daemon"

        default m if CONFIG_DEVEL
        default m if CONFIG_DEVEL

+       select BR2_PACKAGE_IPTABLES

        help
          The netfilter userspace logging daemon
          
          http://gnumonks.org/projects/ulogd
          
        help
          The netfilter userspace logging daemon
          
          http://gnumonks.org/projects/ulogd
          

-config BR2_PACKAGE_ULOGD_MYSQL_PLUGIN
-       depends BR2_PACKAGE_ULOGD
-       tristate "ulogd-mysql-plugin - an output plugin for logging into a MySQL database"
+
+config BR2_PACKAGE_ULOGD_MOD_MYSQL
+       tristate "mod-mysql - Output plugin for logging into a MySQL database"

        default m if CONFIG_DEVEL
        default m if CONFIG_DEVEL

+       depends BR2_PACKAGE_ULOGD

        select BR2_PACKAGE_LIBMYSQLCLIENT
 
        select BR2_PACKAGE_LIBMYSQLCLIENT
 

-config BR2_PACKAGE_ULOGD_PGSQL_PLUGIN
-       depends BR2_PACKAGE_ULOGD
-       tristate "ulogd-pgsql-plugin - an output plugin for logging into a PostgreSQL database"
+config BR2_PACKAGE_ULOGD_MOD_PGSQL
+       tristate "mod-pgsql - Output plugin for logging into a PostgreSQL database"

        default m if CONFIG_DEVEL
        default m if CONFIG_DEVEL

+       depends BR2_PACKAGE_ULOGD

        select BR2_PACKAGE_LIBPQ
 
        select BR2_PACKAGE_LIBPQ
 

diff --git a/package/ulogd/ipkg/ulogd-mod-mysql.control b/package/ulogd/ipkg/ulogd-mod-mysql.control
new file mode 100644 (file)
index 0000000..2ad48f3
--- /dev/null
+++ b/package/ulogd/ipkg/ulogd-mod-mysql.control
@@ -0,0 +1,9 @@
+Package: ulogd-mysql-plugin
+Priority: optional
+Section: net
+Version: [TBDL]
+Architecture: [TBDL]
+Maintainer: Nico <nthill@free.fr>
+Source: http://nthill.free.fr/openwrt/sources/ulogd/
+Description: Netfilter userspace logging daemon (MySQL plugin)
+Depends: libmysqlclient, ulogd

diff --git a/package/ulogd/ipkg/ulogd-mod-pgsql.control b/package/ulogd/ipkg/ulogd-mod-pgsql.control
new file mode 100644 (file)
index 0000000..8d296d2
--- /dev/null
+++ b/package/ulogd/ipkg/ulogd-mod-pgsql.control
@@ -0,0 +1,9 @@
+Package: ulogd-pgsql-plugin
+Priority: optional
+Section: net
+Version: [TBDL]
+Architecture: [TBDL]
+Maintainer: Nico <nthill@free.fr>
+Source: http://nthill.free.fr/openwrt/sources/ulogd/
+Description: Netfilter userspace logging daemon (PostgreSQL plugin)
+Depends: libpq, ulogd

diff --git a/package/ulogd/ipkg/ulogd-mysql-plugin.control b/package/ulogd/ipkg/ulogd-mysql-plugin.control
deleted file mode 100644 (file)
index 2ad48f3..0000000
--- a/package/ulogd/ipkg/ulogd-mysql-plugin.control
+++ /dev/null
@@ -1,9 +0,0 @@
-Package: ulogd-mysql-plugin
-Priority: optional
-Section: net
-Version: [TBDL]
-Architecture: [TBDL]
-Maintainer: Nico <nthill@free.fr>
-Source: http://nthill.free.fr/openwrt/sources/ulogd/
-Description: Netfilter userspace logging daemon (MySQL plugin)
-Depends: libmysqlclient, ulogd

diff --git a/package/ulogd/ipkg/ulogd-pgsql-plugin.control b/package/ulogd/ipkg/ulogd-pgsql-plugin.control
deleted file mode 100644 (file)
index 8d296d2..0000000
--- a/package/ulogd/ipkg/ulogd-pgsql-plugin.control
+++ /dev/null
@@ -1,9 +0,0 @@
-Package: ulogd-pgsql-plugin
-Priority: optional
-Section: net
-Version: [TBDL]
-Architecture: [TBDL]
-Maintainer: Nico <nthill@free.fr>
-Source: http://nthill.free.fr/openwrt/sources/ulogd/
-Description: Netfilter userspace logging daemon (PostgreSQL plugin)
-Depends: libpq, ulogd