From e5c1965a263c7395ce60b22277f14f869a22e806 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 11 Jan 2012 21:13:04 -0700 Subject: [PATCH] fix upstream version, text displayed in help command --- as31/as31.c | 1 - configure.in | 2 +- debian/changelog | 2 ++ debian/patches/helptext | 12 ++++++++++++ debian/patches/series | 2 ++ debian/patches/update-version | 11 +++++++++++ 6 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 debian/patches/helptext create mode 100644 debian/patches/update-version diff --git a/as31/as31.c b/as31/as31.c index 8e5580c..f4e2515 100644 --- a/as31/as31.c +++ b/as31/as31.c @@ -77,7 +77,6 @@ int main(int argc, char **argv) void showhelp(const char *cmd) { fprintf(stderr, "AS31 %s\n", VERSION); - fprintf(stderr, "Please report problems to: paul@pjrc.com\n\n"); fprintf(stderr, "Usage: %s [-h] [-l] [-s] [-v] [-Aarg] [-Ffmt] [-Ofile] file.asm\n\n", cmd); diff --git a/configure.in b/configure.in index db02e3e..2850a22 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ AC_INIT(as31/as31.c) -AM_INIT_AUTOMAKE(as31, 2.3.0) +AM_INIT_AUTOMAKE(as31, 2.3.1) dnl ******************************************************************** dnl Minimal Requirements diff --git a/debian/changelog b/debian/changelog index d02fdec..72f0a02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ as31 (2.3.1-6) UNRELEASED; urgency=low * patch from Jim Paris for issue in include parsing, closes: #655533 + * fix upstream version in configure.in, elide obsolete upstream bug report + address from help text, closes: #655534 -- Bdale Garbee Wed, 11 Jan 2012 18:06:31 -0700 diff --git a/debian/patches/helptext b/debian/patches/helptext new file mode 100644 index 0000000..df384e3 --- /dev/null +++ b/debian/patches/helptext @@ -0,0 +1,12 @@ +diff --git a/as31/as31.c b/as31/as31.c +index 8e5580c..f4e2515 100644 +--- a/as31/as31.c ++++ b/as31/as31.c +@@ -77,7 +77,6 @@ int main(int argc, char **argv) + void showhelp(const char *cmd) + { + fprintf(stderr, "AS31 %s\n", VERSION); +- fprintf(stderr, "Please report problems to: paul@pjrc.com\n\n"); + fprintf(stderr, + "Usage: %s [-h] [-l] [-s] [-v] [-Aarg] [-Ffmt] [-Ofile] file.asm\n\n", + cmd); diff --git a/debian/patches/series b/debian/patches/series index 594f70a..55dcc4b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,5 @@ elide_errant_text regenerate_parser.c as31-mkstemps.patch as31-fix-duplicate-line.patch +update-version +helptext diff --git a/debian/patches/update-version b/debian/patches/update-version new file mode 100644 index 0000000..35f82d7 --- /dev/null +++ b/debian/patches/update-version @@ -0,0 +1,11 @@ +diff --git a/configure.in b/configure.in +index db02e3e..2850a22 100644 +--- a/configure.in ++++ b/configure.in +@@ -1,5 +1,5 @@ + AC_INIT(as31/as31.c) +-AM_INIT_AUTOMAKE(as31, 2.3.0) ++AM_INIT_AUTOMAKE(as31, 2.3.1) + + dnl ******************************************************************** + dnl Minimal Requirements -- 2.30.2