Index: openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl	13 Apr 2009 23:10:27 -0000	1.4
+++ openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl	5 Jan 2010 01:34:54 -0000	1.5
@@ -7,11 +7,7 @@
     {version_id:integer}
 }
 
-db_1row  apm_package_info_by_version_id {
-    select package_key, pretty_name, version_name, installed_p 
-    from apm_package_version_info 
-    where version_id = :version_id
-}
+db_1row  apm_package_info_by_version_id {}
 
 doc_body_append "[apm_header [list "version-view?version_id=$version_id" "$pretty_name $version_name"] "Dependencies"]
 
@@ -28,7 +24,11 @@
     doc_body_append "<h3>Services [string totitle $dependency_type_prep_2]</h3><ul>\n"
 
     db_foreach apm_all_dependencies {} {
-	doc_body_append "<li>[string totitle $dependency_type_prep] service $service_uri, version $service_version (<a href=\"version-dependency-remove?[export_url_vars dependency_id version_id dependency_type]\">remove</a>)\n"
+	doc_body_append "<li>[string totitle $dependency_type_prep] service $service_uri, version $service_version"
+
+        if { $dependency_type ne "provide" } {
+            doc_body_append "(<a href=\"version-dependency-remove?[export_url_vars dependency_id version_id dependency_type]\">remove</a>)\n"
+        }
 	
 	# If this package provides a service, show a list of all packages that require it,
 	# or vice versa. If this package provides a service, show other packages requiring
@@ -57,7 +57,7 @@
     } else {
 	doc_body_append "<li>This package does not $dependency_type any services.\n"
     }
-    if { $installed_p eq "t" } {
+    if { $installed_p eq "t" && $dependency_type ne "provide"} {
 	doc_body_append "<li><a href=\"version-dependency-add?[export_url_vars version_id dependency_type]\">Add a service $dependency_type_prep_2 by this package</a>\n"
     }
     doc_body_append "</ul>\n"
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl	13 Apr 2009 23:10:27 -0000	1.7
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl	5 Jan 2010 01:34:54 -0000	1.8
@@ -7,26 +7,32 @@
     {dependency_id:naturalnum}
     {version_id:integer}
     dependency_type
-    service_uri
-    service_version
+    service:notnull
+    our_package_key:notnull
 }
 
