Index: openacs-4/packages/contacts/contacts.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v
diff -u -r1.69 -r1.70
--- openacs-4/packages/contacts/contacts.info	29 Mar 2006 19:33:32 -0000	1.69
+++ openacs-4/packages/contacts/contacts.info	1 Apr 2006 07:04:19 -0000	1.70
@@ -7,14 +7,18 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="1.2b8" url="http://openacs.org/repository/download/apm/contacts-1.2b8.apm">
+    <version name="1.2b9" url="http://openacs.org/repository/download/apm/contacts-1.2b9.apm">
         <owner url="mailto:openacs@geddert.com">Matthew Geddert</owner>
         <summary>This application lets you collaboratively view, edit and categorize contacts.</summary>
+<<<<<<< contacts.info
+        <release-date>2006-03-31</release-date>
+=======
         <release-date>2006-03-29</release-date>
+>>>>>>> 1.69
         <description format="text/plain">Contacts is an application for managing all those people and or organization you need to keep track of. It has a complete UI for storing and categorizing contacts. Each contact can have an arbitrary number of custom attributes associated with it, including other contacts (i.e. a certain contact &quot;belongs&quot; to a certain organization). It also functions as a service contract provider for attributes related to users in your system</description>
         <maturity>0</maturity>
 
-        <provides url="contacts" version="1.2b8"/>
+        <provides url="contacts" version="1.2b9"/>
         <requires url="acs-datetime" version="4.1"/>
         <requires url="acs-events" version="0.5d3"/>
         <requires url="acs-tcl" version="5.2.0b3"/>
Index: openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml,v
diff -u -r1.71 -r1.72
--- openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	27 Mar 2006 07:42:00 -0000	1.71
+++ openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	1 Apr 2006 07:04:19 -0000	1.72
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="contacts" package_version="1.2b7" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="contacts" package_version="1.2b9" locale="en_US" charset="ISO-8859-1">
 
   <msg key="--_select_a_group_--">-- select a group --</msg>
+  <msg key="--add_column--">-- add column --</msg>
   <msg key="--Create_New_Message--">-- Create New Message --</msg>
   <msg key="--none--">-- None --</msg>
+  <msg key="--remove_column--">-- remove column --</msg>
   <msg key="--select_a_person--">-- select a person --</msg>
   <msg key="--select_an_organization--">-- select an organization --</msg>
   <msg key="--select_one--">--select one--</msg>
Index: openacs-4/packages/contacts/sql/postgresql/upgrade/upgrade-1.2b8-1.2b9.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/sql/postgresql/upgrade/upgrade-1.2b8-1.2b9.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/contacts/sql/postgresql/upgrade/upgrade-1.2b8-1.2b9.sql	1 Apr 2006 07:04:19 -0000	1.1
@@ -0,0 +1,18 @@
+-- 
+-- packages/contacts/sql/postgresql/upgrade/upgrade-1.2b7-1.2b8.sql
+-- 
+-- @author Matthew Geddert (openacs@geddert.com)
+-- @creation-date 2006-03-31
+-- @arch-tag: 
+-- @cvs-id $Id: upgrade-1.2b8-1.2b9.sql,v 1.1 2006/04/01 07:04:19 matthewg Exp $
+--
+
+alter table contact_search_extend_map drop constraint contact_search_extend_map_attribute_id_fk;
+alter table contact_search_extend_map drop column attribute_id;
+alter table contact_search_extend_map add column extend_column varchar(255);
+
+-- if extensions based on attribute_id were saved they could not be upgraded to
+-- the new extended_column system so we delete those dead entries here to clean
+-- up the data.
+
+delete from contact_search_extend_map where extend_id is null;