[jhbuild] 3.6: deduplicate cogl, GNOME only tracks 0.10



commit 5345d60d7f076ba13d29387fda997f5dd83634d6
Author: FrÃdÃric PÃters <fpeters 0d be>
Date:   Thu Apr 12 18:11:38 2012 +0200

    3.6: deduplicate cogl, GNOME only tracks 0.10

 modulesets/gnome-suites-core-deps-3.6.modules |   17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.6.modules b/modulesets/gnome-suites-core-deps-3.6.modules
index 5acddcf..9067dde 100644
--- a/modulesets/gnome-suites-core-deps-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-3.6.modules
@@ -147,21 +147,8 @@
   </autotools>
 
   <autotools id="cogl">
-    <pkg-config>cogl-2.0.pc</pkg-config>
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="cogl-1.10">
     <pkg-config>cogl-1.0.pc</pkg-config>
-    <branch module="cogl"
-            revision="cogl-1.10"
-            checkoutdir="cogl-1.10"/>
+    <branch revision="cogl-1.10"/>
     <dependencies>
       <dep package="glib"/>
     </dependencies>
@@ -173,7 +160,7 @@
   <autotools id="clutter">
     <branch/>
     <dependencies>
-      <dep package="cogl-1.10"/>
+      <dep package="cogl"/>
       <dep package="atk"/>
       <dep package="glib"/>
       <dep package="cairo"/>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]