commit 2623e8180b5b7ffa86a5cde4c8b03602e84fde7a
Author: John Carr <john.carr@unrouted.co.uk>
Date:   Mon Nov 17 15:15:26 2008 +0000

    Make checkmodulesets pass

diff --git a/modulesets/freedesktop-2.24.modules b/modulesets/freedesktop-2.24.modules
index d5e2e72..74a86c3 100644
--- a/modulesets/freedesktop-2.24.modules
+++ b/modulesets/freedesktop-2.24.modules
@@ -41,7 +41,8 @@
       href="http://bzr.collabora.co.uk/bzr/telepathy/"/>
 
   <repository type="svn" name="gypsy.o-hand.com"
-      href="http://svn.o-hand.com/repos/gypsy"/>
+      href="http://svn.o-hand.com/repos/gypsy/"
+      trunk-template="trunk/%(module)s" />
 
   <repository type="cvs" name="lirc.sf.net"
       cvsroot=":pserver:anonymous@lirc.cvs.sourceforge.net:/cvsroot/lirc"
@@ -198,7 +199,7 @@
   </autotools>
 
   <autotools id="gypsy">
-    <branch repo="gypsy.o-hand.com" module="gypsy/trunk/gypsy"/>
+    <branch repo="gypsy.o-hand.com" module="gypsy"/>
     <dependencies>
       <dep package="dbus-glib"/>
     </dependencies>
@@ -250,8 +251,7 @@
   </autotools>
 
   <autotools id="telepathy-stream-engine">
-    <branch repo="git.collabora.co.uk"
-	    module="stream-engine" checkoutdir="telepathy-stream-engine" />
+    <branch repo="git.collabora.co.uk" />
     <dependencies>
       <dep package="telepathy-glib"/>
       <dep package="glib"/>
diff --git a/modulesets/freedesktop-2.26.modules b/modulesets/freedesktop-2.26.modules
index 61fa95c..b8e6dcf 100644
--- a/modulesets/freedesktop-2.26.modules
+++ b/modulesets/freedesktop-2.26.modules
@@ -41,7 +41,8 @@
       href="http://bzr.collabora.co.uk/bzr/telepathy/"/>
 
   <repository type="svn" name="gypsy.o-hand.com"
-      href="http://svn.o-hand.com/repos/gypsy"/>
+      href="http://svn.o-hand.com/repos/gypsy/"
+      trunk-template="trunk/%(module)s" />
 
   <repository type="cvs" name="lirc.sf.net"
       cvsroot=":pserver:anonymous@lirc.cvs.sourceforge.net:/cvsroot/lirc"
@@ -198,7 +199,7 @@
   </autotools>
 
   <autotools id="gypsy">
-    <branch repo="gypsy.o-hand.com" module="gypsy/trunk/gypsy"/>
+    <branch repo="gypsy.o-hand.com" module="gypsy"/>
     <dependencies>
       <dep package="dbus-glib"/>
     </dependencies>
@@ -250,8 +251,7 @@
   </autotools>
 
   <autotools id="telepathy-stream-engine">
-    <branch repo="git.collabora.co.uk"
-	    module="stream-engine" checkoutdir="telepathy-stream-engine" />
+    <branch repo="git.collabora.co.uk" />
     <dependencies>
       <dep package="telepathy-glib"/>
       <dep package="glib"/>
diff --git a/modulesets/gnome-2.24.modules b/modulesets/gnome-2.24.modules
index 282c41b..3938433 100644
--- a/modulesets/gnome-2.24.modules
+++ b/modulesets/gnome-2.24.modules
@@ -10,6 +10,8 @@
   </repository>
   <repository type="svn" name="svn.gnomemm"
       href="http://svn.gnome.org/svn/gnomemm/"/>
+  <repository type="svn" name="svn-archive.gnome.org"
+      href="http://svn-archive.gnome.org/svn/" />
   <repository type="cvs" name="cvs.cairographics.org"
       cvsroot=":pserver:anonymous@cvs.cairographics.org:/cvs/cairo"
       password=""/>
