From d729de4c820f111047c503124c359d5598104be0 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 14 Nov 2011 02:02:34 +0000
Subject: [PATCH] Nachtrag zu 1247, noch einige Dateien nicht gespeichert.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1248 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-sci-bundle/sql/upgrade/oracle-se-0.0.0-6.6.0.sql | 11 ++---------
 ccm-sci-bundle/sql/upgrade/postgres-0.0.0-6.6.0.sql  |  4 ++--
 ccm-sci-bundle/src/ccm-sci-bundle.upgrade            |  5 +++++
 3 files changed, 9 insertions(+), 11 deletions(-)
 create mode 100755 ccm-sci-bundle/src/ccm-sci-bundle.upgrade

diff --git a/ccm-sci-bundle/sql/upgrade/oracle-se-0.0.0-6.6.0.sql b/ccm-sci-bundle/sql/upgrade/oracle-se-0.0.0-6.6.0.sql
index a99c818b5..6986ce216 100755
--- a/ccm-sci-bundle/sql/upgrade/oracle-se-0.0.0-6.6.0.sql
+++ b/ccm-sci-bundle/sql/upgrade/oracle-se-0.0.0-6.6.0.sql
@@ -21,13 +21,6 @@
 -- Internal use at Bremen University only!
 -- Updates various university sites from als ccm-xxx-aplaws to scm-sci-bundle
 
-@@ default/6.6.0-6.6.1/ren_table_workspaces.sql
-@@ default/6.6.0-6.6.1/ren_table_workspace_pages.sql
-@@ default/6.6.0-6.6.1/ren_table_workspace_page_layouts.sql
-@@ default/6.6.0-6.6.1/ren_table_workspace_workspace_map.sql
-@@ default/6.6.0-6.6.1/ren_table_workspace_themes.sql
-@@ default/6.6.0-6.6.1/ren_table_themeapplications.sql
+@@ default/0.0.0-6.6.0/upd_system_tables.sql
+@@ default/0.0.0-6.6.0/upd_nav_templates_table.sql
 
-@@ default/6.6.0-6.6.1/add_constraints.sql
-
-@@ default/6.6.0-6.6.1/upd_system_tables.sql
diff --git a/ccm-sci-bundle/sql/upgrade/postgres-0.0.0-6.6.0.sql b/ccm-sci-bundle/sql/upgrade/postgres-0.0.0-6.6.0.sql
index 684f0bac3..fcccc1630 100755
--- a/ccm-sci-bundle/sql/upgrade/postgres-0.0.0-6.6.0.sql
+++ b/ccm-sci-bundle/sql/upgrade/postgres-0.0.0-6.6.0.sql
@@ -25,7 +25,7 @@
 
 begin;
 
-\i default/6.6.0-6.6.1/upd_system_tables.sql
-\i default/6.6.0-6.6.1/upd_system_tables.sql
+\i default/0.0.0-6.6.0/upd_system_tables.sql
+\i default/0.0.0-6.6.0/upd_nav_templates_table.sql
 
 commit;
diff --git a/ccm-sci-bundle/src/ccm-sci-bundle.upgrade b/ccm-sci-bundle/src/ccm-sci-bundle.upgrade
new file mode 100755
index 000000000..ffa6136ae
--- /dev/null
+++ b/ccm-sci-bundle/src/ccm-sci-bundle.upgrade
@@ -0,0 +1,5 @@
+<upgrade>
+  <version from="0.0.0" to="6.6.0">
+    <script sql="ccm-sci-bundle/upgrade/::database::-0.0.0-6.6.0.sql"/>
+  </version>
+</upgrade>