Index: modules/comment/comment.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.install,v
retrieving revision 1.67
diff -u -p -r1.67 comment.install
--- modules/comment/comment.install	23 May 2010 19:10:22 -0000	1.67
+++ modules/comment/comment.install	22 Aug 2010 10:56:23 -0000
@@ -104,18 +104,14 @@ function comment_update_dependencies() {
  */
 
 /**
- * Remove comment settings for page ordering.
+ * Enable text module as a new dependency.
  */
 function comment_update_7000() {
-  $types = node_type_get_types();
-  foreach ($types as $type => $object) {
-    variable_del('comment_default_order' . $type);
-  }
-  return t('Comment order settings removed.');
+  module_enable(array('text'));
 }
 
 /**
- * Change comment status from published being 0 to being 1
+ * Change comment status and ordering settings.
  */
 function comment_update_7001() {
   $changes = array(
@@ -130,6 +126,10 @@ function comment_update_7001() {
     ->condition('status', $old)
     ->execute();
   }
+  $types = node_type_get_types();
+  foreach ($types as $type => $object) {
+    variable_del('comment_default_order' . $type);
+  }
 }
 
 /**
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.495
diff -u -p -r1.495 system.install
--- modules/system/system.install	17 Aug 2010 22:05:22 -0000	1.495
+++ modules/system/system.install	22 Aug 2010 10:56:24 -0000
@@ -416,15 +416,6 @@ function system_requirements($phase) {
           );
           continue;
         }
-        // Check for a disabled dependency.
-        if (!$required_file->status) {
-          $requirements["$module-$required_module"] = array(
-            'title' => $t('Unresolved dependency'),
-            'description' => $t('@name requires this module.', array('@name' => $name)),
-            'value' => $t('@required_name (Disabled)', array('@required_name' => $required_name)),
-            'severity' => REQUIREMENT_ERROR,
-          );
-        }
       }
     }
   }