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