On Wednesday 11 February 2009 13:31:57 Karl Berry wrote:
> $ ls --version
> ls (GNU coreutils) 6.12
> Packaged by ... some distro string here ...
>
> That looks like the right place to me. I'd be tempted to put a blank
> line between "Packaged by ..." and "Copyright ...".
the attached patch does this
> Please include a url to your downstream coreutils package in the distro
> string.
>
> This seems fine, but can we also include the information in --help,
> which is what we did when we amended the coding standards a few days
> ago? For instance, grep 2.5.4 --help ends with:
>
> Report bugs to: [email protected]
> GNU Grep home page: <http://www.gnu.org/software/grep/>
> General help using GNU software: <http://www.gnu.org/gethelp/>
>
> I suggest having another line such as
> Gentoo Grep home page and bug reports: <http://whatever>
> between "Report bugs to" and "GNU Grep home page".
>
> Perhaps even the address in "Report bugs to:" should be changed also.
>
> Perhaps that same line should be used in --version and --help. I assume
> we're trying to get across the same information.
so should this be one or two new options ?
--with-packager="Gentoo"
--with-packager-version="some patchset version info"
--with-packager-bugurl="http://bugs.gentoo.org/";
$ ls --version
ls (GNU coreutils) 6.12
Packaged by Gentoo (some patchset version info)
......
$ ls --help
...
Report bugs to <[email protected]>.
GNU coreutils home page: <http://www.gnu.org/software/coreutils/>
Gentoo bug reporting page: <http://bugs.gentoo.org/>
with the last line looking something like:
"%s bug reporting page: <%s>\n", PACKAGE_PACKAGER, PACKAGE_PACKAGER_BUGURL,
-mike
diff --git a/lib/version-etc.c b/lib/version-etc.c
index 2258c2e..e2daa0d 100644
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -59,6 +59,10 @@ version_etc_va (FILE *stream,
else
fprintf (stream, "%s %s\n", package, version);
+#ifdef PACKAGE_PACKAGER
+ fprintf (stream, "Packaged by %s\n", PACKAGE_PACKAGER);
+#endif
+
/* TRANSLATORS: Translate "(C)" to the copyright symbol
(C-in-a-circle), if this symbol is available in the user's
locale. Otherwise, do not translate "(C)"; leave it as-is. */
diff --git a/m4/version-etc.m4 b/m4/version-etc.m4
new file mode 100644
index 0000000..eecbc47
--- /dev/null
+++ b/m4/version-etc.m4
@@ -0,0 +1,19 @@
+# version-etc.m4 serial 1
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_VERSION_ETC],
+[dnl
+ AC_ARG_WITH([packager],
+ [AS_HELP_STRING([--with-packager],
+ [String identifying the packager of this software])],
+ [dnl
+ case $withval in
+ yes|no) ;;
+ *) AC_DEFINE_UNQUOTED([PACKAGE_PACKAGER], ["$withval"],
+ [Packager identification]);;
+ esac
+ ])
+])
diff --git a/modules/version-etc b/modules/version-etc
index aac2311..589c8c9 100644
--- a/modules/version-etc
+++ b/modules/version-etc
@@ -4,12 +4,14 @@ Print --version and bug-reporting information in a consistent format.
Files:
lib/version-etc.h
lib/version-etc.c
+m4/version-etc.m4
Depends-on:
gettext-h
stdarg
configure.ac:
+gl_VERSION_ETC
Makefile.am:
lib_SOURCES += version-etc.h version-etc.c
