From 0d3f50604f1ce54f5ffd068c2c8b102762dbff48 Mon Sep 17 00:00:00 2001
From: jengo <jengo@alumni.egroupware.org>
Date: Sat, 25 Nov 2000 21:39:19 +0000
Subject: [PATCH] Started finishing things up for a re-release

---
 setup/sql/mysql_newtables.inc.php    |  2 +-
 setup/sql/mysql_upgrade_beta.inc.php | 11 ++---------
 setup/sql/pgsql_newtables.inc.php    |  2 +-
 setup/sql/pgsql_upgrade_beta.inc.php |  8 ++------
 version.inc.php                      |  2 +-
 5 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/setup/sql/mysql_newtables.inc.php b/setup/sql/mysql_newtables.inc.php
index 4db453eb1f..db2f7c6ee6 100644
--- a/setup/sql/mysql_newtables.inc.php
+++ b/setup/sql/mysql_newtables.inc.php
@@ -298,6 +298,6 @@
           )";
   $db->query($sql);
 
-  $currentver = "0.9.5";
+  $currentver = "0.9.6";
   update_version_table();
 ?>
diff --git a/setup/sql/mysql_upgrade_beta.inc.php b/setup/sql/mysql_upgrade_beta.inc.php
index 403ee9a458..8543fc7e2c 100644
--- a/setup/sql/mysql_upgrade_beta.inc.php
+++ b/setup/sql/mysql_upgrade_beta.inc.php
@@ -555,14 +555,7 @@
 
     if ($currentver == "0.9.5" || ereg ("^0\.9\.6pre", $currentver)){
       if ($currentver == "0.9.5") {
-      // upgrade code starts here
-
-      // upgrade code ends here
-        $currentver = "0.9.6pre1";
-        update_version_table();
-      }
-      if ($currentver == "0.9.6pre1") {
-        $currentver = "0.9.6pre2";
+        $currentver = "0.9.6";
         update_version_table();
       }
 
@@ -598,5 +591,5 @@
   v0_9_3to0_9_4();
   v0_9_4to0_9_5();
   v0_9_5to0_9_6();
-  v0_9_6to0_9_7();
+  //v0_9_6to0_9_7();
 ?>
\ No newline at end of file
diff --git a/setup/sql/pgsql_newtables.inc.php b/setup/sql/pgsql_newtables.inc.php
index 8917b64785..dacdb5ecb1 100644
--- a/setup/sql/pgsql_newtables.inc.php
+++ b/setup/sql/pgsql_newtables.inc.php
@@ -269,7 +269,7 @@
           )";
   $db->query($sql);
 
-  $currentver = "0.9.5";
+  $currentver = "0.9.6";
   update_version_table();
 
 ?>
diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php
index fab46b4232..361b24f8f5 100644
--- a/setup/sql/pgsql_upgrade_beta.inc.php
+++ b/setup/sql/pgsql_upgrade_beta.inc.php
@@ -568,11 +568,7 @@
       // upgrade code starts here
 
       // upgrade code ends here
-        $currentver = "0.9.6pre1";
-        update_version_table();
-      }
-      if ($currentver == "0.9.6pre1") {
-        $currentver = "0.9.6pre2";
+        $currentver = "0.9.6";
         update_version_table();
       }
 
@@ -608,5 +604,5 @@
   v0_9_3to0_9_4();
   v0_9_4to0_9_5();
   v0_9_5to0_9_6();
-  v0_9_6to0_9_7();
+  //v0_9_6to0_9_7();
 ?>
\ No newline at end of file
diff --git a/version.inc.php b/version.inc.php
index 363924b97a..e830a66c70 100644
--- a/version.inc.php
+++ b/version.inc.php
@@ -11,5 +11,5 @@
 
   /* $Id$ */
 
-  $phpgw_info["server"]["version"] = "0.9.5pre2";  
+  $phpgw_info["server"]["version"] = "0.9.6";  
 ?>