[jhbuild] Revert "3.4: Move intltool to bootstrap moduleset"
- From: Javier JardÃn <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] Revert "3.4: Move intltool to bootstrap moduleset"
- Date: Mon, 23 Jan 2012 16:32:08 +0000 (UTC)
commit a37e5d6eea214362757648dbeaf3063e1a037e0b
Author: Javier JardÃn <jjardon gnome org>
Date: Mon Jan 23 16:26:42 2012 +0000
Revert "3.4: Move intltool to bootstrap moduleset"
This reverts commit 6b2a1e88755f72c804be585058fdd59a50412dbb.
modulesets/bootstrap.modules | 14 --------
modulesets/gnome-suites-core-3.4.modules | 43 +++++++++++++++++++++++++
modulesets/gnome-suites-core-deps-3.4.modules | 27 +++++++++++++++
modulesets/gnome-world-3.4.modules | 20 +++++++++++
4 files changed, 90 insertions(+), 14 deletions(-)
---
diff --git a/modulesets/bootstrap.modules b/modulesets/bootstrap.modules
index bb42b0d..103468c 100644
--- a/modulesets/bootstrap.modules
+++ b/modulesets/bootstrap.modules
@@ -13,8 +13,6 @@
href="http://dfn.dl.sourceforge.net/sourceforge/"/>
<repository type="tarball" name="tukaani.org"
href="http://tukaani.org/"/>
- <repository type="tarball" name="launchpad.net"
- href="https://launchpad.net/"/>
<autotools id="gettext" autogen-sh="configure">
<branch repo="ftp.gnu.org"
@@ -48,17 +46,6 @@
</dependencies>
</autotools>
- <autotools id="intltool">
- <branch repo="launchpad.net"
- module="intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz"
- version="0.41.1"
- hash="sha256:06d02133a85b9d6f29cd763050dc9267a6d73ef3008993f5b917cafc7ece96c0"
- size="139287"/>
- <dependencies>
- <dep package="gnome-common"/>
- </dependencies>
- </autotools>
-
<autotools id="libtool" autogen-sh="configure">
<branch repo="ftp.gnu.org"
module="libtool/libtool-2.2.6a.tar.gz" version="2.2.6a"
@@ -114,7 +101,6 @@
<dep package="gettext" />
<dep package="gnome-common" />
<dep package="autoconf" />
- <dep package="intltool" />
<dep package="libtool" />
<dep package="automake" />
<dep package="pkg-config" />
diff --git a/modulesets/gnome-suites-core-3.4.modules b/modulesets/gnome-suites-core-3.4.modules
index 9b9e616..c2aac5a 100644
--- a/modulesets/gnome-suites-core-3.4.modules
+++ b/modulesets/gnome-suites-core-3.4.modules
@@ -69,6 +69,7 @@
<autotools id="evolution-data-server" supports-non-srcdir-builds="no" autogenargs="--enable-vala-bindings">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="libsoup"/>
<dep package="libxml2"/>
<dep package="gtk+"/>
@@ -127,6 +128,7 @@
<dep package="gnome-menus"/>
<dep package="gnome-online-accounts"/>
<dep package="gnome-settings-daemon"/>
+ <dep package="intltool"/>
<dep package="iso-codes"/>
<dep package="libcanberra"/>
<dep package="libgtop"/>
@@ -148,6 +150,7 @@
<autotools id="gnome-desktop" autogenargs="--with-gnome-distributor=JHBuild">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+"/>
<dep package="gnome-doc-utils"/>
@@ -161,6 +164,7 @@
<dependencies>
<dep package="hicolor-icon-theme"/>
<dep package="icon-naming-utils"/>
+ <dep package="intltool"/>
<dep package="gtk+"/>
</dependencies>
</autotools>
@@ -183,6 +187,7 @@
<autotools id="gnome-keyring">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="dbus"/>
<dep package="gcr"/>
<dep package="glib"/>
@@ -196,6 +201,7 @@
<autotools id="gnome-menus">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gobject-introspection"/>
</dependencies>
@@ -220,10 +226,12 @@
<autotools id="gnome-power-manager">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="dbus-glib"/>
<dep package="gtk+"/>
<dep package="libgnome-keyring"/>
+ <dep package="intltool"/>
<dep package="gnome-doc-utils"/>
<dep package="upower"/>
<dep package="libnotify"/>
@@ -235,6 +243,7 @@
<autotools id="gnome-screensaver">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="gtk+"/>
<dep package="dbus-glib"/>
<dep package="gnome-menus"/>
@@ -249,6 +258,7 @@
<autotools id="gnome-session">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="gtk+"/>
<dep package="gconf"/>
<dep package="dbus-glib"/>
@@ -271,6 +281,7 @@
<dep package="gsettings-desktop-schemas"/>
<dep package="gtk+"/>
<dep package="gudev"/>
+ <dep package="intltool"/>
<dep package="libgnomekbd"/>
<dep package="libcanberra"/>
<dep package="libnotify"/>
@@ -302,6 +313,7 @@
<dep package="gnome-settings-daemon"/>
<dep package="gobject-introspection"/>
<dep package="gtk+"/>
+ <dep package="intltool"/>
<dep package="libcanberra"/>
<dep package="libcroco"/>
<dep package="libsoup"/>
@@ -325,6 +337,7 @@
<autotools id="gnome-themes-standard">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="cantarell-fonts"/>
<dep package="gtk-engines"/>
<dep package="librsvg"/>
@@ -343,6 +356,7 @@
<autotools id="gvfs">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="dbus"/>
<dep package="libsoup"/>
@@ -358,15 +372,18 @@
<dependencies>
<dep package="gtk+"/>
<dep package="gsettings-desktop-schemas"/>
+ <dep package="intltool"/>
</dependencies>
</autotools>
<autotools id="mutter" autogenargs="--enable-compile-warnings=maximum">
<branch />
<dependencies>
+ <dep package="intltool"/>
<dep package="gdk-pixbuf"/>
<dep package="gtk+"/>
<dep package="gsettings-desktop-schemas"/>
+ <dep package="intltool"/>
<dep package="zenity"/>
<dep package="clutter"/>
<dep package="gobject-introspection"/>
@@ -432,6 +449,7 @@
<autotools id="gconf" autogenargs="--enable-gtk --with-gtk=3.0 --disable-orbit">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="libxml2"/>
<dep package="gtk+"/>
<dep package="dbus-glib"/>
@@ -444,6 +462,7 @@
<autotools id="gnome-panel">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="gnome-desktop"/>
<dep package="libwnck"/>
<dep package="evolution-data-server"/>
@@ -462,9 +481,11 @@
<autotools id="metacity">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="gdk-pixbuf"/>
<dep package="gtk+-2"/>
<dep package="gsettings-desktop-schemas"/>
+ <dep package="intltool"/>
<dep package="libcanberra"/>
<dep package="zenity"/>
</dependencies>
@@ -486,6 +507,7 @@
<autotools id="baobab">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+"/>
<dep package="gnome-doc-utils"/>
@@ -513,6 +535,7 @@
<autotools id="empathy" autogenargs="--disable-Werror">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+"/>
<dep package="gsettings-desktop-schemas"/>
@@ -537,6 +560,7 @@
<autotools id="eog">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+"/>
<dep package="gnome-desktop"/>
@@ -552,6 +576,7 @@
<autotools id="epiphany">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="iso-codes"/>
<dep package="gtk+"/>
<dep package="gnome-doc-utils"/>
@@ -570,6 +595,7 @@
<autotools id="evince" autogenargs="--enable-introspection">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+"/>
<dep package="libxml2"/>
@@ -587,6 +613,7 @@
<autotools id="gcalctool" supports-non-srcdir-builds="no">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="gtk+"/>
<dep package="gnome-doc-utils"/>
</dependencies>
@@ -606,6 +633,7 @@
<autotools id="gnome-dictionary">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+"/>
<dep package="gnome-doc-utils"/>
@@ -623,6 +651,7 @@
<autotools id="gnome-font-viewer">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+"/>
<dep package="gnome-doc-utils"/>
@@ -632,6 +661,7 @@
<autotools id="gnome-screenshot">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+"/>
<dep package="gnome-doc-utils"/>
@@ -641,6 +671,7 @@
<autotools id="gnome-search-tool">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+"/>
<dep package="gnome-doc-utils"/>
@@ -650,6 +681,7 @@
<autotools id="gnome-system-log">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+"/>
<dep package="gnome-doc-utils"/>
@@ -659,6 +691,7 @@
<autotools id="gnome-system-monitor">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="libwnck"/>
<dep package="libgtop"/>
@@ -673,6 +706,7 @@
<autotools id="gnome-terminal" autogenargs="--with-gtk=3.0">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+"/>
<dep package="gconf"/>
@@ -693,6 +727,7 @@
<autotools id="gucharmap">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+"/>
<dep package="gnome-doc-utils"/>
@@ -705,6 +740,7 @@
<autotools id="nautilus">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+"/>
<dep package="pango"/>
@@ -723,6 +759,7 @@
<autotools id="sushi">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="gobject-introspection"/>
<dep package="gjs"/>
<dep package="libmusicbrainz"/>
@@ -741,6 +778,7 @@
<autotools id="totem">
<branch />
<dependencies>
+ <dep package="intltool"/>
<dep package="gtk+"/>
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
@@ -763,6 +801,7 @@
<autotools id="yelp">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+"/>
<dep package="libxml2"/>
@@ -777,6 +816,7 @@
<autotools id="gnome-backgrounds">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
</dependencies>
</autotools>
@@ -796,6 +836,7 @@
<autotools id="vino">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+"/>
<dep package="libsoup"/>
@@ -877,6 +918,7 @@
<dep package="gnome-session"/>
<dep package="gnome-settings-daemon"/>
<dep package="gtk+"/>
+ <dep package="intltool"/>
</dependencies>
</autotools>
@@ -917,6 +959,7 @@
<dep package="glib"/>
<dep package="gobject-introspection"/>
<dep package="expat"/>
+ <dep package="intltool"/>
</dependencies>
</autotools>
diff --git a/modulesets/gnome-suites-core-deps-3.4.modules b/modulesets/gnome-suites-core-deps-3.4.modules
index 5fa3296..beb4323 100644
--- a/modulesets/gnome-suites-core-deps-3.4.modules
+++ b/modulesets/gnome-suites-core-deps-3.4.modules
@@ -74,6 +74,7 @@
<dependencies>
<dep package="libxslt"/>
<dep package="libxml2"/>
+ <dep package="intltool"/>
<dep package="rarian"/>
</dependencies>
</autotools>
@@ -86,6 +87,14 @@
</dependencies>
</autotools>
+ <tarball id="intltool" version="0.41.1">
+ <source href="http://launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz";
+ hash="sha256:06d02133a85b9d6f29cd763050dc9267a6d73ef3008993f5b917cafc7ece96c0"
+ md5sum="d6c91bf06681919ccfdf3624035b75dc" size="139287"/>
+ <dependencies>
+ </dependencies>
+ </tarball>
+
<tarball id="libical" version="0.43">
<pkg-config>libical.pc</pkg-config>
<source href="http://downloads.sourceforge.net/freeassociation/libical-0.43.tar.gz";
@@ -210,6 +219,7 @@
<branch/>
<dependencies>
<dep package="glib"/>
+ <dep package="intltool"/>
<dep package="libproxy"/>
<dep package="gsettings-desktop-schemas"/>
<dep package="gnutls"/>
@@ -321,6 +331,7 @@
md5sum="6811712bced796d025d1a8a0f728d941" size="282640"/>
<dependencies>
<dep package="glib"/>
+ <dep package="intltool"/>
</dependencies>
</tarball>
@@ -398,6 +409,7 @@
<autotools id="gtksourceview" autogenargs="--enable-compile-warnings=maximum">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="libxml2"/>
<dep package="shared-mime-info"/>
<dep package="gtk+"/>
@@ -752,6 +764,7 @@
<autotools id="libgnomekbd">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="gtk+" />
<dep package="libxklavier" />
</dependencies>
@@ -760,6 +773,7 @@
<autotools id="libgweather">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="libxml2"/>
<dep package="gconf"/>
<dep package="gtk+"/>
@@ -772,6 +786,7 @@
hash="sha256:16d29e82f7eba68f919f2588ea5328973490fe6d4a7a5f160e8af89b387c9a95"
md5sum="2c15d875b1931c40c7e7a2368f3ed948" size="611584"/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
</dependencies>
<suggests>
@@ -782,6 +797,7 @@
<autotools id="libgtop">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
</dependencies>
</autotools>
@@ -1039,6 +1055,7 @@
<dependencies>
<dep package="polkit"/>
<dep package="gtk+"/>
+ <dep package="intltool"/>
</dependencies>
</autotools>
@@ -1086,6 +1103,7 @@
md5sum="75091185e13da67a0ff4279de1757b94" size="324441"/>
<dependencies>
<dep package="libxslt"/>
+ <dep package="intltool"/>
</dependencies>
</tarball>
@@ -1094,6 +1112,7 @@
hash="sha256:1d8f97f17de77ae0d8a3a4ef357280ef444da87f4ce19170392712d0c2f6d04f"
md5sum="0a90508234d415f761a79fbffdff74f4" size="493216"/>
<dependencies>
+ <dep package="intltool"/>
<dep package="libxml2"/>
<dep package="glib"/>
</dependencies>
@@ -1166,6 +1185,7 @@
<autotools id="totem-pl-parser">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gmime"/>
<dep package="libsoup"/>
@@ -1189,6 +1209,7 @@
<dependencies>
<dep package="nautilus"/>
<dep package="gstreamer"/>
+ <dep package="intltool"/>
<dep package="poppler"/>
<dep package="sqlite3"/>
<dep package="vala"/>
@@ -1240,6 +1261,7 @@
<autotools id="vte" autogenargs="--with-gtk=3.0 --enable-introspection=yes">
<branch revision="vte-0-32"/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+"/>
</dependencies>
@@ -1250,6 +1272,7 @@
<dependencies>
<dep package="libxslt"/>
<dep package="libxml2"/>
+ <dep package="intltool"/>
<dep package="yelp-xsl"/>
<dep package="itstool"/>
</dependencies>
@@ -1260,6 +1283,7 @@
<dependencies>
<dep package="libxslt"/>
<dep package="libxml2"/>
+ <dep package="intltool"/>
<dep package="itstool"/>
</dependencies>
</autotools>
@@ -1267,6 +1291,7 @@
<autotools id="zenity">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="gtk+"/>
<dep package="gnome-doc-utils"/>
</dependencies>
@@ -1351,6 +1376,7 @@
<autotools id="libgnome-keyring">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="dbus"/>
<dep package="libgcrypt"/>
</dependencies>
@@ -1359,6 +1385,7 @@
<autotools id="libwnck">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="gtk+"/>
<dep package="startup-notification"/>
</dependencies>
diff --git a/modulesets/gnome-world-3.4.modules b/modulesets/gnome-world-3.4.modules
index bd7304c..432296c 100644
--- a/modulesets/gnome-world-3.4.modules
+++ b/modulesets/gnome-world-3.4.modules
@@ -109,6 +109,7 @@
<autotools id="alacarte">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="gnome-menus"/>
<dep package="pygtk"/>
</dependencies>
@@ -117,6 +118,7 @@
<autotools id="gnome-desktop-2" autogenargs="--with-gnome-distributor=JHBuild">
<branch revision="gnome-2-32" checkoutdir="gnome-desktop-2" module="gnome-desktop"/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="gtk+-2"/>
<dep package="gconf"/>
@@ -149,6 +151,7 @@
<waf id="hamster-applet" check-target="false">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="pygtk"/>
<dep package="py2cairo"/>
<dep package="gnome-control-center"/>
@@ -177,6 +180,7 @@
<autotools id="libwnck-2">
<branch revision="gnome-2-30" checkoutdir="libwnck-2" module="libwnck"/>
<dependencies>
+ <dep package="intltool"/>
<dep package="gtk+-2"/>
<dep package="startup-notification"/>
</dependencies>
@@ -555,6 +559,7 @@
<autotools id="regexxer">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="gtkmm"/>
</dependencies>
</autotools>
@@ -594,6 +599,7 @@
<dep package="libgnome-keyring"/>
<dep package="dbus"/>
<dep package="gtk+-2"/>
+ <dep package="intltool"/>
<dep package="libglade"/>
<dep package="nautilus"/>
</dependencies>
@@ -631,6 +637,7 @@
<dependencies>
<dep package="glib"/>
<dep package="gconf"/>
+ <dep package="intltool"/>
</dependencies>
</autotools>
@@ -682,6 +689,7 @@
<autotools id="gtranslator">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="libpeas"/>
<dep package="gdl"/>
<dep package="gtksourceview"/>
@@ -940,6 +948,7 @@
<autotools id="libepc">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="libsoup"/>
<dep package="avahi"/>
<dep package="gnutls"/>
@@ -1273,6 +1282,7 @@
checkoutdir="transmission"/>
<dependencies>
<dep package="gtk+-2"/>
+ <dep package="intltool"/>
</dependencies>
<suggests>
<dep package="dbus-glib"/>
@@ -1366,6 +1376,7 @@
<autotools id="gnome-sound-theme">
<branch/>
<dependencies>
+ <dep package="intltool"/>
</dependencies>
</autotools>
@@ -1381,6 +1392,7 @@
<branch/>
<dependencies>
<dep package="gtk+-2"/>
+ <dep package="intltool"/>
</dependencies>
</autotools>
@@ -1493,6 +1505,7 @@
<autotools id="almanah">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="gtk+-2"/>
<dep package="gconf"/>
<dep package="sqlite3"/>
@@ -1587,6 +1600,7 @@
checkoutdir="liferea"/>
<dependencies>
<dep package="gtk+-2"/>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="pango"/>
<dep package="gconf"/>
@@ -1785,6 +1799,7 @@
<autotools id="pdfmod">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="gtk-sharp"/>
<dep package="poppler"/>
<dep package="hyena"/>
@@ -1860,6 +1875,7 @@
<autotools id="libgnomecups">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
</dependencies>
</autotools>
@@ -1867,6 +1883,7 @@
<autotools id="libgnomeprint">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="glib"/>
<dep package="pango"/>
<dep package="libgnomecups"/>
@@ -1876,6 +1893,7 @@
<autotools id="libgnomeprintui">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="libgnomeprint"/>
<dep package="gtk+-2"/>
<dep package="gnome-icon-theme"/>
@@ -2039,6 +2057,7 @@
<autotools id="evolution-mapi">
<branch/>
<dependencies>
+ <dep package="intltool"/>
<dep package="evolution-data-server"/>
<dep package="evolution"/>
<dep package="libmapi"/>
@@ -2052,6 +2071,7 @@
<dep package="gconf"/>
<dep package="gtk+"/>
<dep package="libsoup"/>
+ <dep package="intltool"/>
<dep package="evolution-data-server"/>
<dep package="evolution"/>
</dependencies>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
