[bakery] Fix package versioning.

[Murray Cumming <murrayc src gnome org>]

commit 0520ac5a0ee69dbb6431bc418943075f695460bf
Author: Yaakov Selkowitz <yselkowitz users sourceforge net>
Date:   Wed Jun 16 03:26:47 2010 -0500

    Fix package versioning.
    
    * configure.in (GENERIC_MAJOR_VERSION): Fix definition.
    (GETTEXT_PACKAGE): Allow parallel-installation with other API versions.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=564168

 ChangeLog    |    7 +++++++
 configure.in |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d966a48..8ca0ac6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-15  Yaakov Selkowitz  <yselkowitz users sourceforge net>
+
+	Fix package versioning.
+
+	* configure.in (GENERIC_MAJOR_VERSION): Fix definition.
+	(GETTEXT_PACKAGE): Allow parallel-installation with other API versions.
+
 2010-03-28  David King  <amigadave amigadave com>
 
 	Update pkg-config file dependencies
diff --git a/configure.in b/configure.in
index 5568d61..73b6df5 100644
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ AC_PREREQ(2.59)
 #########################################################################
 #  Version and initialization
 #########################################################################
-[GTKMM_MAJOR_VERSION]=GENERIC_MAJOR_VERSION
+[GENERIC_MAJOR_VERSION]=GENERIC_MAJOR_VERSION
 [GENERIC_MINOR_VERSION]=GENERIC_MINOR_VERSION
 [GENERIC_MICRO_VERSION]=GENERIC_MICRO_VERSION
 [GENERIC_EXTRA_VERSION]=GENERIC_EXTRA_VERSION
@@ -147,7 +147,7 @@ if test $gtkmm_ver = ver2_10; then
 fi
 
 dnl I18n
-GETTEXT_PACKAGE=$PACKAGE
+GETTEXT_PACKAGE=$PACKAGE-$GENERIC_RELEASE
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", "define GETTEXT_PACKAGE")
 AC_SUBST(GETTEXT_PACKAGE)