[jhbuild] deps-3.6: All the modules depend on libgee 0.6
- From: Javier JardÃn <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] deps-3.6: All the modules depend on libgee 0.6
- Date: Thu, 12 Apr 2012 01:25:12 +0000 (UTC)
commit f96d8891026244bae38425d5bafae994d36347e2
Author: Marc-Andrà Lureau <marcandre lureau gmail com>
Date: Thu Apr 12 01:59:06 2012 +0200
deps-3.6: All the modules depend on libgee 0.6
Also add a new repo for libgee master (0.8)
https://bugzilla.gnome.org/show_bug.cgi?id=673957
modulesets/gnome-apps-3.6.modules | 6 +++---
modulesets/gnome-suites-core-deps-3.6.modules | 23 +++++++++++++++++------
modulesets/gnome-world-3.6.modules | 12 ++----------
3 files changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.6.modules b/modulesets/gnome-apps-3.6.modules
index 96156ef..7c2f454 100644
--- a/modulesets/gnome-apps-3.6.modules
+++ b/modulesets/gnome-apps-3.6.modules
@@ -794,7 +794,7 @@
<dep package="gupnp-av"/>
<dep package="gupnp-dlna"/>
<dep package="gstreamer"/>
- <dep package="libgee"/>
+ <dep package="libgee-0.6"/>
</dependencies>
</autotools>
@@ -868,7 +868,7 @@
<dep package="clutter-gtk"/>
<dep package="libcanberra"/>
<dep package="vala"/>
- <dep package="libgee"/>
+ <dep package="libgee-0.6"/>
<dep package="gnome-video-effects"/>
<dep package="librsvg"/>
<dep package="gnome-desktop"/>
@@ -1104,7 +1104,7 @@
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
<dep package="gudev"/>
- <dep package="libgee"/>
+ <dep package="libgee-0.6"/>
<dep package="libsoup"/>
<dep package="libunique"/>
<dep package="libxml2"/>
diff --git a/modulesets/gnome-suites-core-deps-3.6.modules b/modulesets/gnome-suites-core-deps-3.6.modules
index dcece37..dc3d1f5 100644
--- a/modulesets/gnome-suites-core-deps-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-3.6.modules
@@ -256,7 +256,7 @@
<dep package="pygobject"/>
<dep package="gtk+"/>
<dep package="clutter"/>
- <dep package="libgee"/>
+ <dep package="libgee-0.6"/>
<dep package="libxklavier"/>
<dep package="vala"/>
</dependencies>
@@ -305,7 +305,7 @@
<dependencies>
<dep package="dbus"/>
<dep package="dbus-glib"/>
- <dep package="libgee"/>
+ <dep package="libgee-0.6"/>
<dep package="vala"/>
<dep package="gobject-introspection"/>
<dep package="telepathy-glib"/>
@@ -537,15 +537,26 @@
</dependencies>
</autotools>
- <autotools id="libgee">
- <branch/>
+ <autotools id="libgee-0.6">
<pkg-config>gee-1.0.pc</pkg-config>
+ <branch module="libgee"
+ revision="0.6"
+ checkoutdir="libgee-0.6"/>
<dependencies>
<dep package="glib"/>
+ <dep package="gobject-introspection"/>
+ <dep package="vala"/>
</dependencies>
- <suggests>
+ </autotools>
+
+ <autotools id="libgee">
+ <pkg-config>gee-0.8.pc</pkg-config>
+ <branch/>
+ <dependencies>
+ <dep package="glib"/>
<dep package="gobject-introspection"/>
- </suggests>
+ <dep package="vala"/>
+ </dependencies>
</autotools>
<autotools id="libgnomekbd">
diff --git a/modulesets/gnome-world-3.6.modules b/modulesets/gnome-world-3.6.modules
index bcacb62..4563a43 100644
--- a/modulesets/gnome-world-3.6.modules
+++ b/modulesets/gnome-world-3.6.modules
@@ -937,14 +937,6 @@
</dependencies>
</autotools>
- <autotools id="libgee-trunk">
- <branch module="libgee"/>
- <dependencies>
- <dep package="vala-trunk"/>
- <dep package="glib"/>
- </dependencies>
- </autotools>
-
<autotools id="libepc">
<branch/>
<dependencies>
@@ -1537,7 +1529,7 @@
<dep package="vala-trunk"/>
<dep package="gst-plugins-good"/>
<dep package="gst-plugins-bad"/>
- <dep package="libgee"/>
+ <dep package="libgee-0.6"/>
<dep package="sqlite3"/>
<dep package="pygobject2"/>
<dep package="gst-python"/>
@@ -1980,7 +1972,7 @@
<branch/>
<dependencies>
<dep package="vala"/>
- <dep package="libgee"/>
+ <dep package="libgee-0.6"/>
<dep package="clutter-gtk"/>
<dep package="clutter-gst"/>
<dep package="json-glib"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]