Merge Colins changes

* 'master' of git://www.geeqie.org/geeqie:
  Document toolbar enhancements

diff --git a/configure.in b/configure.in
index 4bbbf2c..202897c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 
 AC_PREREQ(2.57)
-AC_INIT(geeqie, 1.1, geeqie-devel@lists.sourceforge.net)
+AC_INIT([geeqie], m4_esyscmd_s(git rev-parse --quiet --verify --short master), [geeqie-devel@lists.sourceforge.net], [], [http://www.geeqie.org/])
 
 # Check for rightly dirs
 AC_CONFIG_SRCDIR([src/main.c])
@@ -562,8 +562,6 @@ cat > config.report << END
 Package:
   Name:          $PACKAGE_NAME
   Version:       $PACKAGE_VERSION
-  Patch version: $GQ_PATCH_VERSION
-  Date:          $GQ_PATCH_DATE
 
 Architecture:
   UNIX:          $os_unix