Index: image.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/image.info,v
retrieving revision 1.5
diff -u -p -r1.5 image.info
--- image.info	6 Jan 2008 22:15:24 -0000	1.5
+++ image.info	12 Jun 2008 08:10:24 -0000
@@ -2,4 +2,7 @@
 name = Image
 description = Allows uploading, resizing and viewing of images.
 package = Image
-core = 6.x
+core = 7.x
+files[] = image.module
+files[] = image.admin.inc
+files[] = views.inc
Index: image.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/image.module,v
retrieving revision 1.271
diff -u -p -r1.271 image.module
--- image.module	10 Jun 2008 16:41:47 -0000	1.271
+++ image.module	12 Jun 2008 08:10:25 -0000
@@ -9,10 +9,6 @@ define('IMAGE_LINK_HIDDEN', 0);
 define('IMAGE_LINK_SHOWN', 1);
 define('IMAGE_LINK_NEW', 2);
 
-if (module_exists('views')) {
-  include(drupal_get_path('module', 'image') .'/views.inc');
-}
-
 /**
  * Implementation of hook_help
  */
@@ -81,7 +77,12 @@ function image_node_info() {
  * Implementation of hook_perm
  */
 function image_perm() {
-  return array('create images', 'view original images', 'edit own images', 'edit images');
+  return array(
+    'create images' => t('Create new images'),
+    'view original images' => t('View original images'),
+    'edit own images' => t("Edit images belonging to this user"),
+    'edit images' => t("Edit all images on the site"),
+  );
 }
 
 /**
@@ -123,7 +124,6 @@ function image_menu() {
     'page arguments' => array('image_admin_settings'),
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
-    'file' => 'image.admin.inc',
   );
 
   return $items;
Index: contrib/image_attach/image_attach.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_attach/image_attach.info,v
retrieving revision 1.4
diff -u -p -r1.4 image_attach.info
--- contrib/image_attach/image_attach.info	6 Jan 2008 22:15:24 -0000	1.4
+++ contrib/image_attach/image_attach.info	12 Jun 2008 08:10:25 -0000
@@ -3,4 +3,5 @@ name = Image Attach
 description = Allows easy attaching of image nodes to other content types.
 package = Image
 dependencies[] = image
-core = 6.x
\ No newline at end of file
+files[] = image_attach.module
+core = 7.x
Index: contrib/image_gallery/image_gallery.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_gallery/image_gallery.info,v
retrieving revision 1.5
diff -u -p -r1.5 image_gallery.info
--- contrib/image_gallery/image_gallery.info	6 Jan 2008 22:15:25 -0000	1.5
+++ contrib/image_gallery/image_gallery.info	12 Jun 2008 08:10:25 -0000
@@ -4,4 +4,5 @@ description = Allows sorting and display
 package = Image
 dependencies[] = image
 dependencies[] = taxonomy
-core = 6.x
+files[] = image_gallery.module
+core = 7.x
Index: contrib/image_gallery/image_gallery.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_gallery/image_gallery.module,v
retrieving revision 1.26
diff -u -p -r1.26 image_gallery.module
--- contrib/image_gallery/image_gallery.module	10 Apr 2008 18:08:54 -0000	1.26
+++ contrib/image_gallery/image_gallery.module	12 Jun 2008 08:10:25 -0000
@@ -14,7 +14,7 @@ function image_gallery_help($path, $arg)
 }
 
 function image_gallery_perm() {
-  return array('administer images');
+  return array('administer images' => t('Administer images in image gallery'));
 }
 
 function image_gallery_menu() {
Index: contrib/image_im_advanced/image_im_advanced.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_im_advanced/image_im_advanced.info,v
retrieving revision 1.2
diff -u -p -r1.2 image_im_advanced.info
--- contrib/image_im_advanced/image_im_advanced.info	6 Jan 2008 22:15:25 -0000	1.2
+++ contrib/image_im_advanced/image_im_advanced.info	12 Jun 2008 08:10:25 -0000
@@ -2,4 +2,5 @@
 name = ImageMagick Advanced Options
 description = Adds advanced options to the ImageMagick image toolkit.
 package = Image
-core = 6.x
+files[] = image_im_advanced.module
+core = 7.x
Index: contrib/image_import/image_import.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_import/image_import.info,v
retrieving revision 1.4
diff -u -p -r1.4 image_import.info
--- contrib/image_import/image_import.info	6 Jan 2008 22:15:25 -0000	1.4
+++ contrib/image_import/image_import.info	12 Jun 2008 08:10:25 -0000
@@ -3,5 +3,6 @@ name = Image Import
 description = Allows batches of images to be imported from a directory on the server.
 package = Image
 dependencies[] = image
-core = 6.x
+files[] = image_import.module
+core = 7.x
 
Index: contrib/image_import/image_import.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_import/image_import.module,v
retrieving revision 1.15
diff -u -p -r1.15 image_import.module
--- contrib/image_import/image_import.module	18 Jan 2008 09:59:13 -0000	1.15
+++ contrib/image_import/image_import.module	12 Jun 2008 08:10:25 -0000
@@ -21,7 +21,7 @@ function image_import_help($path, $arg) 
  * Implementation of hook_perm().
  */
 function image_import_perm() {
-  return array('import images');
+  return array('import images' => t("Import images"));
 }
 
 /**