Index: openacs-4/packages/acs-content-repository/acs-content-repository.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/acs-content-repository.info,v
diff -u -N -r1.109 -r1.109.2.1
--- openacs-4/packages/acs-content-repository/acs-content-repository.info	27 Jul 2015 12:29:28 -0000	1.109
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info	16 Aug 2015 22:47:36 -0000	1.109.2.1
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="5.9.0d4" url="http://openacs.org/repository/download/apm/acs-content-repository-5.9.0d4.apm">
+    <version name="5.9.0d5" url="http://openacs.org/repository/download/apm/acs-content-repository-5.9.0d5.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>The canonical repository for OpenACS content.</summary>
         <release-date>2015-05-03</release-date>
@@ -19,7 +19,7 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-content-repository" version="5.9.0d4"/>
+        <provides url="acs-content-repository" version="5.9.0d5"/>
         <requires url="acs-kernel" version="5.9.0d5"/>
         <requires url="acs-service-contract" version="5.9.0d1"/>
         <requires url="search" version="5.9.0d1"/>
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-create.sql,v
diff -u -N -r1.63 -r1.63.2.1
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-create.sql	3 May 2015 12:32:28 -0000	1.63
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-create.sql	16 Aug 2015 22:47:36 -0000	1.63.2.1
@@ -507,10 +507,10 @@
   for multi-lingual searching in Intermedia.
 ';
 
-alter table cr_items add constraint cr_items_live_fk 
+alter table cr_items add constraint cr_items_live_revision_fk 
       foreign key (live_revision) references cr_revisions(revision_id) on delete set null;
 
-alter table cr_items add constraint cr_items_latest_fk 
+alter table cr_items add constraint cr_items_latest_revision_fk 
      foreign key (latest_revision) references cr_revisions(revision_id) on delete set null;
 
 
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-update.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-update.sql,v
diff -u -N -r1.9 -r1.9.4.1
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-update.sql	7 Jul 2011 10:46:02 -0000	1.9
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-update.sql	16 Aug 2015 22:47:37 -0000	1.9.4.1
@@ -147,7 +147,7 @@
 
     execute 'alter table cr_items add 
       latest_revision integer
-                      constraint cr_items_latest_fk
+                      constraint cr_items_latest_revision_fk
                       references cr_revisions';
 
     execute 'update cr_items 
Index: openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.9.0d4-5.9.0d5.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.9.0d4-5.9.0d5.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.9.0d4-5.9.0d5.sql	16 Aug 2015 22:47:37 -0000	1.1.2.1
@@ -0,0 +1,8 @@
+alter table cr_items drop constraint cr_items_live_fk;
+alter table cr_items drop constraint cr_items_latest_fk;
+
+alter table cr_items add constraint cr_items_live_revision_fk 
+      foreign key (live_revision) references cr_revisions(revision_id) on delete set null;
+
+alter table cr_items add constraint cr_items_latest_revision_fk 
+     foreign key (latest_revision) references cr_revisions(revision_id) on delete set null;