jhbuild r2312 - in trunk: . modulesets

[fpeters svn gnome org]

Author: fpeters
Date: Thu Aug 28 20:26:25 2008
New Revision: 2312
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2312&view=rev

Log:
* modulesets/freedesktop-2.24.modules,
modulesets/gnome-external-deps-2.24.modules,
modulesets/gnome-suites-2.24.modules: libcanberra has been blessed for
2.24; switched to using a tarball; and marked the new dependency of
gnome-control-center on libcanberra.



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

Modified: trunk/modulesets/freedesktop-2.24.modules
==============================================================================
--- trunk/modulesets/freedesktop-2.24.modules	(original)
+++ trunk/modulesets/freedesktop-2.24.modules	Thu Aug 28 20:26:25 2008
@@ -50,9 +50,6 @@
       cvsroot=":pserver:anonymous lirc cvs sourceforge net:/cvsroot/lirc"
       password=""/>
 
-  <repository type="git" name="0pointer.de"
-    href="git://0pointer.de/"/>
-
   <repository type="tarball" name="cpan" href="http://search.cpan.org/CPAN/"; />
  
   <autotools id="glitz">
@@ -358,15 +355,4 @@
   <!-- ############ End of Telepathy Stuff ############ -->
   <!-- ################################################ -->
 
-  <autotools id="libcanberra">
-   <branch repo="0pointer.de" module="libcanberra.git" checkoutdir="libcanberra"/>
-    <dependencies>
-      <dep package="gtk-doc"/>
-    </dependencies>
-    <after>
-      <dep package="gtk+"/>
-      <dep package="pulseaudio"/>
-    </after>
-  </autotools>
-
 </moduleset>

Modified: trunk/modulesets/gnome-external-deps-2.24.modules
==============================================================================
--- trunk/modulesets/gnome-external-deps-2.24.modules	(original)
+++ trunk/modulesets/gnome-external-deps-2.24.modules	Thu Aug 28 20:26:25 2008
@@ -544,4 +544,18 @@
     </dependencies>
   </tarball>
 
+  <repository type="tarball" name="0pointer.de"
+              href="http://0pointer.de/lennart/projects/"/>
+  <autotools id="libcanberra">
+    <branch repo="0pointer.de" module="libcanberra/libcanberra-0.8.tar.gz"
+            version="0.8" size="818248" md5sum="7e94da74f5b1e2029916799b915fdc74"/>
+    <dependencies>
+      <dep package="gtk-doc"/>
+    </dependencies>
+    <after>
+      <dep package="gtk+"/>
+      <dep package="pulseaudio"/>
+    </after>
+  </autotools>
+
 </moduleset>

Modified: trunk/modulesets/gnome-suites-2.24.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.24.modules	(original)
+++ trunk/modulesets/gnome-suites-2.24.modules	Thu Aug 28 20:26:25 2008
@@ -280,6 +280,7 @@
       <dep package="gst-plugins-base"/>
       <dep package="gnome-panel"/>
       <dep package="gnome-settings-daemon"/>
+      <dep package="libcanberra"/>
     </dependencies>
   </autotools>