diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/modulesets/glucose-external.modules | 130 | ||||
-rw-r--r-- | config/modulesets/glucose.modules | 13 | ||||
-rw-r--r-- | config/modulesets/sugar.modules | 1 | ||||
-rw-r--r-- | config/modulesets/tools.modules | 34 | ||||
-rw-r--r-- | config/sysdeps/fedora-10.xml | 11 | ||||
-rw-r--r-- | config/sysdeps/fedora-11.xml | 11 | ||||
-rw-r--r-- | config/sysdeps/fedora-rawhide.xml | 11 |
7 files changed, 30 insertions, 181 deletions
diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules index 3189486..019bb81 100644 --- a/config/modulesets/glucose-external.modules +++ b/config/modulesets/glucose-external.modules @@ -1,31 +1,12 @@ <?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*--> <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?> <moduleset> - <repository type="git" name="dev.laptop.org/projects" - href="git://dev.laptop.org/projects/" /> <repository type="svn" name="svn.gnome.org" href="http://svn.gnome.org/svn/"/> - <repository type="git" name="git.imendio.com" - href="git://git.imendio.com/projects/"/> <repository type="svn" name="matchbox.o-hand.com" href="http://svn.o-hand.com/repos/matchbox/"/> - <repository type="tarball" name="telepathy" - href="http://telepathy.freedesktop.org/releases/"/> - <repository type="tarball" name="xulrunner" - href="http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/"/> - <repository type="tarball" name="dbus" - href="http://dbus.freedesktop.org/releases/"/> <repository type="git" name="git.sugarlabs.org" default="yes" href="git://git.sugarlabs.org"/> - <repository type="tarball" name="ftp.gnome.org" - href="http://ftp.gnome.org/pub/gnome/sources/"/> - <tarball id="pygobject" version="2.14"> - <source href="http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.14/pygobject-2.14.2.tar.bz2" - md5sum="0e9e9300e81847f4f7266f49d3bebbaf" size="366808"/> - <patches> - <patch file="pygobject-pylint.patch" strip="0"/> - </patches> - </tarball> <tarball id="libmatchbox" version="1.8" autogenargs="--enable-pango"> <source href="http://matchbox-project.org/sources/libmatchbox/1.8/libmatchbox-1.8.tar.bz2" size="303304" md5sum="6bbd6b41f4fd78b7baa6157b303e5ac0"/> @@ -38,122 +19,11 @@ <dep package="libmatchbox"/> </dependencies> </autotools> - <autotools id="xulrunner" autogenargs="--disable-accessibility --with-pthreads --disable-strip --disable-install-strip --disable-tests --disable-debug --disable-installer --enable-optimize --enable-xinerama --enable-default-toolkit=cairo-gtk2 --disable-xprint --enable-pango --enable-svg --enable-canvas --enable-application=xulrunner --disable-javaxpcom --disable-gnomeui --disable-gnomevfs --disable-airbag --enable-extensions=default,cookie,python/xpcom --disable-crashreporter" makeinstallargs="install SKIP_GRE_REGISTRATION=1"> - <branch repo="xulrunner" module="1.9.0.7/source/xulrunner-1.9.0.7-source.tar.bz2" version="1.9.0.7" - size="37066129" md5sum="9875c9237b532009df8e91c3785539a3" checkoutdir="mozilla"/> - <dependencies> - </dependencies> - <patches> - <patch file="xulrunner-xds.patch" strip="0"/> - <patch file="xulrunner-no-native-theme.patch" strip="0"/> - <patch file="xulrunner-perms.patch" strip="0"/> - </patches> - </autotools> - <tarball id="abiword" autogenargs="--enable-libabiword --enable-debug --disable-bonobo --disable-gnomevfs --disable-gnomeui --disable-gucharmap --disable-printing" makefile="GNUmakefile" version="2.6.8"> - <source href="http://abisource.com/downloads/abiword/2.6.8/source/abiword-2.6.8.tar.gz" - md5sum="fab04d8ef999c303f720197adf261310"/> - </tarball> - <tarball id="abiword-plugins" autogenargs="--enable-libabiword --enable-debug --disable-all --enable-OpenDocument --enable-abicollab --with-abicollab-sugar-backend --enable-abicollab-record-always --enable-loadbindings --with-abiword=../abiword-2.6.8" makefile="GNUmakefile" version="2.6.8"> - <source href="http://abisource.com/downloads/abiword/2.6.8/source/abiword-plugins-2.6.8.tar.gz" - md5sum="421c49723e209c971ddb0798c1b313a9"/> - <dependencies> - <dep package="abiword"/> - </dependencies> - </tarball> - <tarball id="pyabiword" version="0.6.2"> - <source href="http://www.abisource.com/downloads/pyabiword/0.6.2/pyabiword-0.6.2.tar.gz" - md5sum="c2e652ff6c5f9b5df0d28773952e4c0c"/> - <dependencies> - <dep package="abiword"/> - </dependencies> - </tarball> <autotools id="hulahop"> <branch module="hulahop/mainline.git" checkoutdir="hulahop"/> - <dependencies> - <dep package="xulrunner"/> - </dependencies> </autotools> <autotools id="hippo-canvas"> <branch repo="svn.gnome.org"/> - <dependencies> - <dep package="pygobject"/> - </dependencies> - </autotools> - <autotools id="telepathy-gabble" - autogen-sh="configure"> - <branch repo="telepathy" - version="0.7.25" - module="telepathy-gabble/telepathy-gabble-0.7.25.tar.gz" - size="1732475" md5sum="5fae7fbfb8e40be28e8dae5cba5cb947"> - <patch file="telepathy-gabble-0001-Add-gthread-2.0-to-pkgconfig-check.patch" strip="1" /> - </branch> - <dependencies> - <dep package="telepathy-glib"/> - <dep package="dbus-glib"/> - <dep package="libsoup"/> - </dependencies> - </autotools> - <autotools id="libsoup"> - <branch repo="ftp.gnome.org" - version="2.4.1" - module="libsoup/2.4/libsoup-2.4.1.tar.bz2" - size="627890" md5sum="d0fc91ccb9da401e9e40d2f4612bdac9" /> - <dependencies> - <!-- sysdeps: --> - <!-- glib 2.15.3 --> - <!-- libgnutls --> - <!-- libgcrypt 1.2.0 --> - <!-- optional: gtk-doc 1.0 --> - <!-- optional: curl --> - </dependencies> - </autotools> - <autotools id="telepathy-salut" - autogen-sh="configure" autogenargs="--enable-olpc --enable-ssl"> - <branch repo="telepathy" - version="0.3.9" - module="telepathy-salut/telepathy-salut-0.3.9.tar.gz" - size="1172347" md5sum="b61b6f8a86b07a10315c4cca9d78b4fa"> - </branch> - <dependencies> - <dep package="telepathy-glib"/> - <dep package="libsoup"/> - </dependencies> - </autotools> - <autotools id="telepathy-glib" autogen-sh="configure"> - <branch repo="telepathy" version="0.7.29" - module="telepathy-glib/telepathy-glib-0.7.29.tar.gz" - size="5009792" md5sum="ae67d4fe42c7e337813754cb5927b6cc" /> - </autotools> - <distutils id="telepathy-python"> - <branch module="telepathy-python/telepathy-python-0.15.7.tar.gz" - repo="telepathy" version="0.15.7" - size="180111" md5sum="e65f660f10076df4149b64308b650de1"/> - <dependencies> - <dep package="telepathy-gabble"/> - </dependencies> - </distutils> - <tarball id="evince" autogenargs="--disable-static --disable-scrollkeeper --disable-schemas-install --disable-dvi --enable-pixbuf --disable-thumbnailer --disable-djvu --disable-comics --disable-nautilus --without-keyring"> - <source href="http://download.gnome.org/sources/evince/2.25/evince-2.25.90.tar.bz2" - version="2.25.90" size="1790620" md5sum="931b4d5fb4c5a2e4e079a62662b9d224"/> - </tarball> - <tarball id="gnome-python-desktop"> - <source href="http://download.gnome.org/sources/gnome-python-desktop/2.25/gnome-python-desktop-2.25.90.tar.bz2" - version="2.25.90" size="571621" md5sum="9bc794079fb4dd02f4d0651ff04bbace"/> - <dependencies> - <dep package="evince"/> - </dependencies> - </tarball> - <tarball id="GConf-dbus"> - <source href="http://ftp.gnome.org/pub/gnome/sources/GConf-dbus/2.16/GConf-dbus-2.16.0.tar.bz2" - version="2.16.0" size="1363876" md5sum="3e7d648f75949b5362af807f5408546b"/> - <patches> - <patch file="gconf-dbus-defaultpath.patch" strip="0"/> - </patches> - </tarball> - <autotools id="dbus-glib" autogen-sh="configure"> - <branch repo="dbus" version="0.78" - module="dbus-glib/dbus-glib-0.78.tar.gz" - size="683454" md5sum="d4aa04b9df35b4bd663be38e959941c8" /> </autotools> <distutils id="sugar-update-control"> <branch repo="git.sugarlabs.org" diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules index ccef1d4..ffb59d0 100644 --- a/config/modulesets/glucose.modules +++ b/config/modulesets/glucose.modules @@ -5,14 +5,10 @@ href="git://git.sugarlabs.org"/> <autotools id="sugar-base"> <branch module="sugar-base/mainline.git" checkoutdir="sugar-base"/> - <dependencies> - <dep package="pygobject"/> - </dependencies> </autotools> <autotools id="sugar-toolkit"> <branch module="sugar-toolkit/mainline.git" checkoutdir="sugar-toolkit"/> <dependencies> - <dep package="pygobject"/> <dep package="sugar-datastore"/> <dep package="hippo-canvas"/> <dep package="sugar-presence-service"/> @@ -21,7 +17,6 @@ <autotools id="sugar"> <branch module="sugar/mainline.git" checkoutdir="sugar"/> <dependencies> - <dep package="GConf-dbus"/> <dep package="sugar-base"/> <dep package="sugar-toolkit"/> <dep package="sugar-artwork"/> @@ -30,11 +25,6 @@ </autotools> <autotools id="sugar-presence-service"> <branch module="sugar-presence-service/mainline.git" checkoutdir="sugar-presence-service"/> - <dependencies> - <dep package="telepathy-gabble"/> - <dep package="telepathy-salut"/> - <dep package="telepathy-python"/> - </dependencies> </autotools> <autotools id="sugar-artwork"> <branch module="sugar-artwork/mainline.git" checkoutdir="sugar-artwork"/> @@ -48,9 +38,6 @@ <metamodule id="meta-glucose"> <dependencies> <dep package="sugar"/> - <dep package="pyabiword"/> - <dep package="abiword-plugins"/> - <dep package="gnome-python-desktop"/> <dep package="hulahop"/> <dep package="sugar-update-control"/> </dependencies> diff --git a/config/modulesets/sugar.modules b/config/modulesets/sugar.modules index cb66062..a4bfb91 100644 --- a/config/modulesets/sugar.modules +++ b/config/modulesets/sugar.modules @@ -11,7 +11,6 @@ <include href="buildbot.modules"/> <metamodule id="meta-sugar"> <dependencies> - <dep package="meta-tools"/> <dep package="meta-glucose"/> <dep package="meta-fructose"/> </dependencies> diff --git a/config/modulesets/tools.modules b/config/modulesets/tools.modules deleted file mode 100644 index 3600f6b..0000000 --- a/config/modulesets/tools.modules +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*--> -<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?> -<moduleset> - <repository type="tarball" name="logilab" - href="ftp://ftp.logilab.fr/pub/"/> - <distutils id="pylint"> - <branch repo="logilab" version="0.15.2" - module="pylint/pylint-0.15.2.tar.gz" - size="208732" md5sum="98f3917fc4d0855c8f0eab9761533835"/> - <dependencies> - <dep package="logilab-astng"/> - </dependencies> - </distutils> - <distutils id="logilab-common"> - <branch repo="logilab" version="0.35.2" - module="common/logilab-common-0.35.2.tar.gz" - size="162108" md5sum="88391b08f48812361eb594f05d7d930b"/> - </distutils> - <distutils id="logilab-astng"> - <branch repo="logilab" version="0.17.3" - module="astng/logilab-astng-0.17.3.tar.gz" - size="66296" md5sum="d36cd2e705760ee16df375ff83963f5c"> - <patch file="astng-ignoredatadesc.patch" strip="0"/> - </branch> - <dependencies> - <dep package="logilab-common"/> - </dependencies> - </distutils> - <metamodule id="meta-tools"> - <dependencies> - <dep package="pylint"/> - </dependencies> - </metamodule> -</moduleset> diff --git a/config/sysdeps/fedora-10.xml b/config/sysdeps/fedora-10.xml index c130600..63d888f 100644 --- a/config/sysdeps/fedora-10.xml +++ b/config/sysdeps/fedora-10.xml @@ -8,7 +8,7 @@ <package name="dbus-devel"/> <package name="dbus-glib-devel"/> <package name="dbus-python"/> - <package name="dejavu-fonts"/> + <package name="dejavu-sans-fonts"/> <package name="enchant-devel"/> <package name="expat-devel"/> <package name="fribidi-devel"/> @@ -33,12 +33,14 @@ <package name="intltool"/> <package name="libabiword" source="abiword"/> <package name="libabiword" source="abiword-plugins"/> + <package name="libabiword-devel"/> <package name="libcroco-devel"/> <package name="libffi-devel"/> <package name="libglade2-devel"/> <package name="libgsf-devel"/> <package name="libmatchbox" source="libmatchbox"/> <package name="librsvg2-devel"/> + <package name="libsoup-devel"/> <package name="libtool"/> <package name="libxml2-python"/> <package name="libXt-devel"/> @@ -53,12 +55,19 @@ <package name="pyabiword" source="pyabiword"/> <package name="pygame"/> <package name="pygobject2" source="pygobject"/> + <package name="pygobject2-devel" source="pygobject" /> <package name="pygtk2-devel"/> <package name="pygtksourceview"/> + <package name="pylint"/> <package name="python-cjson"/> <package name="python-devel"/> + <package name="python-logilab-common"/> <package name="python-simplejson"/> + <package name="python-telepathy"/> <package name="subversion"/> + <package name="telepathy-salut"/> + <package name="telepathy-gabble"/> + <package name="telepathy-glib"/> <package name="wv-devel"/> <package name="xapian-bindings-python"/> <package name="xapian-core-libs"/> diff --git a/config/sysdeps/fedora-11.xml b/config/sysdeps/fedora-11.xml index c130600..63d888f 100644 --- a/config/sysdeps/fedora-11.xml +++ b/config/sysdeps/fedora-11.xml @@ -8,7 +8,7 @@ <package name="dbus-devel"/> <package name="dbus-glib-devel"/> <package name="dbus-python"/> - <package name="dejavu-fonts"/> + <package name="dejavu-sans-fonts"/> <package name="enchant-devel"/> <package name="expat-devel"/> <package name="fribidi-devel"/> @@ -33,12 +33,14 @@ <package name="intltool"/> <package name="libabiword" source="abiword"/> <package name="libabiword" source="abiword-plugins"/> + <package name="libabiword-devel"/> <package name="libcroco-devel"/> <package name="libffi-devel"/> <package name="libglade2-devel"/> <package name="libgsf-devel"/> <package name="libmatchbox" source="libmatchbox"/> <package name="librsvg2-devel"/> + <package name="libsoup-devel"/> <package name="libtool"/> <package name="libxml2-python"/> <package name="libXt-devel"/> @@ -53,12 +55,19 @@ <package name="pyabiword" source="pyabiword"/> <package name="pygame"/> <package name="pygobject2" source="pygobject"/> + <package name="pygobject2-devel" source="pygobject" /> <package name="pygtk2-devel"/> <package name="pygtksourceview"/> + <package name="pylint"/> <package name="python-cjson"/> <package name="python-devel"/> + <package name="python-logilab-common"/> <package name="python-simplejson"/> + <package name="python-telepathy"/> <package name="subversion"/> + <package name="telepathy-salut"/> + <package name="telepathy-gabble"/> + <package name="telepathy-glib"/> <package name="wv-devel"/> <package name="xapian-bindings-python"/> <package name="xapian-core-libs"/> diff --git a/config/sysdeps/fedora-rawhide.xml b/config/sysdeps/fedora-rawhide.xml index c130600..63d888f 100644 --- a/config/sysdeps/fedora-rawhide.xml +++ b/config/sysdeps/fedora-rawhide.xml @@ -8,7 +8,7 @@ <package name="dbus-devel"/> <package name="dbus-glib-devel"/> <package name="dbus-python"/> - <package name="dejavu-fonts"/> + <package name="dejavu-sans-fonts"/> <package name="enchant-devel"/> <package name="expat-devel"/> <package name="fribidi-devel"/> @@ -33,12 +33,14 @@ <package name="intltool"/> <package name="libabiword" source="abiword"/> <package name="libabiword" source="abiword-plugins"/> + <package name="libabiword-devel"/> <package name="libcroco-devel"/> <package name="libffi-devel"/> <package name="libglade2-devel"/> <package name="libgsf-devel"/> <package name="libmatchbox" source="libmatchbox"/> <package name="librsvg2-devel"/> + <package name="libsoup-devel"/> <package name="libtool"/> <package name="libxml2-python"/> <package name="libXt-devel"/> @@ -53,12 +55,19 @@ <package name="pyabiword" source="pyabiword"/> <package name="pygame"/> <package name="pygobject2" source="pygobject"/> + <package name="pygobject2-devel" source="pygobject" /> <package name="pygtk2-devel"/> <package name="pygtksourceview"/> + <package name="pylint"/> <package name="python-cjson"/> <package name="python-devel"/> + <package name="python-logilab-common"/> <package name="python-simplejson"/> + <package name="python-telepathy"/> <package name="subversion"/> + <package name="telepathy-salut"/> + <package name="telepathy-gabble"/> + <package name="telepathy-glib"/> <package name="wv-devel"/> <package name="xapian-bindings-python"/> <package name="xapian-core-libs"/> |