+set service [split $service ";"]
+set package_key [lindex $service 0]
+set version_name [lindex $service 1]
+
 db_transaction {
+    apm_package_install_spec $version_id
     switch $dependency_type {
-	require -
-        extend {
-	    apm_dependency_add -dependency_id $dependency_id ${dependency_type}s $version_id $service_uri $service_version
+	require {
+	    apm_dependency_add -dependency_id $dependency_id ${dependency_type}s $version_id $package_key $version_name
+            apm_build_one_package_relationships $our_package_key
 	}
 
-	provide {
-	    apm_interface_add -interface_id $dependency_id $version_id $service_uri $service_version
+        extend {
+	    apm_dependency_add -dependency_id $dependency_id ${dependency_type}s $version_id $package_key $version_name
+            apm_build_one_package_relationships $our_package_key
+            apm_copy_inherited_params $our_package_key
 	}
 
 	default {
 	    ad_return_complaint 1 "Entry error: Depenendencies are either provided or required."
 	}
     }
-    apm_package_install_spec $version_id
 } on_error {
     if { ![db_string apm_dependency_doubleclick_check {
 	select count(*) from apm_package_dependencies
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/apm/version-dependency-add-oracle.xql	27 Apr 2001 01:41:12 -0000	1.1
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-add-oracle.xql	5 Jan 2010 01:34:54 -0000	1.2
@@ -1,12 +1,14 @@
 <?xml version="1.0"?>
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
-<fullquery name="apm_all_service_uri">      
+<fullquery name="apm_packages">      
       <querytext>
-    select distinct service_uri, service_version
-    from   apm_package_dependencies
-    order by service_uri, apm_package_version.sortable_version_name(service_version)
-
+    select package_key, version_name
+    from   apm_package_versions
+    where enabled_p = 't'
+      and installed_p = 't'
+      and package_key <> :package_key
+    order by package_key, apm_package_version.sortable_version_name(version_name)
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/apm/version-dependency-add-postgresql.xql	28 Apr 2001 17:35:30 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-add-postgresql.xql	5 Jan 2010 01:34:54 -0000	1.3
@@ -2,13 +2,15 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
  
-<fullquery name="apm_all_service_uri">      
+<fullquery name="apm_packages">      
       <querytext>
-    select distinct service_uri, service_version,
-        apm_package_version__sortable_version_name(service_version)
-    from apm_package_dependencies
-    order by service_uri, apm_package_version__sortable_version_name(service_version)
-
+    select package_key, version_name,
+        apm_package_version__sortable_version_name(version_name)
+    from apm_package_versions
+    where enabled_p
+      and installed_p
+      and package_key <> :package_key
+    order by package_key, apm_package_version__sortable_version_name(version_name)
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl	21 Nov 2007 14:08:43 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl	5 Jan 2010 01:34:54 -0000	1.4
@@ -8,66 +8,29 @@
     dependency_type
 }
 
-db_1row apm_package_info_by_version_id_and_package {
-    select p.package_key, p.package_uri, 
-    p.pretty_name, v.version_name
-    from   apm_package_types p, apm_package_versions v
-    where  v.version_id = :version_id
-    and    v.package_key = p.package_key
-}
+db_1row apm_package_info_by_version_id_and_package {}
 
 set dependency_id [db_nextval acs_object_id_seq] 
 
 doc_body_append "[apm_header -form "action=version-dependency-add-2" [list "version-view?version_id=$version_id" "$pretty_name $version_name"] [list "version-dependencies?version_id=$version_id" "Dependencies"] "Add a Dependency"]
 
-[export_form_vars version_id dependency_type dependency_id]
+[export_vars -form {version_id dependency_type dependency_id {our_package_key $package_key}}]
 
-<script type=\"text/javascript\">
-// Invoked when the user selects a service from the select list.
-function selectService(which) {
-    // Select the radio button next to the list of services.
-    var form = document.forms\[0\];
-    form.which\[0\].checked = 1;
-
-    // Fill in the text fields according to the service selected (the URL
-    // is before the semicolon; the version number is after it)
-    value = which.options\[which.selectedIndex\].value;
-    semi = value.indexOf(';');
-    form.service_uri.value = value.substring(0, semi);
-    form.service_version.value = value.substring(semi + 1);
-}
-</script>
-
-<blockquote>
-<table cellspacing=0 cellpadding=0>
-<tr><td><input type=radio name=which value=service>&nbsp;</td><td>$pretty_name ${dependency_type}s the following service:</td></tr>
-
-<tr><td></td><td>
-<select name=service_select size=8 onChange=\"selectService(this)\">
+$pretty_name ${dependency_type}s the following service:
+<p>
+<select name=service size=8>
 "
 
-db_foreach apm_all_service_uri {
-    select distinct service_uri, service_version
-    from   apm_package_dependencies
-    order by service_uri, apm_package_version.sortable_version_name(service_version)
-} {
-    doc_body_append "<option value=\"$service_uri;$service_version\">$service_uri, version $service_version\n"
+db_foreach apm_packages {} {
+    doc_body_append "<option value=\"$package_key;$version_name\">$package_key, version $version_name\n"
 }
 
 
 db_release_unused_handles
-doc_body_append "</select>
-</td></tr>
 
-<tr><td><input type=radio name=which value=other>&nbsp;</td><td>$pretty_name ${dependency_type}s the following other service:</td></tr>
-<tr><td></td><td><input name=service_uri size=60 onFocus=\"form.which\[1\].checked = 1\">, version <input name=service_version size=10 onFocus=\"form.which\[1\].checked = 1\"></td></tr>
-
-</table>
-</blockquote>
-
-<center>
+doc_body_append "</select>
+<br>
 <input type=submit value=\"Add Dependency\">
-</center>
 
 [ad_footer]
 "
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl	11 Dec 2003 21:39:45 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl	5 Jan 2010 01:34:54 -0000	1.4
@@ -19,6 +19,10 @@
 	    apm_interface_remove $dependency_id
 	}
 
+	extend {
+	    apm_interface_remove $dependency_id
+	}
+
 	default {
 	    ad_return complaint 1 "Dependency Entry Error: Depenendencies are either interfaces or requirements."
 	}