@@ -75,7 +77,10 @@
   <repository type="svn" name="svn.mono-project.com"
       href="svn://anonsvn.mono-project.com/source/"/>
   <repository type="svn" name="svn.fluendo.com"
-      href="https://core.fluendo.com/gstreamer/svn/trunk"/>
+      href="https://core.fluendo.com/gstreamer/svn/"
+      trunk-template="trunk/%(module)s"
+      branches-template="branches/%(branch)"
+      tags-template="tags/%(tag)" />
   <repository type="svn" name="svn.thomas.apestaart.org"
       href="http://thomas.apestaart.org/moap/svn/"/>
   <repository type="git" name="git.capuchin.gnome.org"
@@ -279,15 +284,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="glade2c">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="libxml2"/>
-      <dep package="libgnomeui"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="sawfish">
     <branch/>
     <dependencies>
@@ -427,37 +423,12 @@
   </autotools>
 
   <autotools id="modest" autogenargs="--with-platform=gnome">
-    <branch repo="svn.modest" module="trunk"  checkoutdir="modest" />
+    <branch repo="svn.modest" />
     <dependencies>
       <dep package="tinymail"/>
     </dependencies>
   </autotools>
 
-  <autotools id="ggv" supports-non-srcdir-builds="no">
-    <branch/>
-    <dependencies>
-      <dep package="rarian"/>
-      <dep package="libgnomeui"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="glimmer">
-    <branch/>
-    <dependencies>
-      <dep package="gtksourceview"/>
-      <dep package="libgnomeprint"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="scaffold">
-    <branch/>
-    <dependencies>
-      <dep package="libgnomeui"/>
-      <dep package="vte"/>
-      <dep package="gdl"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="orbitcpp">
     <branch/>
     <dependencies>
@@ -517,7 +488,7 @@
   </autotools>
 
   <autotools id="libnotifymm">
-    <branch repo="svn.gna.org" module="libnotifymm/trunk" checkoutdir="libnotifymm"/>
+    <branch />
     <dependencies>
       <dep package="libnotify"/>
       <dep package="gtkmm"/>
@@ -610,16 +581,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnopernicus">
-    <branch/>
-    <dependencies>
-      <dep package="gconf"/>
-      <dep package="libgnomeui"/>
-      <dep package="gnome-speech"/>
-      <dep package="gnome-mag"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gthumb">
     <branch/>
     <dependencies>
@@ -768,15 +729,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnomechat">
-    <branch/>
-    <dependencies>
-      <dep package="libgnetwork"/>
-      <dep package="libgircclient"/>
-      <dep package="libgnomeui"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="epiphany-extensions">
     <branch revision="gnome-2-24"/>
     <dependencies>
@@ -818,15 +770,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gpdf">
-    <branch/>
-    <dependencies>
-      <dep package="libgnomeui"/>
-      <dep package="libbonoboui"/>
-      <dep package="libgnomeprintui"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-themes-extras">
     <branch/>
     <dependencies>
@@ -939,13 +882,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="OpenApplet">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-panel"/>
-    </dependencies>
-  </autotools> 
-
   <autotools id="gtetrinet">
     <branch/>
     <dependencies>
@@ -969,79 +905,6 @@
     </dependencies>
   </autotools>    
 
-  <metamodule id="meta-storage">
-    <dependencies>
-      <dep package="storage/storage-store"/>
-      <dep package="storage/vfs"/>
-      <dep package="storage/applet"/>
-    </dependencies>
-  </metamodule>
-
-  <autotools id="storage/storage-store">
-    <branch/>
-    <dependencies>
-      <dep package="dbus"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="storage/libstorage">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-vfs"/>
-      <dep package="pygtk"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="storage/libstorage-translators">
-    <branch/>
-    <dependencies>
-      <dep package="storage/libstorage"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="storage/vfs">
-    <branch/>
-    <dependencies>
-      <dep package="storage/libstorage"/>
-      <dep package="storage/libstorage-translators"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="storage/pet">
-    <branch/>
-  </autotools>
-
-  <autotools id="storage/libmrs">
-    <branch/>
-    <dependencies>
-      <dep package="storage/pet"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="storage/libmrs-converter">
-    <branch/>
-    <dependencies>
-      <dep package="storage/libmrs"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="storage/libstorage-nl">
-    <branch/>
-    <dependencies>
-      <dep package="storage/libstorage"/>
-      <dep package="storage/libmrs"/>
-      <dep package="storage/libmrs-converter"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="storage/applet">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-python"/>
-      <dep package="storage/libstorage-nl"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="monkey-bubble">
     <branch/>
     <dependencies>
