From 9b1480fe5eef0d0d509167ffaf947ab479cd537a Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 16 May 2013 10:50:32 -0700 Subject: [PATCH] Set versions back to 2.3 for the master branch --- NEWS | 3 +++ configure | 20 +++++++++---------- configure.ac | 2 +- .../en-US/Book_Info.xml | 4 ++-- java/Makefile.in | 6 ++++-- systemtap.spec | 2 +- testsuite/configure | 20 +++++++++---------- testsuite/configure.ac | 2 +- 8 files changed, 32 insertions(+), 27 deletions(-) diff --git a/NEWS b/NEWS index a585c6518..bb99714ce 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +* What's new in version 2.3 + + * What's new in version 2.2.1, 2013-05-16 * What's new in version 2.2, 2013-05-14 diff --git a/configure b/configure index bb1f9bd6e..2597c70b5 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 systemtap 2.2.1. +# Generated by GNU Autoconf 2.69 for systemtap 2.3. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='systemtap' PACKAGE_TARNAME='systemtap' -PACKAGE_VERSION='2.2.1' -PACKAGE_STRING='systemtap 2.2.1' +PACKAGE_VERSION='2.3' +PACKAGE_STRING='systemtap 2.3' PACKAGE_BUGREPORT='systemtap@sourceware.org' PACKAGE_URL='' @@ -1414,7 +1414,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 systemtap 2.2.1 to adapt to many kinds of systems. +\`configure' configures systemtap 2.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1485,7 +1485,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of systemtap 2.2.1:";; + short | recursive ) echo "Configuration of systemtap 2.3:";; esac cat <<\_ACEOF @@ -1643,7 +1643,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -systemtap configure 2.2.1 +systemtap configure 2.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2178,7 +2178,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 systemtap $as_me 2.2.1, which was +It was created by systemtap $as_me 2.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3116,7 +3116,7 @@ fi # Define the identity of the package. PACKAGE='systemtap' - VERSION='2.2.1' + VERSION='2.3' cat >>confdefs.h <<_ACEOF @@ -11694,7 +11694,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 systemtap $as_me 2.2.1, which was +This file was extended by systemtap $as_me 2.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11760,7 +11760,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="\\ -systemtap config.status 2.2.1 +systemtap config.status 2.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 56a3fae11..bc0144d80 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl configure.ac --- autoconf input file for systemtap dnl Process this file with autoconf to produce a configure script. -AC_INIT([systemtap], 2.2.1, systemtap@sourceware.org, systemtap) +AC_INIT([systemtap], 2.3, systemtap@sourceware.org, systemtap) dnl ^^^ see also NEWS, systemtap.spec, testsuite/configure.ac dnl doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml diff --git a/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml b/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml index dfdb02c10..fac17f907 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml @@ -6,10 +6,10 @@ SystemTap Beginners Guide Introduction to SystemTap (for Red Hat Enterprise Linux) Introduction to SystemTap (for Fedora) - 2.2.1 + 2.3 Systemtap - 2.2.1 + 2.3 2 This guide provides basic instructions on how to use SystemTap to monitor different subsystems of &PRODUCT; in finer detail. The SystemTap Beginners Guide is recommended for users who have taken RHCT or have a similar level of expertise in &PRODUCT;. diff --git a/java/Makefile.in b/java/Makefile.in index f61d0d32d..200a1b6d2 100644 --- a/java/Makefile.in +++ b/java/Makefile.in @@ -72,7 +72,7 @@ noinst_PROGRAMS = $(am__EXEEXT_1) @HAVE_JAVA_TRUE@am__append_5 = HelperSDT.class HelperSDT.jar subdir = java DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp + $(srcdir)/stapbm.in $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -83,7 +83,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = stapbm CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" @HAVE_JAVA_TRUE@am__EXEEXT_1 = libHelperSDT.so$(EXEEXT) @@ -372,6 +372,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +stapbm: $(top_builddir)/config.status $(srcdir)/stapbm.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ diff --git a/systemtap.spec b/systemtap.spec index 3e552d8d9..8085ef7b1 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -31,7 +31,7 @@ %{!?with_java: %global with_java 1} Name: systemtap -Version: 2.2.1 +Version: 2.3 Release: 1%{?dist} # for version, see also configure.ac diff --git a/testsuite/configure b/testsuite/configure index 2b48dc13c..c8123f89e 100755 --- a/testsuite/configure +++ b/testsuite/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for systemtap 2.2.1. +# Generated by GNU Autoconf 2.69 for systemtap 2.3. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='systemtap' PACKAGE_TARNAME='systemtap' -PACKAGE_VERSION='2.2.1' -PACKAGE_STRING='systemtap 2.2.1' +PACKAGE_VERSION='2.3' +PACKAGE_STRING='systemtap 2.3' PACKAGE_BUGREPORT='systemtap@sourceware.org' PACKAGE_URL='' @@ -1202,7 +1202,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 systemtap 2.2.1 to adapt to many kinds of systems. +\`configure' configures systemtap 2.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of systemtap 2.2.1:";; + short | recursive ) echo "Configuration of systemtap 2.3:";; esac cat <<\_ACEOF @@ -1351,7 +1351,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -systemtap configure 2.2.1 +systemtap configure 2.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1368,7 +1368,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 systemtap $as_me 2.2.1, which was +It was created by systemtap $as_me 2.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2194,7 +2194,7 @@ fi # Define the identity of the package. PACKAGE='systemtap' - VERSION='2.2.1' + VERSION='2.3' cat >>confdefs.h <<_ACEOF @@ -2852,7 +2852,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 systemtap $as_me 2.2.1, which was +This file was extended by systemtap $as_me 2.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2905,7 +2905,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="\\ -systemtap config.status 2.2.1 +systemtap config.status 2.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/testsuite/configure.ac b/testsuite/configure.ac index a57a63003..f4304b127 100644 --- a/testsuite/configure.ac +++ b/testsuite/configure.ac @@ -1,7 +1,7 @@ dnl configure.ac --- autoconf input file for systemtap testsuite dnl Process this file with autoconf to produce a configure script. -AC_INIT([systemtap], 2.2.1, systemtap@sourceware.org, systemtap) +AC_INIT([systemtap], 2.3, systemtap@sourceware.org, systemtap) AC_PREREQ(2.59) AC_CONFIG_AUX_DIR(..) -- 2.43.5