[jhbuild] Omit redefinition of modules

[Craig Keogh <cskeogh src gnome org>]

commit 9bd645fff65f836c1556b97e6edfb746422cab5d
Author: Dirk Wallenstein <halsmit t-online de>
Date:   Thu May 5 11:52:05 2011 +0200

    Omit redefinition of modules
    
    Remove exact redefinitions of gnome-scan, gnote, and gthumb, which are
    already defined in gnome-apps.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=649463

 modulesets/gnome-world-3.0.modules |   31 -------------------------------
 modulesets/gnome-world-3.2.modules |   31 -------------------------------
 2 files changed, 0 insertions(+), 62 deletions(-)
---
diff --git a/modulesets/gnome-world-3.0.modules b/modulesets/gnome-world-3.0.modules
index fafa029..66bb977 100644
--- a/modulesets/gnome-world-3.0.modules
+++ b/modulesets/gnome-world-3.0.modules
@@ -545,13 +545,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gthumb">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+-2"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-mount" autogenargs="--enable-nautilus-extension">
     <branch/>
     <dependencies>
@@ -851,16 +844,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-scan">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+-2"/>
-      <dep package="gconf"/>
-      <dep package="gegl"/>
-      <dep package="gimp"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="libipoddevice">
     <branch/>
     <dependencies>
@@ -1562,20 +1545,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnote">
-    <branch/>
-    <dependencies>
-      <dep package="glibmm"/>
-      <dep package="libxml2"/>
-      <dep package="libxml++"/>
-      <dep package="gtkmm"/>
-      <dep package="gconf"/>
-    </dependencies>
-    <suggests>
-      <dep package="libpanelappletmm"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gparted">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-world-3.2.modules b/modulesets/gnome-world-3.2.modules
index 1e47ac7..cfc316a 100644
--- a/modulesets/gnome-world-3.2.modules
+++ b/modulesets/gnome-world-3.2.modules
@@ -545,13 +545,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gthumb">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+-2"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-mount" autogenargs="--enable-nautilus-extension">
     <branch/>
     <dependencies>
@@ -851,16 +844,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-scan">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+-2"/>
-      <dep package="gconf"/>
-      <dep package="gegl"/>
-      <dep package="gimp"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="libipoddevice">
     <branch/>
     <dependencies>
@@ -1562,20 +1545,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnote">
-    <branch/>
-    <dependencies>
-      <dep package="glibmm"/>
-      <dep package="libxml2"/>
-      <dep package="libxml++"/>
-      <dep package="gtkmm"/>
-      <dep package="gconf"/>
-    </dependencies>
-    <suggests>
-      <dep package="libpanelappletmm"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gparted">
     <branch/>
     <dependencies>