@@ -1242,7 +1105,7 @@
   </autotools>
 
   <autotools id="gtkunique">
-    <branch/>
+    <branch repo="svn-archive.gnome.org" />
     <dependencies>
       <dep package="gtk+"/>
       <dep package="dbus-glib"/>
@@ -1956,9 +1819,7 @@
 
  <autotools id="gst-fluendo-mp3"
             autogenargs="--with-liboil=yes">
-   <branch repo="svn.fluendo.com"
-           module="trunk/gst-fluendo-mp3" 
-           checkoutdir="gst-fluendo-mp3"/>
+   <branch repo="svn.fluendo.com" />
    <dependencies>
      <dep package="liboil"/>
      <dep package="gstreamer"/>
@@ -1967,9 +1828,7 @@
  </autotools>
 
  <autotools id="gst-fluendo-mpegdemux">
-   <branch repo="svn.fluendo.com"
-           module="trunk/gst-fluendo-mpegdemux" 
-           checkoutdir="gst-fluendo-mpegdemux"/>
+   <branch repo="svn.fluendo.com" />
    <dependencies>
      <dep package="gstreamer"/>
      <dep package="gst-plugins-base"/>
diff --git a/modulesets/gnome-2.26.modules b/modulesets/gnome-2.26.modules
index 0c89b36..b1c6edd 100644
--- a/modulesets/gnome-2.26.modules
+++ b/modulesets/gnome-2.26.modules
@@ -72,7 +72,10 @@
   <repository type="svn" name="svn.mono-project.com"
       href="svn://anonsvn.mono-project.com/source/"/>
   <repository type="svn" name="svn.fluendo.com"
-      href="https://core.fluendo.com/gstreamer/svn/trunk"/>
+      href="https://core.fluendo.com/gstreamer/svn/"
+      trunk-template="trunk/%(module)s"
+      branches-template="branches/%(branch)"
+      tags-template="tags/%(tag)" />
   <repository type="svn" name="svn.thomas.apestaart.org"
       href="http://thomas.apestaart.org/moap/svn/"/>
   <repository type="git" name="git.capuchin.gnome.org"
@@ -280,15 +283,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="glade2c">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="libxml2"/>
-      <dep package="libgnomeui"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="sawfish">
     <branch/>
     <dependencies>
@@ -428,37 +422,12 @@
   </autotools>
 
   <autotools id="modest" autogenargs="--with-platform=gnome">
-    <branch repo="svn.modest" module="trunk"  checkoutdir="modest" />
+    <branch repo="svn.modest" />
     <dependencies>
       <dep package="tinymail"/>
     </dependencies>
   </autotools>
 
-  <autotools id="ggv" supports-non-srcdir-builds="no">
-    <branch/>
-    <dependencies>
-      <dep package="rarian"/>
-      <dep package="libgnomeui"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="glimmer">
-    <branch/>
-    <dependencies>
-      <dep package="gtksourceview"/>
-      <dep package="libgnomeprint"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="scaffold">
-    <branch/>
-    <dependencies>
-      <dep package="libgnomeui"/>
-      <dep package="vte"/>
-      <dep package="gdl"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="orbitcpp">
     <branch/>
     <dependencies>
@@ -518,7 +487,7 @@
   </autotools>
 
   <autotools id="libnotifymm">
-    <branch repo="svn.gna.org" module="libnotifymm/trunk" checkoutdir="libnotifymm"/>
+    <branch />
     <dependencies>
       <dep package="libnotify"/>
       <dep package="gtkmm"/>
@@ -611,16 +580,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnopernicus">
-    <branch/>
-    <dependencies>
-      <dep package="gconf"/>
-      <dep package="libgnomeui"/>
-      <dep package="gnome-speech"/>
-      <dep package="gnome-mag"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gthumb">
     <branch/>
     <dependencies>
