Merge branch 'release'

8 files changed, 31 insertions, 33 deletions

diff --git a/NEWS b/NEWS
index 9626f596..2ce02736 100644
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,8 @@
        SYSTEMTAP_RUNTIME, SYSTEMTAP_TAPSET, SYSTEMTAP_DEBUGINFO_PATH
   - nss and nss-tools are required to use this feature.
 
+* What's new in version 0.9.9
+
 - Systemwide kernel .function.return (kretprobe) maxactive defaults may
   be overridden with the -DKRETACTIVE=nnn parameter.
 
diff --git a/configure b/configure
index e646b3c6..649e9307 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.63 for systemtap 0.9.8.
+# Generated by GNU Autoconf 2.63 for systemtap 0.9.9.
 #
 # Report bugs to <systemtap@sources.redhat.com>.
 #
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='systemtap'
 PACKAGE_TARNAME='systemtap'
-PACKAGE_VERSION='0.9.8'
-PACKAGE_STRING='systemtap 0.9.8'
+PACKAGE_VERSION='0.9.9'
+PACKAGE_STRING='systemtap 0.9.9'
 PACKAGE_BUGREPORT='systemtap@sources.redhat.com'
 
 # Factoring default headers for most tests.
@@ -1365,7 +1365,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 0.9.8 to adapt to many kinds of systems.
+\`configure' configures systemtap 0.9.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1431,7 +1431,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of systemtap 0.9.8:";;
+     short | recursive ) echo "Configuration of systemtap 0.9.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1561,7 +1561,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-systemtap configure 0.9.8
+systemtap configure 0.9.9
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1575,7 +1575,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 0.9.8, which was
+It was created by systemtap $as_me 0.9.9, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2426,7 +2426,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='systemtap'
- VERSION='0.9.8'
+ VERSION='0.9.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -9484,7 +9484,7 @@ exec 6>&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 0.9.8, which was
+This file was extended by systemtap $as_me 0.9.9, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9547,7 +9547,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-systemtap config.status 0.9.8
+systemtap config.status 0.9.9
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index c7ccd2da..1867ac33 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], 0.9.8, systemtap@sources.redhat.com, systemtap)
+AC_INIT([systemtap], 0.9.9, systemtap@sources.redhat.com, systemtap)
 dnl                  ^^^^^ see also NEWS, systemtap.spec, testsuite/configure.ac
 
 AC_PREREQ(2.59)
diff --git a/grapher/Graph.cxx b/grapher/Graph.cxx
index d36f284f..ec5e4035 100644
--- a/grapher/Graph.cxx
+++ b/grapher/Graph.cxx
@@ -10,9 +10,9 @@ namespace systemtap
   using namespace std::tr1;
   
   Graph::Graph()
-    : _left(0.0), _right(1.0), _top(5.0), _bottom(0.0), _lineWidth(2),
-      _autoScaling(true), _autoScrolling(true), _zoomFactor(1.0),
-      _playButton(new CairoPlayButton)
+    : _lineWidth(2), _autoScaling(true), _autoScrolling(true),
+      _zoomFactor(1.0), _playButton(new CairoPlayButton),
+      _left(0.0), _right(1.0), _top(5.0), _bottom(0.0)
   {
   }
   
diff --git a/grapher/GraphWidget.cxx b/grapher/GraphWidget.cxx
index 5b0d1b1c..4a1e0918 100644
--- a/grapher/GraphWidget.cxx
+++ b/grapher/GraphWidget.cxx
@@ -54,13 +54,6 @@ namespace systemtap
     if(!window)
       return true;
 
-    Gtk::Allocation allocation = get_allocation();
-    
-    const int graphWidth = allocation.get_width();
-    const int graphHeight = allocation.get_height();
-    const int width = graphWidth - 20;
-    const int height = graphHeight - 20;
-
     Cairo::RefPtr<Cairo::Context> cr = window->create_cairo_context();
 #if 0
     if(event && !_autoScaling)
diff --git a/systemtap.spec b/systemtap.spec
index 2919ff19..03e9419c 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -8,7 +8,7 @@
 %{!?with_grapher: %define with_grapher 1}
 
 Name: systemtap
-Version: 0.9.8
+Version: 0.9.9
 Release: 1%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
@@ -383,6 +383,9 @@ exit 0
 
 
 %changelog
+* Tue Aug  4 2009 Josh Stone <jistone@redhat.com> - 0.9.9-1
+- Upstream release.
+
 * Thu Jun 11 2009 Josh Stone <jistone@redhat.com> - 0.9.8-1
 - Upstream release.
 
diff --git a/testsuite/configure b/testsuite/configure
index 6199a3c9..6858a3a3 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.63 for systemtap 0.9.8.
+# Generated by GNU Autoconf 2.63 for systemtap 0.9.9.
 #
 # Report bugs to <systemtap@sources.redhat.com>.
 #
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='systemtap'
 PACKAGE_TARNAME='systemtap'
-PACKAGE_VERSION='0.9.8'
-PACKAGE_STRING='systemtap 0.9.8'
+PACKAGE_VERSION='0.9.9'
+PACKAGE_STRING='systemtap 0.9.9'
 PACKAGE_BUGREPORT='systemtap@sources.redhat.com'
 
 ac_subst_vars='LTLIBOBJS
@@ -1227,7 +1227,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 0.9.8 to adapt to many kinds of systems.
+\`configure' configures systemtap 0.9.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1293,7 +1293,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of systemtap 0.9.8:";;
+     short | recursive ) echo "Configuration of systemtap 0.9.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1372,7 +1372,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-systemtap configure 0.9.8
+systemtap configure 0.9.9
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1386,7 +1386,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 0.9.8, which was
+It was created by systemtap $as_me 0.9.9, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2237,7 +2237,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='systemtap'
- VERSION='0.9.8'
+ VERSION='0.9.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2782,7 +2782,7 @@ exec 6>&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 0.9.8, which was
+This file was extended by systemtap $as_me 0.9.9, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2832,7 +2832,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-systemtap config.status 0.9.8
+systemtap config.status 0.9.9
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/testsuite/configure.ac b/testsuite/configure.ac
index 62d6e1a8..655ef45c 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], 0.9.8, systemtap@sources.redhat.com, systemtap)
+AC_INIT([systemtap], 0.9.9, systemtap@sources.redhat.com, systemtap)
 
 AC_PREREQ(2.59)
 AC_CONFIG_AUX_DIR(..)