[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug-diffutils] [PATCH 03/19] maint: address@hidden is the new bug-repor
From: |
Jim Meyering |
Subject: |
[bug-diffutils] [PATCH 03/19] maint: address@hidden is the new bug-reporting address |
Date: |
Fri, 20 Nov 2009 10:12:12 +0100 |
From: Jim Meyering <address@hidden>
* configure.ac (AC_INIT): Use address@hidden, not bug-gnu-utils
as the bug-reporting address.
* NEWS (Administrivia): Mention this.
* src/cmp.c (usage): Remove hard-coded address.
Instead, use gnulib's emit_bug_reporting_address function.
* src/diff.c (usage, option_help_msgid): Likewise.
* src/diff3.c (usage): Likewise.
* src/sdiff.c (usage): Likewise.
---
NEWS | 6 ++++++
configure.ac | 2 +-
src/cmp.c | 6 +++---
src/diff.c | 3 +--
src/diff3.c | 6 +++---
src/sdiff.c | 6 +++---
6 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/NEWS b/NEWS
index fc4996a..6230976 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,12 @@ GNU diffutils NEWS -*-
outline -*-
sdiff and diff3 now invoke diff, not $(bindir)/diff
+** Administrivia
+
+ New discussion and bug-reporting address: address@hidden
+
+ updated gnulib support
+
* Noteworthy changes in release 2.8.7 (2004-04-13) [stable]
diff --git a/configure.ac b/configure.ac
index 697bb27..b56139c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ AC_PREREQ(2.61)
AC_INIT([GNU diffutils],
m4_esyscmd([build-aux/git-version-gen .tarball-version]),
- address@hidden)
+ address@hidden)
AC_CONFIG_SRCDIR([src/diff.c])
AC_CONFIG_AUX_DIR([build-aux])
diff --git a/src/cmp.c b/src/cmp.c
index 9cea036..18056a6 100644
--- a/src/cmp.c
+++ b/src/cmp.c
@@ -172,14 +172,14 @@ usage (void)
printf ("%s\n\n", _("Compare two files byte by byte."));
for (p = option_help_msgid; *p; p++)
printf (" %s\n", _(*p));
- printf ("\n%s\n%s\n\n%s\n%s\n\n%s\n",
+ printf ("\n%s\n%s\n\n%s\n%s\n",
_("SKIP1 and SKIP2 are the number of bytes to skip in each file."),
_("SKIP values may be followed by the following multiplicative
suffixes:\n\
kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n\
GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y."),
_("If a FILE is `-' or missing, read standard input."),
- _("Exit status is 0 if inputs are the same, 1 if different, 2 if
trouble."),
- _("Report bugs to <address@hidden>."));
+ _("Exit status is 0 if inputs are the same, 1 if different, 2 if
trouble."));
+ emit_bug_reporting_address ();
}
int
diff --git a/src/diff.c b/src/diff.c
index f46aa55..b0ad81b 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -911,8 +911,6 @@ static char const * const option_help_msgid[] = {
N_("If --from-file or --to-file is given, there are no restrictions on
FILES."),
N_("If a FILE is `-', read standard input."),
N_("Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."),
- "",
- N_("Report bugs to <address@hidden>."),
0
};
@@ -941,6 +939,7 @@ usage (void)
printf (" %s\n" + 2 * (*msg != ' ' && *msg != '-'), msg);
}
}
+ emit_bug_reporting_address ();
}
/* Set VAR to VALUE, reporting an OPTION error if this is a
diff --git a/src/diff3.c b/src/diff3.c
index 466f878..d70b3fc 100644
--- a/src/diff3.c
+++ b/src/diff3.c
@@ -453,10 +453,10 @@ usage (void)
printf (" %s\n", _(*p));
else
putchar ('\n');
- printf ("\n%s\n%s\n\n%s\n",
+ printf ("\n%s\n%s\n",
_("If a FILE is `-', read standard input."),
- _("Exit status is 0 if successful, 1 if conflicts, 2 if trouble."),
- _("Report bugs to <address@hidden>."));
+ _("Exit status is 0 if successful, 1 if conflicts, 2 if trouble."));
+ emit_bug_reporting_address ();
}
/* Combine the two diffs together into one.
diff --git a/src/sdiff.c b/src/sdiff.c
index b09b767..d44ffcb 100644
--- a/src/sdiff.c
+++ b/src/sdiff.c
@@ -223,10 +223,10 @@ usage (void)
printf (" %s\n", _(*p));
else
putchar ('\n');
- printf ("\n%s\n%s\n\n%s\n",
+ printf ("\n%s\n%s\n",
_("If a FILE is `-', read standard input."),
- _("Exit status is 0 if inputs are the same, 1 if different, 2 if
trouble."),
- _("Report bugs to <address@hidden>."));
+ _("Exit status is 0 if inputs are the same, 1 if different, 2 if
trouble."));
+ emit_bug_reporting_address ();
}
/* Clean up after a signal or other failure. This function is
--
1.6.5.3.433.g11067
- [bug-diffutils] [PATCH 04/19] maint: no longer define *_FILENO constants, (continued)
- [bug-diffutils] [PATCH 04/19] maint: no longer define *_FILENO constants, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 12/19] build: update gnulib submodule to latest, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 17/19] build: suppress warnings about bindtextdomain and textdomain, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 15/19] use xfreopen rather than freopen, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 10/19] build: let automake generate better man-installation rules, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 11/19] maint: hide build commands behind $(AM_V_GEN), Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 18/19] maint: add gnulib's announce-gen module, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 16/19] build: use more gnulib modules, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 13/19] build: "make stable" emitted an invalid gnupload command, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 07/19] admin: ignore all of gnulib-tests, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 03/19] maint: address@hidden is the new bug-reporting address,
Jim Meyering <=
- [bug-diffutils] [PATCH 09/19] maint: add an assertion to suppress clang-detected warning, Jim Meyering, 2009/11/20
- [bug-diffutils] [PATCH 08/19] maint: remove dead assignment from diff3.c, Jim Meyering, 2009/11/20