[jhbuild] [3.2] fixed includes and branches in 3.2 modulesets
- From: Frederic Peters <fpeters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] [3.2] fixed includes and branches in 3.2 modulesets
- Date: Thu, 7 Apr 2011 07:43:29 +0000 (UTC)
commit 2ac83e5fb40ef020f2060a5767225f29774d80e7
Author: Frédéric Péters <fpeters 0d be>
Date: Thu Apr 7 13:12:49 2011 +0530
[3.2] fixed includes and branches in 3.2 modulesets
modulesets/gnome-apps-3.2.modules | 32 +++++++++++-----------
modulesets/gnome-suites-core-3.2.modules | 36 ++++++++++++------------
modulesets/gnome-suites-core-deps-3.2.modules | 12 ++++----
modulesets/gnome-world-3.2.modules | 6 ++--
4 files changed, 43 insertions(+), 43 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.2.modules b/modulesets/gnome-apps-3.2.modules
index 85d636e..bf1c0ac 100644
--- a/modulesets/gnome-apps-3.2.modules
+++ b/modulesets/gnome-apps-3.2.modules
@@ -40,9 +40,9 @@
<repository type="git" name="colord.gitorious.org"
href="git://gitorious.org/colord/master.git"/>
- <include href="gnome-suites-core-3.0.modules"/>
+ <include href="gnome-suites-core-3.2.modules"/>
- <!-- NOTE: gnome-suites-core-3.0 and gnome-suites-core-deps-3.0
+ <!-- NOTE: gnome-suites-core-3.2 and gnome-suites-core-deps-3.2
are supposed to remain self-contained. If apps have dependencies
that are not covered there, add them in here
-->
@@ -82,7 +82,7 @@
</autotools>
<autotools id="gnome-keyring-2" autogenargs="--with-gtk=2.0">
- <branch checkoutdir="gnome-keyring-2" module="gnome-keyring" revision="gnome-3-0"/>
+ <branch checkoutdir="gnome-keyring-2" module="gnome-keyring"/>
<dependencies>
<dep package="intltool"/>
<dep package="dbus"/>
@@ -112,7 +112,7 @@
</autotools>
<autotools id="gtkhtml">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="gtk+"/>
@@ -413,7 +413,7 @@
</tarball>
<autotools id="gdl">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="librsvg"/>
@@ -637,7 +637,7 @@
</tarball>
<autotools id="gnome-color-manager">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="glib"/>
<dep package="gnome-control-center"/>
@@ -657,7 +657,7 @@
</autotools>
<autotools id="gnome-devel-docs">
- <branch revision="gnome-2-32"/>
+ <branch/>
<dependencies>
<dep package="gnome-doc-utils"/>
</dependencies>
@@ -700,7 +700,7 @@
</autotools>
<autotools id="anjuta">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="glib"/>
@@ -736,7 +736,7 @@
<autotools id="cheese">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="glib"/>
@@ -785,7 +785,7 @@
</autotools>
<autotools id="evolution" autogenargs="--disable-image-inline --disable-pst-import --disable-nm">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="gtk+"/>
@@ -834,7 +834,7 @@
</autotools>
<autotools id="gnome-games">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="librsvg"/>
@@ -872,7 +872,7 @@
</waf>
<autotools id="nautilus-sendto">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="glib"/>
<dep package="gtk+"/>
@@ -885,7 +885,7 @@
</autotools>
<autotools id="orca">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="dbus-python"/>
<dep package="gconf"/>
@@ -924,7 +924,7 @@
</autotools>
<autotools id="seahorse" autogenargs="--with-gtk=3.0">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="gconf"/>
@@ -951,7 +951,7 @@
</autotools>
<autotools id="tomboy">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="gtk-sharp"/>
@@ -966,7 +966,7 @@
</autotools>
<autotools id="vinagre">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="libxml2"/>
diff --git a/modulesets/gnome-suites-core-3.2.modules b/modulesets/gnome-suites-core-3.2.modules
index 75a1d78..bdccca9 100644
--- a/modulesets/gnome-suites-core-3.2.modules
+++ b/modulesets/gnome-suites-core-3.2.modules
@@ -19,7 +19,7 @@
<repository type="tarball" name="kernel.org"
href="http://www.kernel.org"/>
-<include href="gnome-suites-core-deps-3.0.modules"/>
+<include href="gnome-suites-core-deps-3.2.modules"/>
<!-- Please try to keep organized alphabetically by section -->
@@ -57,7 +57,7 @@
</autotools>
<autotools id="evolution-data-server" supports-non-srcdir-builds="no">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="libsoup"/>
@@ -79,7 +79,7 @@
</autotools>
<autotools id="gnome-bluetooth">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="gtk+"/>
<dep package="glib"/>
@@ -155,7 +155,7 @@
</autotools>
<autotools id="gnome-keyring" autogenargs="--with-gtk=3.0">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="dbus"/>
@@ -179,7 +179,7 @@
</autotools>
<autotools id="gnome-packagekit" autogenargs="--disable-strict">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="PackageKit"/>
<dep package="gtk+"/>
@@ -195,7 +195,7 @@
</autotools>
<autotools id="gnome-power-manager">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="glib"/>
@@ -294,7 +294,7 @@
</autotools>
<autotools id="gnome-themes-standard">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="cantarell-fonts"/>
@@ -311,7 +311,7 @@
</autotools>
<autotools id="gvfs">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="glib"/>
@@ -325,7 +325,7 @@
</autotools>
<autotools id="mousetweaks">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="gtk+"/>
<dep package="gsettings-desktop-schemas"/>
@@ -470,7 +470,7 @@
<!-- Core Utilities -->
<autotools id="brasero">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="gtk+"/>
<dep package="gconf"/>
@@ -568,7 +568,7 @@
</autotools>
<autotools id="gcalctool" supports-non-srcdir-builds="no" autogenargs="--with-gtk=3.0">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="gtk+"/>
@@ -577,7 +577,7 @@
</autotools>
<autotools id="gnome-disk-utility">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="avahi"/>
<dep package="gtk+"/>
@@ -605,7 +605,7 @@
</autotools>
<autotools id="gnome-terminal" autogenargs="--with-gtk=3.0">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="glib"/>
@@ -618,7 +618,7 @@
</autotools>
<autotools id="gnome-user-docs">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="gnome-doc-utils"/>
</dependencies>
@@ -636,7 +636,7 @@
</autotools>
<autotools id="gucharmap" autogenargs="--with-gtk=3.0">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="glib"/>
@@ -649,7 +649,7 @@
</autotools>
<autotools id="nautilus">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="glib"/>
@@ -669,7 +669,7 @@
</autotools>
<autotools id="totem">
- <branch revision="gnome-3-0"/>
+ <branch />
<dependencies>
<dep package="intltool"/>
<dep package="gtk+"/>
@@ -726,7 +726,7 @@
</autotools>
<autotools id="vino">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="glib"/>
diff --git a/modulesets/gnome-suites-core-deps-3.2.modules b/modulesets/gnome-suites-core-deps-3.2.modules
index 4cfbf56..3b6d3e4 100644
--- a/modulesets/gnome-suites-core-deps-3.2.modules
+++ b/modulesets/gnome-suites-core-deps-3.2.modules
@@ -48,7 +48,7 @@
<!-- Please try to keep organized alphabetically by section -->
-<!-- Build dependencies of gnome-suites-core-3.0 -->
+<!-- Build dependencies of gnome-suites-core-3.2 -->
<!-- This is a special module: it's needed to build from git, but not
needed to build from tarballs, so it doesn't need to be in our suites
@@ -171,7 +171,7 @@
</autotools>
<autotools id="glib">
- <branch revision="glib-2-28"/>
+ <branch/>
<dependencies>
<dep package="gtk-doc"/>
</dependencies>
@@ -197,7 +197,7 @@
</autotools>
<autotools id="gtk+">
- <branch revision="gtk-3-0"/>
+ <branch/>
<dependencies>
<dep package="atk"/>
<dep package="glib"/>
@@ -213,7 +213,7 @@
</autotools>
<autotools id="pango">
- <branch revision="1.28"/>
+ <branch/>
<dependencies>
<dep package="glib"/>
<dep package="cairo"/>
@@ -985,7 +985,7 @@
</autotools>
<autotools id="pygobject">
- <branch revision="pygobject-2-28"/>
+ <branch/>
<dependencies>
<dep package="glib"/>
<dep package="gobject-introspection"/>
@@ -1177,7 +1177,7 @@
</autotools>
<autotools id="zenity">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="gtk+"/>
diff --git a/modulesets/gnome-world-3.2.modules b/modulesets/gnome-world-3.2.modules
index d814078..52eb94f 100644
--- a/modulesets/gnome-world-3.2.modules
+++ b/modulesets/gnome-world-3.2.modules
@@ -119,8 +119,8 @@
branches-template="%(branch)s"
tags-template="%(tag)s"/>
- <include href="gnome-apps-3.0.modules"/>
- <include href="gnome-suites-core-3.0.modules"/>
+ <include href="gnome-apps-3.2.modules"/>
+ <include href="gnome-suites-core-3.2.modules"/>
<autotools id="gnome-desktop-2" autogenargs="--with-gnome-distributor=JHBuild">
<branch revision="gnome-2-32" checkoutdir="gnome-desktop-2" module="gnome-desktop"/>
@@ -2073,7 +2073,7 @@
</autotools>
<autotools id="evolution-mapi">
- <branch revision="gnome-3-0"/>
+ <branch/>
<dependencies>
<dep package="intltool"/>
<dep package="evolution-data-server"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
