Merge branch 'master' of ssh://git.onelab.eu/git/build

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index fd24b89..b7a7d33 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -2,7 +2,7 @@
 
 ###
 linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-32
-madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0
+madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4132-1
 iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.9-0
 iptables-BUILD-FROM-SRPM        := yes # tmp
 iproute-BUILD-FROM-SRPM := yes 

diff --git a/onelab-tags.mk b/onelab-tags.mk
index a310e11..5f02589 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -33,7 +33,7 @@ vsys-GITPATH                  := git://git.onelab.eu/vsys.git@vsys-0.9-5
 vsys-scripts-GITPATH           := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-25
 plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-23
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-56
+plewww-GITPATH                  := git://git.onelab.eu/plewww.git@master
 www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-9
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35