From 1fb419fdb9e1df54d8359b0e065af2523513578d Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Tue, 26 Jan 2016 20:40:59 +0100 Subject: [PATCH] fix version string --- CHANGES | 4 +++- Makefile.am | 2 +- Makefile.in | 2 +- bin/acmefetch | 2 +- configure | 20 ++++++++++---------- man/acmefetch.1 | 2 +- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/CHANGES b/CHANGES index d4978f4..8194d10 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,6 @@ -2016-01-26 16:39:24 +0100 (HEAD, tag: v0.3.2, origin/master, master) better documentation -- Tobias Oetiker +2016-01-26 20:08:59 +0100 (HEAD, origin/master, master) make bla work without quotes ... -- Tobias Oetiker +2016-01-26 20:02:21 +0100 (tag: v0.3.3) add some documentation -- Tobias Oetiker +2016-01-26 16:39:24 +0100 (tag: v0.3.2) better documentation -- Tobias Oetiker 2016-01-26 16:31:51 +0100 added progress reporting -- Tobias Oetiker 2016-01-25 18:11:03 +0100 maybe adding an explicity Math::BigInt dependency will unbreak Travis ? -- Tobias Oetiker 2016-01-25 17:58:40 +0100 (tag: v0.3.1) * make 'on demand' rebuild work * add ssl dependency -- Tobias Oetiker diff --git a/Makefile.am b/Makefile.am index 44ef418..52a7a6d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,11 +41,11 @@ dist_bin_SCRIPTS = $(BIN) dist-hook: thirdparty/CPAN/touch $(POD) $(PERL) -i -p -e 's/#VERSION#/$(PACKAGE_VERSION)/g;s/#YEAR#/$(YEAR)/g;s/#DATE#/$(DATE)/g;' $(distdir)/README.md $(distdir)/COPYRIGHT + $(PERL) -i -p -e 's/^my .*# VERSION/my \$$VERSION = q{$(PACKAGE_VERSION)}; # VERSION/' $(distdir)/$(BIN) install-exec-hook: [ "$(PERL5LIB)" = "" ] || cd "$(DESTDIR)$(exec_prefix)" && $(PERL) -i -p -e 's{.*# PERL5LIB}{use lib qw($(PERL5LIB)); # PERL5LIB}' $(BIN) || true cd "$(DESTDIR)$(exec_prefix)" && $(PERL) -i -p -e 's{^use .*# LIBDIR}{use lib qw($(libdir)); # LIBDIR}' $(BIN) - cd "$(DESTDIR)$(exec_prefix)" && $(PERL) -i -p -e 's{^my .*# VERSION}{my $$VERSION = '$(PACKAGE_VERSION)'; # VERSION}' $(BIN) cd "$(DESTDIR)$(exec_prefix)" && $(PERL) -i -p -e 's{^#!.*perl.*}{#!$(PERL)};' $(BIN) mkdir -p $(DESTDIR)$(libdir) [ ! -d $(THIRDPARTY_DIR)/lib/perl5 ] || cp -fr $(THIRDPARTY_DIR)/lib/perl5/* $(DESTDIR)$(libdir) diff --git a/Makefile.in b/Makefile.in index b5a935d..8807335 100644 --- a/Makefile.in +++ b/Makefile.in @@ -855,11 +855,11 @@ man/%.1: bin/% VERSION dist-hook: thirdparty/CPAN/touch $(POD) $(PERL) -i -p -e 's/#VERSION#/$(PACKAGE_VERSION)/g;s/#YEAR#/$(YEAR)/g;s/#DATE#/$(DATE)/g;' $(distdir)/README.md $(distdir)/COPYRIGHT + $(PERL) -i -p -e 's/^my .*# VERSION/my \$$VERSION = q{$(PACKAGE_VERSION)}; # VERSION/' $(distdir)/$(BIN) install-exec-hook: [ "$(PERL5LIB)" = "" ] || cd "$(DESTDIR)$(exec_prefix)" && $(PERL) -i -p -e 's{.*# PERL5LIB}{use lib qw($(PERL5LIB)); # PERL5LIB}' $(BIN) || true cd "$(DESTDIR)$(exec_prefix)" && $(PERL) -i -p -e 's{^use .*# LIBDIR}{use lib qw($(libdir)); # LIBDIR}' $(BIN) - cd "$(DESTDIR)$(exec_prefix)" && $(PERL) -i -p -e 's{^my .*# VERSION}{my $$VERSION = '$(PACKAGE_VERSION)'; # VERSION}' $(BIN) cd "$(DESTDIR)$(exec_prefix)" && $(PERL) -i -p -e 's{^#!.*perl.*}{#!$(PERL)};' $(BIN) mkdir -p $(DESTDIR)$(libdir) [ ! -d $(THIRDPARTY_DIR)/lib/perl5 ] || cp -fr $(THIRDPARTY_DIR)/lib/perl5/* $(DESTDIR)$(libdir) diff --git a/bin/acmefetch b/bin/acmefetch index f84cc6a..a42a65a 100755 --- a/bin/acmefetch +++ b/bin/acmefetch @@ -38,7 +38,7 @@ sub main() main; -sub bla ($) { +sub bla { my $text = shift; print "* $text\n" if $opt{verbose}; } diff --git a/configure b/configure index ae7713b..57d37b5 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for AcmeFetch 0.3.3. +# Generated by GNU Autoconf 2.69 for AcmeFetch 0.3.4. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='AcmeFetch' PACKAGE_TARNAME='acmefetch' -PACKAGE_VERSION='0.3.3' -PACKAGE_STRING='AcmeFetch 0.3.3' +PACKAGE_VERSION='0.3.4' +PACKAGE_STRING='AcmeFetch 0.3.4' PACKAGE_BUGREPORT='tobi@oetiker.ch' PACKAGE_URL='' @@ -1219,7 +1219,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures AcmeFetch 0.3.3 to adapt to many kinds of systems. +\`configure' configures AcmeFetch 0.3.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1285,7 +1285,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of AcmeFetch 0.3.3:";; + short | recursive ) echo "Configuration of AcmeFetch 0.3.4:";; esac cat <<\_ACEOF @@ -1371,7 +1371,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -AcmeFetch configure 0.3.3 +AcmeFetch configure 0.3.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1388,7 +1388,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by AcmeFetch $as_me 0.3.3, which was +It was created by AcmeFetch $as_me 0.3.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2255,7 +2255,7 @@ fi # Define the identity of the package. PACKAGE='acmefetch' - VERSION='0.3.3' + VERSION='0.3.4' cat >>confdefs.h <<_ACEOF @@ -3443,7 +3443,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by AcmeFetch $as_me 0.3.3, which was +This file was extended by AcmeFetch $as_me 0.3.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3496,7 +3496,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -AcmeFetch config.status 0.3.3 +AcmeFetch config.status 0.3.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/man/acmefetch.1 b/man/acmefetch.1 index 64fb583..974ce69 100644 --- a/man/acmefetch.1 +++ b/man/acmefetch.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ACMEFETCH 1" -.TH ACMEFETCH 1 "2016-01-26" "0.3.3" "AcmeFetch" +.TH ACMEFETCH 1 "2016-01-26" "0.3.4" "AcmeFetch" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l