[jhbuild] [3.0] Remove libgnomeprint/ui libraries from the official moduleset

[Javier Jardón <jjardon src gnome org>]

commit 6436a4e290e359f4e2edb41090ebec016803175d
Author: Javier Jardón <jjardon gnome org>
Date:   Thu Jun 17 20:03:50 2010 +0200

    [3.0] Remove libgnomeprint/ui libraries from the official moduleset
    
    Mover them to gnome-3.0.modules

 modulesets/gnome-3.0.modules        |   25 +++++++++++++++++++++++++
 modulesets/gnome-suites-3.0.modules |   29 -----------------------------
 2 files changed, 25 insertions(+), 29 deletions(-)
---
diff --git a/modulesets/gnome-3.0.modules b/modulesets/gnome-3.0.modules
index 2d7b6b2..0257055 100644
--- a/modulesets/gnome-3.0.modules
+++ b/modulesets/gnome-3.0.modules
@@ -2384,4 +2384,29 @@
     </suggests>
   </autotools>
 
+  <!-- Desktop: deprecated libraries -->
+
+  <autotools id="libgnomeprint">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="libart_lgpl"/>
+      <dep package="glib"/>
+      <dep package="gnome-common"/>
+      <dep package="pango"/>
+      <dep package="libgnomecups"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgnomeprintui">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="libgnomeprint"/>
+      <dep package="gtk+"/>
+      <dep package="libgnomecanvas"/>
+      <dep package="gnome-icon-theme"/>
+    </dependencies>
+  </autotools>
+
 </moduleset>
diff --git a/modulesets/gnome-suites-3.0.modules b/modulesets/gnome-suites-3.0.modules
index ac4ca1b..689f418 100644
--- a/modulesets/gnome-suites-3.0.modules
+++ b/modulesets/gnome-suites-3.0.modules
@@ -857,8 +857,6 @@
     <dependencies>
       <dep package="gnome-python"/>
       <dep package="gnome-panel"/>
-      <dep package="libgnomeprint"/>
-      <dep package="libgnomeprintui"/>
       <dep package="libwnck"/>
       <dep package="totem-pl-parser"/>
       <dep package="libgtop"/>
@@ -1505,31 +1503,6 @@
     </dependencies>
   </autotools>
 
-<!-- Desktop: upcoming deprecations -->
-
-  <autotools id="libgnomeprint">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="libart_lgpl"/>
-      <dep package="glib"/>
-      <dep package="gnome-common"/>
-      <dep package="pango"/>
-      <dep package="libgnomecups"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libgnomeprintui">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="libgnomeprint"/>
-      <dep package="gtk+"/>
-      <dep package="libgnomecanvas"/>
-      <dep package="gnome-icon-theme"/>
-    </dependencies>
-  </autotools>
-
 <!-- Platform Bindings -->
 
   <autotools id="mm-common">
@@ -1955,8 +1928,6 @@
 
   <metamodule id="meta-gnome-desktop-upcoming-deprecations">
     <dependencies>
-      <dep package="libgnomeprint"/>
-      <dep package="libgnomeprintui"/>
       <dep package="libgail-gnome"/>
     </dependencies>
   </metamodule>