Add bug reporting address and home page to --help output

... as required by GNU coding standards.

https://bugs.freedesktop.org/show_bug.cgi?id=29936

diff --git a/configure.ac b/configure.ac
index 786c5429b49aa5f21e09cc6726b67d552dfd8012..a10be612c2385cacd472eb5c50c695cc2a8c1d40 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59c)
-AC_INIT([polkit], [0.111], [http://lists.freedesktop.org/mailman/listinfo/polkit-devel])
+AC_INIT([polkit], [0.111], [http://lists.freedesktop.org/mailman/listinfo/polkit-devel], , [http://www.freedesktop.org/wiki/Software/polkit])
 AM_INIT_AUTOMAKE([])
 AC_CONFIG_HEADERS(config.h)
 AM_MAINTAINER_MODE

diff --git a/src/programs/pkaction.c b/src/programs/pkaction.c
index f2969ccfacd98b13de23d6ad76b2b6eaf4a69e78..3778b33055b7d58a8674426403055b182120d0ce 100644 (file)
--- a/src/programs/pkaction.c
+++ b/src/programs/pkaction.c
@@ -90,6 +90,7 @@ main (int argc, char *argv[])
 {
   guint ret;
   gchar *opt_action_id;
+  gchar *s;
   gboolean opt_show_version;
   gboolean opt_verbose;
   GOptionEntry options[] =
@@ -127,6 +128,11 @@ main (int argc, char *argv[])
 
   error = NULL;
   context = g_option_context_new (N_("[--action-id ACTION]"));
+  s = g_strdup_printf (_("Report bugs to: %s\n"
+                        "%s home page: <%s>"), PACKAGE_BUGREPORT,
+                      PACKAGE_NAME, PACKAGE_URL);
+  g_option_context_set_description (context, s);
+  g_free (s);
   g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
   if (!g_option_context_parse (context, &argc, &argv, &error))
     {

diff --git a/src/programs/pkcheck.c b/src/programs/pkcheck.c
index 20713cc82eff52be2c0b7261c54337780ee3d4f5..ebb375ecd1c25c2460c546ffb51ccc808d7600b0 100644 (file)
--- a/src/programs/pkcheck.c
+++ b/src/programs/pkcheck.c
@@ -48,7 +48,10 @@ help (void)
 "  --revoke-temp                      Revoke all temporary authorizations for current session\n"
 "  -s, --system-bus-name=BUS_NAME     Check authorization of owner of BUS_NAME\n"
 "  --version                          Show version\n"
-            "\n"));
+            "\n"
+            "Report bugs to: %s\n"
+            "%s home page: <%s>\n"), PACKAGE_BUGREPORT, PACKAGE_NAME,
+          PACKAGE_URL);
 }
 
 static gchar *

diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c
index 529898ab22b5ce381f92ecd2a8f5c40a5ba2af0b..005e1fe7c4e10d26c8876e22a5822b5ed790fbc2 100644 (file)
--- a/src/programs/pkexec.c
+++ b/src/programs/pkexec.c
@@ -77,7 +77,11 @@ usage (int argc, char *argv[])
               "       --disable-internal-agent |\n"
               "       [--user username] PROGRAM [ARGUMENTS...]\n"
               "\n"
-              "See the pkexec manual page for more details.\n");
+              "See the pkexec manual page for more details.\n"
+             "\n"
+             "Report bugs to: %s\n"
+             "%s home page: <%s>\n", PACKAGE_BUGREPORT, PACKAGE_NAME,
+             PACKAGE_URL);
 }
 
 /* ---------------------------------------------------------------------------------------------------- */

diff --git a/src/programs/pkttyagent.c b/src/programs/pkttyagent.c
index 7bd8031d04a3c5a7b4b0ce33ca13f02b02cf86d2..ba09973374cc67d7568c13091b3473bab753876c 100644 (file)
--- a/src/programs/pkttyagent.c
+++ b/src/programs/pkttyagent.c
@@ -63,6 +63,7 @@ main (int argc, char *argv[])
       { NULL, 0, 0, 0, NULL, NULL, NULL }
     };
   GOptionContext *context;
+  gchar *s;
   PolkitAuthority *authority = NULL;
   PolkitSubject *subject = NULL;
   gpointer local_agent_handle = NULL;
@@ -77,6 +78,11 @@ main (int argc, char *argv[])
 
   error = NULL;
   context = g_option_context_new ("");
+  s = g_strdup_printf (_("Report bugs to: %s\n"
+                        "%s home page: <%s>"), PACKAGE_BUGREPORT,
+                      PACKAGE_NAME, PACKAGE_URL);
+  g_option_context_set_description (context, s);
+  g_free (s);
   g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
   if (!g_option_context_parse (context, &argc, &argv, &error))
     {