[jhbuild] Move pimlico modules in gnome-x.xx.modules files

[Luca Ferretti <lferrett src gnome org>]

commit 4a8420f69722a15af2befb344d898b95d21ff9eb
Author: Luca Ferretti <elle uca libero it>
Date:   Tue Jul 21 12:34:52 2009 +0200

    Move pimlico modules in gnome-x.xx.modules files

 modulesets/gnome-2.24.modules  |   41 +++++++++++++++++++++++++++++++++++++++
 modulesets/gnome-2.26.modules  |   41 +++++++++++++++++++++++++++++++++++++++
 modulesets/gnome-2.28.modules  |   41 +++++++++++++++++++++++++++++++++++++++
 modulesets/mobile-2.24.modules |    1 -
 modulesets/mobile-2.26.modules |    1 -
 modulesets/mobile-2.28.modules |    1 -
 modulesets/pimlico.modules     |   42 ----------------------------------------
 7 files changed, 123 insertions(+), 45 deletions(-)
---
diff --git a/modulesets/gnome-2.24.modules b/modulesets/gnome-2.24.modules
index a8c2a77..92de17a 100644
--- a/modulesets/gnome-2.24.modules
+++ b/modulesets/gnome-2.24.modules
@@ -2154,4 +2154,45 @@
 
   <!-- ########## End of Ubuntu Netbook Remix Modules ########## -->
 
+  <!-- ########## Pimplico Modules ########## -->
+
+  <autotools id="contacts">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="evolution-data-server"/>
+      <dep package="gconf"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="dates">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="evolution-data-server"/>
+      <dep package="gconf"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="tasks">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="evolution-data-server"/>
+    </dependencies>
+    <suggests>
+      <dep package="libunique"/>
+    </suggests>
+  </autotools>
+
+  <metamodule id="meta-pimlico">
+    <dependencies>
+     <dep package="contacts"/>
+     <dep package="dates"/>
+     <dep package="tasks"/>
+    </dependencies>
+  </metamodule>
+
+  <!-- ########## End of Pimplico Modules ########## -->
+
 </moduleset>
diff --git a/modulesets/gnome-2.26.modules b/modulesets/gnome-2.26.modules
index 442a00c..82b8511 100644
--- a/modulesets/gnome-2.26.modules
+++ b/modulesets/gnome-2.26.modules
@@ -2351,4 +2351,45 @@
     </dependencies>
   </autotools>
 
+  <!-- ########## Pimplico Modules ########## -->
+
+  <autotools id="contacts">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="evolution-data-server"/>
+      <dep package="gconf"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="dates">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="evolution-data-server"/>
+      <dep package="gconf"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="tasks">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="evolution-data-server"/>
+    </dependencies>
+    <suggests>
+      <dep package="libunique"/>
+    </suggests>
+  </autotools>
+
+  <metamodule id="meta-pimlico">
+    <dependencies>
+     <dep package="contacts"/>
+     <dep package="dates"/>
+     <dep package="tasks"/>
+    </dependencies>
+  </metamodule>
+
+  <!-- ########## End of Pimplico Modules ########## -->
+
 </moduleset>
diff --git a/modulesets/gnome-2.28.modules b/modulesets/gnome-2.28.modules
index 18f6283..577e10c 100644
--- a/modulesets/gnome-2.28.modules
+++ b/modulesets/gnome-2.28.modules
@@ -2390,4 +2390,45 @@
     </suggests>
   </autotools>
 
+  <!-- ########## Pimplico Modules ########## -->
+
+  <autotools id="contacts">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="evolution-data-server"/>
+      <dep package="gconf"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="dates">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="evolution-data-server"/>
+      <dep package="gconf"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="tasks">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="evolution-data-server"/>
+    </dependencies>
+    <suggests>
+      <dep package="libunique"/>
+    </suggests>
+  </autotools>
+
+  <metamodule id="meta-pimlico">
+    <dependencies>
+     <dep package="contacts"/>
+     <dep package="dates"/>
+     <dep package="tasks"/>
+    </dependencies>
+  </metamodule>
+
+  <!-- ########## End of Pimplico Modules ########## -->
+
 </moduleset>
diff --git a/modulesets/mobile-2.24.modules b/modulesets/mobile-2.24.modules
index 1855a00..ea92fd9 100644
--- a/modulesets/mobile-2.24.modules
+++ b/modulesets/mobile-2.24.modules
@@ -5,7 +5,6 @@
 
   <include href="gnome-2.24.modules"/>
   <include href="matchbox.modules"/>
-  <include href="pimlico.modules"/>
 
   <!-- When adding a new module here that is to be released on ftp.gnome.org,
        please also talk to the release team to update meta-gnome-mobile-suite
diff --git a/modulesets/mobile-2.26.modules b/modulesets/mobile-2.26.modules
index 308ed40..5090dde 100644
--- a/modulesets/mobile-2.26.modules
+++ b/modulesets/mobile-2.26.modules
@@ -5,7 +5,6 @@
 
   <include href="gnome-2.26.modules"/>
   <include href="matchbox.modules"/>
-  <include href="pimlico.modules"/>
 
   <!-- When adding a new module here that is to be released on ftp.gnome.org,
        please also talk to the release team to update meta-gnome-mobile-suite
diff --git a/modulesets/mobile-2.28.modules b/modulesets/mobile-2.28.modules
index 41f4e49..5ad43ce 100644
--- a/modulesets/mobile-2.28.modules
+++ b/modulesets/mobile-2.28.modules
@@ -5,7 +5,6 @@
 
   <include href="gnome-2.28.modules"/>
   <include href="matchbox.modules"/>
-  <include href="pimlico.modules"/>
 
   <!-- When adding a new module here that is to be released on ftp.gnome.org,
        please also talk to the release team to update meta-gnome-mobile-suite