@@ -769,15 +728,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnomechat">
-    <branch/>
-    <dependencies>
-      <dep package="libgnetwork"/>
-      <dep package="libgircclient"/>
-      <dep package="libgnomeui"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="epiphany-extensions">
     <branch revision="gnome-2-24"/>
     <dependencies>
@@ -819,15 +769,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gpdf">
-    <branch/>
-    <dependencies>
-      <dep package="libgnomeui"/>
-      <dep package="libbonoboui"/>
-      <dep package="libgnomeprintui"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-themes-extras">
     <branch/>
     <dependencies>
@@ -940,13 +881,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="OpenApplet">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-panel"/>
-    </dependencies>
-  </autotools> 
-
   <autotools id="gtetrinet">
     <branch/>
     <dependencies>
@@ -970,79 +904,6 @@
     </dependencies>
   </autotools>    
 
-  <metamodule id="meta-storage">
-    <dependencies>
-      <dep package="storage/storage-store"/>
-      <dep package="storage/vfs"/>
-      <dep package="storage/applet"/>
-    </dependencies>
-  </metamodule>
-
-  <autotools id="storage/storage-store">
-    <branch/>
-    <dependencies>
-      <dep package="dbus"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="storage/libstorage">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-vfs"/>
-      <dep package="pygtk"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="storage/libstorage-translators">
-    <branch/>
-    <dependencies>
-      <dep package="storage/libstorage"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="storage/vfs">
-    <branch/>
-    <dependencies>
-      <dep package="storage/libstorage"/>
-      <dep package="storage/libstorage-translators"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="storage/pet">
-    <branch/>
-  </autotools>
-
-  <autotools id="storage/libmrs">
-    <branch/>
-    <dependencies>
-      <dep package="storage/pet"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="storage/libmrs-converter">
-    <branch/>
-    <dependencies>
-      <dep package="storage/libmrs"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="storage/libstorage-nl">
-    <branch/>
-    <dependencies>
-      <dep package="storage/libstorage"/>
-      <dep package="storage/libmrs"/>
-      <dep package="storage/libmrs-converter"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="storage/applet">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-python"/>
-      <dep package="storage/libstorage-nl"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="monkey-bubble">
     <branch/>
     <dependencies>
@@ -1585,19 +1446,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gupnp-media-server">
-    <branch repo="svn.o-hand.com" module="gupnp/trunk/gupnp-media-server"/>
-    <dependencies>
-      <dep package="vala"/>
-      <dep package="gupnp-vala"/>
-      <dep package="gupnp"/>
-      <dep package="gupnp-av"/>
-      <dep package="gconf"/>
-      <dep package="dbus-glib"/>
-      <dep package="gstreamer"/>
-    </dependencies>
-  </autotools>
-
   <metamodule id="meta-gupnp">
     <dependencies>
       <dep package="gssdp"/>
@@ -1607,7 +1455,6 @@
       <dep package="gupnp-ui"/>
       <dep package="rhythmbox-gupnp"/>
       <dep package="gupnp-vala"/>
-      <dep package="gupnp-media-server"/>
     </dependencies>
   </metamodule>
 
@@ -1909,9 +1756,7 @@
 
  <autotools id="gst-fluendo-mp3"
             autogenargs="--with-liboil=yes">
-   <branch repo="svn.fluendo.com"
-           module="trunk/gst-fluendo-mp3" 
-           checkoutdir="gst-fluendo-mp3"/>
+   <branch repo="svn.fluendo.com" />
    <dependencies>
      <dep package="liboil"/>
      <dep package="gstreamer"/>
@@ -1920,9 +1765,7 @@
  </autotools>
 
  <autotools id="gst-fluendo-mpegdemux">
-   <branch repo="svn.fluendo.com"
-           module="trunk/gst-fluendo-mpegdemux" 
-           checkoutdir="gst-fluendo-mpegdemux"/>
+   <branch repo="svn.fluendo.com" />
    <dependencies>
      <dep package="gstreamer"/>
      <dep package="gst-plugins-base"/>
