Change download links for Ocaml and Marionnet

2 files changed, 19 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e32f5082c011..ecf2a0d9f214 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = marionnet-trunk
 	pkgdesc = Educational software. It is a virtual network laboratory: it allows users to define, configure and run complex computer networks without any need for physical setup. Trunk version (with UML kernel Debian Wheezy).
 	pkgver = 1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.marionnet.org/
 	install = marionnet-trunk.install
 	arch = i686
 	arch = x86_64
 	license = LGPL
+	makedepends = wget
 	makedepends = bc
 	makedepends = optipng
 	depends = xorg-server
@@ -24,16 +25,16 @@ pkgbase = marionnet-trunk
 	conflicts = marionnet
 	source = http://caml.inria.fr/pub/distrib/ocaml-3.12/ocaml-3.12.1.tar.gz
 	source = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk-2.14.2.tar.gz
-	source = https://www.marionnet.org/download/marionnet_from_scratch/mirror/ocamlbricks-trunk.tar.gz
-	source = https://www.marionnet.org/download/marionnet_from_scratch/mirror/marionnet-trunk.tar.gz
+	source = http://bazaar.launchpad.net/~marionnet-drivers/ocamlbricks/trunk/tarball/433
+	source = http://bazaar.launchpad.net/~marionnet-drivers/marionnet/trunk/tarball/475
 	source = https://raw.githubusercontent.com/JulioJu/Marionnet_ArchLinux_Installer/master/Makefile-trunk.patch
 	source = https://raw.githubusercontent.com/JulioJu/Marionnet_ArchLinux_Installer/master/marionnet_from_scratch-Downloader
 	sha256sums = 4f81ab86258be0eea1507dd5338c8670490f8616249821e731f8ac1c64caa4a7
 	sha256sums = 4981abedabdc462303f345104042c88af227ccd50fd30a9bf48fd353ab02d0ba
-	sha256sums = 646b6de59a555b2e41960708cf4edfed571d88369d850a50e23bf4a4b17ed329
-	sha256sums = 610c806e595be4d56ff6cded02e8d8a3091fe211487073c02ddb5132c3b4ffb6
+	sha256sums = 04bd841050f34133fe04417bf83bef40f955ab1354e78eb8b4dd32eff75fd3a2
+	sha256sums = 220644f0f9963f3d867cda40484f6fc33a73de309a973b28b815835ae07285ec
 	sha256sums = efb09389cc67a88b16509dec3ca3fb32f1da1f4c5808b8f2e7e2f050376bf691
-	sha256sums = 5d8ddf6e5c5b726e892bae2b55eb5eb01f43bd47fa2855ec38797d0598a6ea24
+	sha256sums = f0f93f30424da231357c3d7698229ba1fbdaa41737c954b71ede44d5e57cd50a
 
 pkgname = marionnet-trunk
 
diff --git a/PKGBUILD b/PKGBUILD
index dfed671d1d9b..01376f9a0360 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=('marionnet-trunk')
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="Educational software. It is a virtual network laboratory: it allows
 users to define, configure and run complex computer networks without any need
 for physical setup. Trunk version (with UML kernel Debian Wheezy)."
@@ -25,19 +25,26 @@ fi
 conflicts=('marionnet')
 source=("http://caml.inria.fr/pub/distrib/ocaml-3.12/ocaml-3.12.1.tar.gz"
         'http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk-2.14.2.tar.gz'
-        "https://www.marionnet.org/download/marionnet_from_scratch/mirror/ocamlbricks-trunk.tar.gz"
-        "https://www.marionnet.org/download/marionnet_from_scratch/mirror/marionnet-trunk.tar.gz"
+        'http://bazaar.launchpad.net/~marionnet-drivers/ocamlbricks/trunk/tarball/433'
+        'http://bazaar.launchpad.net/~marionnet-drivers/marionnet/trunk/tarball/475'
         "https://raw.githubusercontent.com/JulioJu/Marionnet_ArchLinux_Installer/master/Makefile-trunk.patch"
         "https://raw.githubusercontent.com/JulioJu/Marionnet_ArchLinux_Installer/master/marionnet_from_scratch-Downloader"
 )
 sha256sums=('4f81ab86258be0eea1507dd5338c8670490f8616249821e731f8ac1c64caa4a7'
             '4981abedabdc462303f345104042c88af227ccd50fd30a9bf48fd353ab02d0ba'
-            '646b6de59a555b2e41960708cf4edfed571d88369d850a50e23bf4a4b17ed329'
-            '610c806e595be4d56ff6cded02e8d8a3091fe211487073c02ddb5132c3b4ffb6'
+            '04bd841050f34133fe04417bf83bef40f955ab1354e78eb8b4dd32eff75fd3a2'
+            '220644f0f9963f3d867cda40484f6fc33a73de309a973b28b815835ae07285ec'
             'efb09389cc67a88b16509dec3ca3fb32f1da1f4c5808b8f2e7e2f050376bf691'
             'f0f93f30424da231357c3d7698229ba1fbdaa41737c954b71ede44d5e57cd50a')
 install=marionnet-trunk.install
 
+prepare () {
+    tar -xvzf 433
+    tar -xvzf 475
+    mv '~marionnet-drivers/ocamlbricks/trunk' ocamlbricks
+    mv '~marionnet-drivers/marionnet' marionnet
+}
+
 # ################
 # MAKEDEPENDS : CREATED DURING COMPILATION but not keep
 # pkgname=ocaml