changeset 12272:1660263d2a54

version-etc: match standards.texi style This assumes that PACKAGE_BUGREPORTS and PACKAGE_PACKAGER_BUG_REPORTS are generally email addresses, not URLs. Coreutils switched to a similar style on 2009-02-01, with no complaints (the difference is that coreutils inserts the program name, derived from argv[0], into the bug reporting line). Around that time, standards.texi was also updated to mention this style. * lib/version-etc.c (emit_bug_reporting_address): Drop periods, and use <> only for URLs. Signed-off-by: Eric Blake <ebb9@byu.net>
author Eric Blake <ebb9@byu.net>
date Mon, 09 Nov 2009 15:18:13 -0700
parents a58d32199602
children 0c24082ae7d9
files ChangeLog lib/version-etc.c
diffstat 2 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-12  Eric Blake  <ebb9@byu.net>
+
+	version-etc: match standards.texi style
+	* lib/version-etc.c (emit_bug_reporting_address): Drop periods,
+	and use <> only for URLs.
+
 2009-11-10  Kamil Dudka  <kdudka@redhat.com>
 
 	fts: do not fail on a submount during traversal
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -236,13 +236,17 @@
      for this package.  Please add _another line_ saying
      "Report translation bugs to <...>\n" with the address for translation
      bugs (typically your translation team's web or email address).  */
-  printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+  printf (_("\nReport bugs to: %s\n"), PACKAGE_BUGREPORT);
 #ifdef PACKAGE_PACKAGER_BUG_REPORTS
-  printf (_("Report %s bugs to <%s>.\n"), PACKAGE_PACKAGER,
+  printf (_("Report %s bugs to: %s\n"), PACKAGE_PACKAGER,
 	  PACKAGE_PACKAGER_BUG_REPORTS);
 #endif
-  printf (_("%s home page: <http://www.gnu.org/software/%s/>.\n"),
+#ifdef PACKAGE_URL
+  printf (_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
+#else
+  printf (_("%s home page: <http://www.gnu.org/software/%s/>\n"),
 	  PACKAGE_NAME, PACKAGE);
-  fputs (_("General help using GNU software: <http://www.gnu.org/gethelp/>.\n"),
+#endif
+  fputs (_("General help using GNU software: <http://www.gnu.org/gethelp/>\n"),
 	 stdout);
 }