diff options
| -rw-r--r-- | acinclude.m4.in | 4 | ||||
| -rw-r--r-- | bin/Makefile.am | 6 | ||||
| -rw-r--r-- | bin/couchdb.tpl.in | 4 | ||||
| -rw-r--r-- | bin/couchjs.tpl.in | 4 | ||||
| -rwxr-xr-x | bootstrap | 7 | ||||
| -rw-r--r-- | configure.ac | 6 |
6 files changed, 9 insertions, 22 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in index 6fe7768d..8872f5a3 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -27,6 +27,4 @@ m4_define([LOCAL_VERSION_SECONDARY], m4_define([LOCAL_VERSION], [LOCAL_VERSION_PRIMARY[]LOCAL_VERSION_SECONDARY]) -m4_define([LOCAL_LIST_ADDRESS], [couchdb-user@incubator.apache.org]) -m4_define([LOCAL_LIST_URI], - [http://mail-archives.apache.org/mod_mbox/incubator-couchdb-user/]) +m4_define([LOCAL_BUG_URI], [https://issues.apache.org/jira/browse/COUCHDB]) diff --git a/bin/Makefile.am b/bin/Makefile.am index 07680c1b..cbe69dbc 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -34,8 +34,7 @@ couchdb: couchdb.tpl -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" \ -e "s|%pkgstatelibdir%|@pkgstatelibdir@|g" \ -e "s|%localstatedir%|@localstatedir@|g" \ - -e "s|%list_address%|@list_address@|g" \ - -e "s|%list_uri%|@list_uri@|g" \ + -e "s|%bug_uri%|@bug_uri@|g" \ -e "s|%package_author_address%|@package_author_address@|g" \ -e "s|%package_author_name%|@package_author_name@|g" \ -e "s|%package_name%|@package_name@|g" \ @@ -46,8 +45,7 @@ couchdb: couchdb.tpl couchjs: couchjs.tpl sed -e "s|%libbindir%|@libbindir@|g" \ - -e "s|%list_address%|@list_address@|g" \ - -e "s|%list_uri%|@list_uri@|g" \ + -e "s|%bug_uri%|@bug_uri@|g" \ -e "s|%package_author_address%|@package_author_address@|g" \ -e "s|%package_author_name%|@package_author_name@|g" \ -e "s|%package_name%|@package_name@|g" \ diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in index a29edc47..e5585aa8 100644 --- a/bin/couchdb.tpl.in +++ b/bin/couchdb.tpl.in @@ -85,9 +85,7 @@ Options: -k kill the background process, will respawn if needed -d shutdown the background process -Report bugs via the web at <%list_uri%>. - -Report bugs via email to <%list_address%>. +Report bugs at <%bug_uri%>. EOF } diff --git a/bin/couchjs.tpl.in b/bin/couchjs.tpl.in index 634940f2..0bc84f2f 100644 --- a/bin/couchjs.tpl.in +++ b/bin/couchjs.tpl.in @@ -55,9 +55,7 @@ Options: -h display a short help message and exit -V display version information and exit -Report bugs via the web at <%list_uri%>. - -Report bugs via email to <%list_address%>. +Report bugs at <%bug_uri%>. EOF } @@ -86,8 +86,7 @@ EOF display_help () { # Display a short description of the script's behaviour. - list_address=$(extract_configuration_variable LOCAL_LIST_ADDRESS) - list_uri=$(extract_configuration_variable LOCAL_LIST_URI) + bug_uri=$(extract_configuration_variable LOCAL_BUG_URI) cat << EOF Usage: $basename [OPTION]... @@ -105,9 +104,7 @@ Environment variables: REPOSITORY_REVISION manual override for revision information -Report bugs via the web at <$list_uri>. - -Report bugs via email to <$list_address>. +Report bugs at <$bug_uri>. EOF } diff --git a/configure.ac b/configure.ac index 16f0ae45..e87ad84f 100644 --- a/configure.ac +++ b/configure.ac @@ -12,8 +12,7 @@ dnl under the License. m4_include([m4/ac_check_icu.m4]) -AC_INIT([LOCAL_PACKAGE_NAME], [LOCAL_VERSION], [LOCAL_LIST_ADDRESS], - [LOCAL_PACKAGE_IDENTIFIER]) +AC_INIT([LOCAL_PACKAGE_NAME], [LOCAL_VERSION], [], [LOCAL_PACKAGE_IDENTIFIER]) AC_PREREQ([2.59]) @@ -197,8 +196,7 @@ AC_SUBST([version_revision], ["LOCAL_VERSION_REVISION"]) AC_SUBST([version_stage], ["LOCAL_VERSION_STAGE"]) AC_SUBST([version_release], ["LOCAL_VERSION_RELEASE"]) -AC_SUBST([list_address], ["LOCAL_LIST_ADDRESS"]) -AC_SUBST([list_uri], ["LOCAL_LIST_URI"]) +AC_SUBST([bug_uri], ["LOCAL_BUG_URI"]) AC_SUBST([pkgconfdir], [${sysconfdir}/${PACKAGE_TARNAME}]) AC_SUBST([pkgdatadir], [${datadir}/${PACKAGE_TARNAME}]) |