jhbuild r2482 - in trunk: . modulesets

[fpeters svn gnome org]

Author: fpeters
Date: Sat Nov  8 21:40:46 2008
New Revision: 2482
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2482&view=rev

Log:
* modulesets/gnome-2.26.modules, modulesets/gnome-suites-2.26.modules,
modulesets/gnome-external-deps-2.26.modules: corrected devhelp
dependencies as trunk is using WebKit; moved WebKit to proposed
external deps.



Modified:
   trunk/ChangeLog
   trunk/modulesets/gnome-2.26.modules
   trunk/modulesets/gnome-external-deps-2.26.modules
   trunk/modulesets/gnome-suites-2.26.modules

Modified: trunk/modulesets/gnome-2.26.modules
==============================================================================
--- trunk/modulesets/gnome-2.26.modules	(original)
+++ trunk/modulesets/gnome-2.26.modules	Sat Nov  8 21:40:46 2008
@@ -33,8 +33,6 @@
       href="http://osiris.chipx86.com/svn/osiris-misc/"/>
   <repository type="svn" name="svn.debian.org"
       href="svn://svn.debian.org/"/>
-  <repository type="git" name="git.debian.org"
-      href="git://git.debian.org/"/>
   <repository type="svn" name="svn.navi.cx"
       href="http://svn.navi.cx/"; />
   <repository type="cvs" name="anoncvs.abisource.com"
@@ -1686,39 +1684,6 @@
     </dependencies>
   </autotools>
 
-  <!-- External deps that you MUST have installed in order -->
-  <!-- to compile WebKit (if not the build tree might be   -->
-  <!-- in in a bad state and might fail to compile even    -->
-  <!-- after you've installed the missing dependency.      -->
-  <!--                                                     -->
-  <!--   libicu-dev                                        -->
-  <!--   libjpeg62-dev                                     -->
-  <!--   libpng12-dev                                      -->
-  <!--   gperf                                             -->
-  <!--   bison                                             -->
-  <!--   flex >= 2.5.33                                    -->
-  <!--                                                     -->
-  <!-- To clean the build tree if you tried to compile     -->
-  <!-- without those deps, run the following command:      -->
-  <!--                                                     -->
-  <!--   make -f GNUMakefile maintainer-clean              -->
-  <!--                                                     -->
-  <!-- See also http://live.gnome.org/WebKitGtk            -->
-  <autotools id="WebKit" autogenargs="--enable-video=yes"
-      makefile="GNUmakefile">
-    <branch repo="git.debian.org" module="git/pkg-webkit/upstream.git"
-      checkoutdir="WebKit" revision="filtered"/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="libxml2"/>
-      <dep package="libxslt"/>
-      <dep package="libsoup"/>
-      <dep package="gnome-vfs"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="sqlite3"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="epiphany-webkit" autogenargs="--with-engine=webkit">
     <branch repo="svn.gnome.org"
             module="epiphany"

Modified: trunk/modulesets/gnome-external-deps-2.26.modules
==============================================================================
--- trunk/modulesets/gnome-external-deps-2.26.modules	(original)
+++ trunk/modulesets/gnome-external-deps-2.26.modules	Sat Nov  8 21:40:46 2008
@@ -600,4 +600,39 @@
     </dependencies>
   </tarball>
 
+  <!-- External deps that you MUST have installed in order -->
+  <!-- to compile WebKit (if not the build tree might be   -->
+  <!-- in in a bad state and might fail to compile even    -->
+  <!-- after you've installed the missing dependency.      -->
+  <!--                                                     -->
+  <!--   libicu-dev                                        -->
+  <!--   libjpeg62-dev                                     -->
+  <!--   libpng12-dev                                      -->
+  <!--   gperf                                             -->
+  <!--   bison                                             -->
+  <!--   flex >= 2.5.33                                    -->
+  <!--                                                     -->
+  <!-- To clean the build tree if you tried to compile     -->
+  <!-- without those deps, run the following command:      -->
+  <!--                                                     -->
+  <!--   make -f GNUMakefile maintainer-clean              -->
+  <!--                                                     -->
+  <!-- See also http://live.gnome.org/WebKitGtk            -->
+  <repository type="git" name="git.debian.org"
+      href="git://git.debian.org/"/>
+  <autotools id="WebKit" autogenargs="--enable-video=yes"
+      makefile="GNUmakefile">
+    <branch repo="git.debian.org" module="git/pkg-webkit/upstream.git"
+      checkoutdir="WebKit" revision="filtered"/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+      <dep package="libsoup"/>
+      <dep package="gnome-vfs"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="sqlite3"/>
+    </dependencies>
+  </autotools>
+
 </moduleset>

Modified: trunk/modulesets/gnome-suites-2.26.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.26.modules	(original)
+++ trunk/modulesets/gnome-suites-2.26.modules	Sat Nov  8 21:40:46 2008
@@ -1511,7 +1511,7 @@
       <dep package="libglade"/>
       <dep package="gconf"/>
       <dep package="libwnck"/>
-      <dep package="mozilla"/>
+      <dep package="WebKit"/>
     </dependencies>
   </autotools>