Index: openacs-4/packages/cms/cms.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/cms.info,v
diff -u -N -r1.15 -r1.15.2.1
--- openacs-4/packages/cms/cms.info	9 May 2005 22:44:47 -0000	1.15
+++ openacs-4/packages/cms/cms.info	9 Jun 2005 21:34:33 -0000	1.15.2.1
@@ -12,14 +12,10 @@
         <owner url="mailto:karlg@arsdigita.com">Karl Goldstein</owner>
         <owner url="mailto:lutter@arsdigita.com">David Lutterkort</owner>
         <summary>A CMS implemented on top of the Content Repository</summary>
-        <release-date>2001-01-26</release-date>
+        <release-date>2005-06-09</release-date>
         <vendor url="http://www.openacs.org">OpenACS</vendor>
-        <description format="text/html">CMS is a full featured content management system implemented on top of
-        the content repository which supports workflow, composite objects, dynamicly created attributes, publishing to 
-        the filesystem and categorization.  The user interface needs a great deal of work and the package relies on 
-        acs-workflow which has been deprecated.  Alternatives include etp and bcms (which is a work in progress), CMS 
-        remains the best place to look to find examples of how the content repository should be used.
-        </description>
+        <description format="text/html">CMS is a full featured content management system implemented on top of the content repository which supports composite objects, dynamicly created attributes, publishing to the filesystem and categorization. CMS remains the best place to look to find examples of how the content repository should be used.</description>
+
         <provides url="cms" version="5.0d"/>
         <requires url="acs-content-repository" version="5.1.5"/>
         <requires url="acs-kernel" version="5.1.5"/>
@@ -29,6 +25,7 @@
 
         <callbacks>
             <callback type="after-instantiate"  proc="cms::install::package_instantiate"/>
+            <callback type="before-uninstantiate"  proc="cms::install::package_uninstantiate"/>
         </callbacks>
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ClipboardFloatsP"  default="1" description="Determine whether the clipboard should be in its own floating window."/>
Index: openacs-4/packages/cms/tcl/module-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/module-procs.tcl,v
diff -u -N -r1.9.2.2 -r1.9.2.3
--- openacs-4/packages/cms/tcl/module-procs.tcl	9 Jun 2005 21:15:26 -0000	1.9.2.2
+++ openacs-4/packages/cms/tcl/module-procs.tcl	9 Jun 2005 21:34:33 -0000	1.9.2.3
@@ -378,6 +378,7 @@
 } {
     set subsite_id [ad_conn subsite_id]
     db_foreach get_module_ids {
+	content::item::delete -item_id $module_id
 	db_exec_plsql delete_module {}
     }
 
Index: openacs-4/packages/cms/tcl/module-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/module-procs.xql,v
diff -u -N -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/cms/tcl/module-procs.xql	9 Jun 2005 21:15:26 -0000	1.4.2.2
+++ openacs-4/packages/cms/tcl/module-procs.xql	9 Jun 2005 21:34:33 -0000	1.4.2.3
@@ -77,8 +77,7 @@
 <fullquery name="cm::modules::install::delete_modules.get_module_ids">      
       <querytext>
         select module_id from cm_modules
-          where key = :module_name
-            and package_id = 
+          where package_id = 
               (select package_id from cms_subsite_package_map
                  where subsite_id = :subsite_id)
       </querytext>