Index: openacs-4/packages/acs-admin/www/apm/package-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-add-2.tcl,v
diff -u -r1.9 -r1.9.4.1
--- openacs-4/packages/acs-admin/www/apm/package-add-2.tcl	13 Apr 2009 23:10:27 -0000	1.9
+++ openacs-4/packages/acs-admin/www/apm/package-add-2.tcl	10 Apr 2010 16:53:53 -0000	1.9.4.1
@@ -115,6 +115,8 @@
                         $package_key $version_name $version_uri $summary $description \
                         $description_format $vendor $vendor_uri $auto_mount]
     apm_version_enable -callback apm_dummy_callback $version_id
+    apm_build_one_package_relationships $package_key
+    apm_build_subsite_packages_list
     apm_package_install_owners -callback apm_dummy_callback \
 	    [apm_package_install_owners_prepare $owner_name $owner_uri] $version_id
 
Index: openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl,v
diff -u -r1.29 -r1.29.2.1
--- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl	28 Mar 2010 01:13:17 -0000	1.29
+++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl	10 Apr 2010 16:53:53 -0000	1.29.2.1
@@ -129,6 +129,9 @@
     append spec "        </callbacks>"
     append spec "\n        <parameters>\n"
     apm_log APMDebug "APM: Writing parameters"
+
+    set parent_package_keys [lrange [apm_one_package_inherit_order $package_key] 0 end-1]
+
     db_foreach parameter_info {} {
 	append spec "            <parameter scope=\"[ad_quotehtml $scope]\" datatype=\"[ad_quotehtml $datatype]\" \
 		min_n_values=\"[ad_quotehtml $min_n_values]\" \
Index: openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql	28 Mar 2010 01:13:17 -0000	1.9
+++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql	10 Apr 2010 16:53:53 -0000	1.9.2.1
@@ -68,17 +68,22 @@
 <fullquery name="apm_generate_package_spec.parameter_info">      
       <querytext>
       
-	select parameter_name, 
-               description, 
-               datatype, 
-               section_name, 
-               default_value, 
-               min_n_values, 
-               max_n_values,
-               scope
-        from   apm_parameters
-	where  package_key = :package_key
-        order  by parameter_name
+	select ap.parameter_name, 
+               ap.description, 
+               ap.datatype, 
+               ap.section_name, 
+               ap.default_value, 
+               ap.min_n_values, 
+               ap.max_n_values,
+               ap.scope
+        from   apm_parameters ap
+	where  ap.package_key = :package_key
+          and not exists (select 1
+                          from apm_parameters ap2
+                          where ap.parameter_name = ap2.parameter_name
+                            and ap2.package_key in ('[join $parent_package_keys ',']')
+                         )
+        order  by ap.parameter_name
     
       </querytext>
 </fullquery>