Log Message:
-----------
Change version to 1.2.6

Tags:
----
REL_1_2_STABLE

Modified Files:
--------------
    slony1-engine:
        config.h.in (r1.17.2.2 -> r1.17.2.3)
    slony1-engine/tools:
        release_checklist.sh (r1.1.2.2 -> r1.1.2.3)
    slony1-engine/src/backend:
        slony1_funcs.sql (r1.98.2.7 -> r1.98.2.8)

Added Files:
-----------
    slony1-engine:
        RELEASE-1.2.6 (r1.1.2.1)

-------------- next part --------------
Index: config.h.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config.h.in,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -Lconfig.h.in -Lconfig.h.in -u -w -r1.17.2.2 -r1.17.2.3
--- config.h.in
+++ config.h.in
@@ -12,8 +12,8 @@
 #ifndef	SLONY_I_CONFIG_H
 #define SLONY_I_CONFIG_H
 
-#define SLONY_I_VERSION_STRING	"1.2.2"
-#define SLONY_I_VERSION_STRING_DEC 1,2,2
+#define SLONY_I_VERSION_STRING	"1.2.6"
+#define SLONY_I_VERSION_STRING_DEC 1,2,6
 
 #ifndef PG_VERSION_MAJOR
 #define PG_VERSION_MAJOR 0
--- /dev/null
+++ RELEASE-1.2.6
@@ -0,0 +1,3 @@
+$Id: RELEASE-1.2.6,v 1.1.2.1 2007/01/08 17:31:40 cbbrowne Exp $
+
+Release 1.2.6 fixes version numbers.
\ No newline at end of file
Index: release_checklist.sh
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/release_checklist.sh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Ltools/release_checklist.sh -Ltools/release_checklist.sh -u -w -r1.1.2.2 -r1.1.2.3
--- tools/release_checklist.sh
+++ tools/release_checklist.sh
@@ -12,7 +12,7 @@
 MINOR=`echo $VERSTRING | cut -d '.' -f 2`
 PATCHLEVEL=`echo $VERSTRING | cut -d '.' -f 3`
 
-echo "Slony-I version: ${VERSTRING} - Major=${MAJOR} Minor=${MINOR} Patchlevel=${PATCHLEVEL}"
+echo "Slony-I version: ${VERSTRING} - Major=${MAJOR} Minor=${MINOR} Patchlevel=${PATCHLEVEL} per config.h.in"
 
 VERCOMMA="${MAJOR},${MINOR},${PATCHLEVEL}"
 if [[ `egrep "#define SLONY_I_VERSION_STRING_DEC ${VERCOMMA}\$" config.h.in` ]]; then
@@ -27,12 +27,12 @@
 if [[ `egrep "^PACKAGE_VERSION=${VERUNDERSCORE=}\$" configure` ]]; then
    echo "configure PACKAGE_VERSION matches ${VERUNDERSCORE}"
 else
-   echo "ERROR: configure PACKAGE_VERSION does not match ${VERUNDERSCORE}"
+   echo "ERROR: PACKAGE_VERSION in configure does not match ${VERUNDERSCORE}"
    egrep "PACKAGE_VERSION\=" configure
 fi
 
 if [[ `egrep "^PACKAGE_STRING=postgresql-slony1-engine ${VERUNDERSCORE=}\$" configure` ]]; then
-   echo "configure PACKAGE_STRING matches ${VERUNDERSCORE}"
+   echo "PACKAGE_STRING in configure matches ${VERUNDERSCORE}"
 else
    echo "ERROR: configure PACKAGE_STRING does not match ${VERUNDERSCORE}"
    egrep "PACKAGE_STRING\=" configure
Index: slony1_funcs.sql
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/backend/slony1_funcs.sql,v
retrieving revision 1.98.2.7
retrieving revision 1.98.2.8
diff -Lsrc/backend/slony1_funcs.sql -Lsrc/backend/slony1_funcs.sql -u -w -r1.98.2.7 -r1.98.2.8
--- src/backend/slony1_funcs.sql
+++ src/backend/slony1_funcs.sql
@@ -430,7 +430,7 @@
 returns int4
 as '
 begin
-	return 2;
+	return 6;
 end;
 ' language plpgsql;
 comment on function @NAMESPACE at .slonyVersionPatchlevel () is