-build-SVNPATH := http://svn.planet-lab.org/svn/build/trunk
-linux-patches-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/trunk
-madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/trunk
-wireless-tools-SVNPATH := http://svn.planet-lab.org/svn/wireless-tools/trunk
-nozomi-SVNPATH := http://svn.one-lab.org/nozomi/trunk
-comgt-SVNPATH := http://svn.one-lab.org/comgt/imports/0.3
-libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/trunk
-#util-vserver-SVNPATH := http://svn.linux-vserver.org/svn/util-vserver/tags/release-0.30.215/
-util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/branches/scholz
-util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/trunk
-NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/trunk
-PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/trunk
-NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/trunk
-pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/trunk
-libhttpd++-SVNPATH := http://svn.planet-lab.org/svn/libhttpd++/trunk
-proper-SVNPATH := http://svn.planet-lab.org/svn/proper/trunk
-CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/trunk
-ulogd-SVNPATH := http://svn.planet-lab.org/svn/ulogd/trunk
-fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/trunk
-PlanetFlow-SVNPATH := http://svn.planet-lab.org/svn/PlanetFlow/trunk
-Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/trunk
-iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/trunk
-iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/trunk
-vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/trunk
-PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/branches/dummynet-4.2-2
-PLCWWW-SVNPATH := http://svn.planet-lab.org/svn/PLCWWW/branches/onelab
-nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/trunk
-BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/trunk
-pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/trunk
-BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/trunk
-VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/trunk
-BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/trunk
-MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/trunk
+# build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
+
+linux-2.6-SVNBRANCH := 22
+linux-2.6-SVNPATH := http://svn.planet-lab.org/svn//linux-2.6/tags/linux-2.6-22-33
+madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-3
+nozomi-SVNPATH := http://svn.onelab.eu/nozomi/tags/nozomi-2.21-1
+comgt-SVNPATH := http://svn.onelab.eu/comgt/imports/0.3
+util-vserver-SVNBRANCH := scholz
+util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
+libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
+util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-16
+NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn//NodeUpdate/tags/NodeUpdate-0.5-3
+PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn//PingOfDeath/tags/PingOfDeath-2.2-1
+NodeManager-SVNBRANCH := 0.8
+NodeManager-SVNPATH := http://svn.planet-lab.org/svn//NodeManager/tags/NodeManager-1.8-1
+pyplnet-SVNPATH := http://svn.planet-lab.org/svn//pyplnet/tags/pyplnet-4.3-0
+pl_sshd-SVNPATH := http://svn.planet-lab.org/svn//pl_sshd/tags/pl_sshd-1.0-11
+CoDemux-SVNPATH := http://svn.planet-lab.org/svn//CoDemux/tags/CoDemux-0.1-13
+fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn//fprobe-ulog/tags/fprobe-ulog-1.1.3-0
+pf2slice-SVNPATH := http://svn.planet-lab.org/svn//pf2slice/tags/pf2slice-1.0-2
+Mom-SVNPATH := http://svn.planet-lab.org/svn//Mom/tags/Mom-2.3-0
+iptables-SVNPATH := 1.3.8
+iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-9
+iproute2-SVNPATH := http://svn.planet-lab.org/svn//iproute2/tags/iproute2-2.6.16-2
+inotify-tools-SVNPATH := http://svn.planet-lab.org/svn//inotify-tools/tags/inotify-tools-3.13-2
+vsys-SVNBRANCH := 0.7
+vsys-SVNPATH := http://svn.planet-lab.org/svn//vsys/tags/vsys-0.7-26
+dummynet_image-SVNPATH := http://svn.planet-lab.org/svn/dummynet_image/tags/dummynet_image-1.0-5
+PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-4
+drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-11
+PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-1
+www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn//www-register-wizard/tags/www-register-wizard-4.2-2
+Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-2.0-5
+nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-2
+BootManager-SVNPATH := http://svn.planet-lab.org/svn//BootManager/tags/BootManager-4.3-3
+pypcilib-SVNPATH := http://svn.planet-lab.org/svn//pypcilib/tags/pypcilib-0.2-5
+BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-10
+VserverReference-SVNPATH := http://svn.planet-lab.org/svn//VserverReference/tags/VserverReference-4.2-12
+BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn//BootstrapFS/tags/BootstrapFS-1.0-6
+MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-3
+
+# locating the right test directory - see make tests_svnpath
+TESTS_SVNPATH := http://svn.planet-lab.org/svn/tests/trunk