[Sugar-devel] [PATCH] Shave off unnecessary dependencies from jhbuild

[Sascha Silbe]

On Sun, Apr 25, 2010 at 05:20:42PM -0400, Bernie Innocenti wrote:

> diff --git a/config/modulesets/tools.modules 
> b/config/modulesets/tools.modules
> index 715c640..88f0ac2 100644
> --- a/config/modulesets/tools.modules
> +++ b/config/modulesets/tools.modules
> @@ -30,17 +30,12 @@
>        <dep package="logilab-common"/>
>      </dependencies>
>    </distutils>

> -  <distutils id="dogtail">
> -    <branch repo="fedorahosted"/>
> -    <!-- sysdep: pyatspi -->
> -  </distutils>

NAK. Please don't remove the package itself, just the dependency in 
meta-tools. We'll need it again in the future for UI testing.


> diff --git a/config/sysdeps/50fedora-12.xml 
> b/config/sysdeps/50fedora-12.xml
> index 8cdbc78..eb2bfb4 100644
> --- a/config/sysdeps/50fedora-12.xml
> +++ b/config/sysdeps/50fedora-12.xml
> @@ -1,10 +1,7 @@
> <?xml version="1.0"?>
> <dependencies>
> -  <package name="dogtail" source="dogtail"/>
>    <package name="metacity" source="metacity"/>
>    <package name="pylint" source="pylint"/>
>    <package name="python-xklavier" source="python-xklavier"/>
> -  <package name="xulrunner-devel-unstable" source="xulrunner"/>
> -  <package name="xulrunner-python" source="xulrunner"/>
> -  <package name="xulrunner-python-devel" source="xulrunner"/>
> +  <package name="xulrunner" source="xulrunner"/>
> </dependencies>

As mentioned on IRC, please remove the xulrunner dependency completely 
(on Fedora) as it's only needed for hulahop which we already depend on.

> diff --git a/config/sysdeps/50ubuntu-10.04.xml 
> b/config/sysdeps/50ubuntu-10.04.xml
> index a53022d..e7f8452 100644
> --- a/config/sysdeps/50ubuntu-10.04.xml
> +++ b/config/sysdeps/50ubuntu-10.04.xml
> @@ -14,5 +14,5 @@
>    <package name="python-wnck" source="gnome-python-desktop"/>
>    <package name="telepathy-gabble" source="telepathy-gabble"/>
>    <package name="telepathy-salut" source="telepathy-salut"/>
> -  <package name="xulrunner-1.9.1-dev" source="xulrunner"/><!-- for 
> hulahop -->
> +  <package name="xulrunner-1.9" source="xulrunner"/><!-- for hulahop 
> -->
> </dependencies>

How recent a hulahop version do we want to ensure? Ubuntu has 
0.4.6-0ubuntu2.1, 0.4.8~dfsg-3ubuntu4 and 0.4.9-1ubuntu2 on Intrepid 
resp. Jaunty and Karmic. If (a subset of) these are sufficient for 
Browse, we could change hulahop to distro packages on Ubuntu as well and 
drop the xulrunner dependency.

> diff --git a/config/sysdeps/debian-family.xml 
> b/config/sysdeps/debian-family.xml
> index 463f4fe..6aae02b 100644
> --- a/config/sysdeps/debian-family.xml
> +++ b/config/sysdeps/debian-family.xml
> @@ -66,7 +66,6 @@
>    <package name="python-hippocanvas" source="hippo-canvas"/>
>    <package name="python-libxml2"/>
>    <package name="python-numpy"/>
> -  <package name="python-pyatspi"/><!-- for dogtail -->

As we keep dogtail, we also need to keep python-pyatspi.

> diff --git a/config/sysdeps/fedora-family.xml 
> b/config/sysdeps/fedora-family.xml
> index 4f98658..c2a2b3d 100644
> --- a/config/sysdeps/fedora-family.xml
> +++ b/config/sysdeps/fedora-family.xml
> @@ -1,12 +1,11 @@
> <?xml version="1.0"?>
> <dependencies>
>    <package name="alsa-lib-devel"/>
> -  <package name="at-spi-python"/><!-- for dogtail -->

Dito.

CU Sascha

-- 
http://sascha.silbe.org/
http://www.infra-silbe.de/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: Digital signature
Url : http://lists.sugarlabs.org/archive/sugar-devel/attachments/20100425/deb1b9f6/attachment.pgp