Index: deploy.plans.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/deploy/Attic/deploy.plans.admin.inc,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 deploy.plans.admin.inc
--- deploy.plans.admin.inc	26 Nov 2009 01:33:54 -0000	1.1.2.2
+++ deploy.plans.admin.inc	28 Aug 2010 12:50:56 -0000
@@ -229,7 +229,7 @@ function deploy_list_multiple_delete_con
 function deploy_list_multiple_delete_confirm_submit($form, &$form_state) {
   if ($form_state['values']['confirm']) {
     foreach ($form_state['values']['items'] as $iid => $value) {
-      db_query('DELETE FROM {deploy_plan_items} WHERE iid = %d', $iid);
+      deploy_plan_item_delete(array('iid' => $iid));
     }
     drupal_set_message(t('The plan items have been removed.'));
   }
@@ -305,3 +305,18 @@ function deploy_delete_plan_form_submit(
 
   drupal_goto("/admin/build/deploy/");
 }
+
+/**
+ * Delete item from plan.
+ */
+function deploy_plan_item_delete($conditions = array()) {
+  if (isset($conditions['iid'])) {
+    db_query('DELETE FROM {deploy_plan_items} WHERE iid = %d', $conditions['iid']);
+    return TRUE;
+  }
+  elseif (isset($conditions['module']) && isset($conditions['data'])) {
+    db_query('DELETE FROM {deploy_plan_items} WHERE module = "%s" AND data = "%s"', $conditions['module'], $conditions['data']);
+    return TRUE;
+  }
+  return FALSE;
+}
Index: modules/comment_deploy/comment_deploy.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/deploy/modules/comment_deploy/Attic/comment_deploy.module,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 comment_deploy.module
--- modules/comment_deploy/comment_deploy.module	20 Jun 2009 04:44:14 -0000	1.1.2.1
+++ modules/comment_deploy/comment_deploy.module	28 Aug 2010 12:50:56 -0000
@@ -98,46 +98,6 @@ function comment_deploy_check($cid) {
 }
 
 /**
- * Implementation of hook_comment(),
- *
- * This all relates to managing the mapped cid->uuid mapping.
- *
- * $a1 Dependent on the action being performed.
- *
- *     * For "validate","update","insert", passes in an array of form values submitted by the user.
- *     * For all other operations, passes in the comment the action is being performed on. 
- *
- * $op What kind of action is being performed. Possible values:
- *
- *     * "insert": The comment is being inserted.
- *     * "update": The comment is being updated.
- *     * "view": The comment is being viewed. This hook can be used to add additional data to the comment before theming.
- *     * "validate": The user has just finished editing the comment and is trying to preview or submit it. This hook can be used to check or even modify the node. Errors should be set with form_set_error().
- *     * "publish": The comment is being published by the moderator.
- *     * "unpublish": The comment is being unpublished by the moderator.
- *     * "delete": The comment is being deleted by the moderator.
- *
- * @see hook_user() in user_deploy.module for some thoughts on how this
- *   might possibly be reworked.
- */
-function comment_deploy_comment(&$a1, $op) {
-  switch ($op) {
-    case 'insert':
-    case 'update':
-    case 'publish':
-    case 'unpublish':
-      // $a1 is passed by reference and if we muck with it, things go screwy. So we need
-      // to make a local copy to pass through to deployment. 
-      //$comment = $a1;
-      //comment_deploy_send_comment($comment);
-      break;
-    
-    case 'delete':
-      db_query("delete from {comments_uuid} where cid = %d", $a1->cid);
-  }
-}
-
-/**
  * Implementation of hook_deploy(),
  *
  * @param $nid
Index: modules/content_copy_deploy/content_copy_deploy.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/deploy/modules/content_copy_deploy/Attic/content_copy_deploy.module,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 content_copy_deploy.module
--- modules/content_copy_deploy/content_copy_deploy.module	20 Jun 2009 04:37:58 -0000	1.1.2.2
+++ modules/content_copy_deploy/content_copy_deploy.module	28 Aug 2010 12:50:56 -0000
@@ -33,6 +33,16 @@ function content_copy_deploy_menu() {
 }
 
 /**
+ * Implementation oh hook_node_type().
+ */
+function content_copy_node_type($op, $info) {
+  if ($op == 'delete') {
+    module_load_include('inc', 'deploy', 'deploy.plans.admin');
+    deploy_plan_item_delete(array('module' => 'content_copy', 'data' => $info->type));
+  }
+}
+
+/**
  * Deploy content deployment 'hook'.
  */
 function content_copy_deploy($content_type) {
Index: modules/node_deploy/node_deploy.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/deploy/modules/node_deploy/Attic/node_deploy.module,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 node_deploy.module
--- modules/node_deploy/node_deploy.module	14 Aug 2010 20:45:37 -0000	1.1.2.6
+++ modules/node_deploy/node_deploy.module	28 Aug 2010 12:50:56 -0000
@@ -54,6 +54,16 @@ function node_deploy_menu() {
 }
 
 /**
+ * Implementation of hook_nodeapi().
+ */
+function node_deploy_nodeapi(&$node, $op, $a3, $a4) {
+  if ($op == 'delete') {
+    module_load_include('inc', 'deploy', 'deploy.plans.admin');
+    deploy_plan_item_delete(array('module' => 'node', 'data' => $node->nid));
+  }
+}
+
+/**
  * Implementation of hook_deploy_check().
  *
  * Used to manage deployment dependencies
Index: modules/views_deploy/views_deploy.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/deploy/modules/views_deploy/Attic/views_deploy.module,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 views_deploy.module
--- modules/views_deploy/views_deploy.module	8 Aug 2010 04:35:38 -0000	1.1.2.1
+++ modules/views_deploy/views_deploy.module	28 Aug 2010 12:50:56 -0000
@@ -49,3 +49,20 @@ function views_deploy($view_name) {
   
   return deploy_send(array('views.import'), array($view->export(), $view_name));
 }
+
+/**
+ * Implementation fo hook_form_alter().
+ */
+function views_deploy_form_alter(&$form, &$form_state, $form_id) {
+  if ($form_id == 'views_ui_delete_confirm') {
+    $form['#submit'][] = 'views_deploy_delete_form_submit';
+  }
+}
+
+/**
+ * Submit handler for the Views delete form.
+ */
+function views_deploy_delete_form_submit($form, &$form_state) {
+  module_load_include('inc', 'deploy', 'deploy.plans.admin');
+  deploy_plan_item_delete(array('module' => 'views', 'data' => $form_state['view']->name));
+}