From cd1ca5e2dd8dde12a33ab7d4ffb9524d7f141fa7 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Thu, 25 Aug 2016 14:18:24 +0200
Subject: Fix version numbers and dependencies

---
 lib/ssh/src/ssh.app.src     |  2 +-
 lib/ssh/vsn.mk              |  2 +-
 lib/ssl/src/ssl.app.src     |  2 +-
 lib/ssl/src/ssl.appup.src   | 14 ++++----------
 lib/ssl/vsn.mk              |  2 +-
 lib/stdlib/vsn.mk           |  2 +-
 lib/tools/src/tools.app.src |  2 +-
 lib/tools/vsn.mk            |  2 +-
 8 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 3245ba5197..76b7d8cd55 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -45,7 +45,7 @@
 			  "erts-6.0",
 			  "kernel-3.0",
 			  "public_key-1.1",
-			  "stdlib-3.0"
+			  "stdlib-3.1"
 			 ]}]}.
 
 
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 575c1af3a9..212b99c695 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.3.1
+SSH_VSN = 4.3.2
 
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index b26efbd88f..00b0513891 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -55,7 +55,7 @@
     {applications, [crypto, public_key, kernel, stdlib]},
     {env, []},
     {mod, {ssl_app, []}},
-    {runtime_dependencies, ["stdlib-3.0","public_key-1.2","kernel-3.0",
+    {runtime_dependencies, ["stdlib-3.1","public_key-1.2","kernel-3.0",
 			    "erts-7.0","crypto-3.3", "inets-5.10.7"]}]}.
 
 
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 11728128c4..feee6648d7 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,18 +1,12 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
-  {<<"7\\..*">>, [{restart_application, ssl}]},
-  {<<"6\\..*">>, [{restart_application, ssl}]},
-  {<<"5\\..*">>, [{restart_application, ssl}]},
-  {<<"4\\..*">>, [{restart_application, ssl}]},
-  {<<"3\\..*">>, [{restart_application, ssl}]}
+  {<<"^8[.]0([.][0-9]+)?$">>, [{restart_application, ssl}]},
+  {<<"^[3-7][.].*">>, [{restart_application, ssl}]}
  ], 
  [
-  {<<"7\\..*">>, [{restart_application, ssl}]},
-  {<<"6\\..*">>, [{restart_application, ssl}]},
-  {<<"5\\..*">>, [{restart_application, ssl}]},
-  {<<"4\\..*">>, [{restart_application, ssl}]},
-  {<<"3\\..*">>, [{restart_application, ssl}]}
+  {<<"^8[.]0([.][0-9]+)?$">>, [{restart_application, ssl}]},
+  {<<"^[3-7][.].*">>, [{restart_application, ssl}]}
  ]
 }.
 
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 3b51fa8c6b..914eb43505 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 8.0
+SSL_VSN = 8.0.2
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index 41037b8f53..c74343d9ca 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 3.0.1
+STDLIB_VSN = 3.1
diff --git a/lib/tools/src/tools.app.src b/lib/tools/src/tools.app.src
index a00969eabe..18166cceb0 100644
--- a/lib/tools/src/tools.app.src
+++ b/lib/tools/src/tools.app.src
@@ -40,7 +40,7 @@
   {env, [{file_util_search_methods,[{"", ""}, {"ebin", "esrc"}, {"ebin", "src"}]}
 	]
   },
-  {runtime_dependencies, ["stdlib-2.5","runtime_tools-1.8.14",
+  {runtime_dependencies, ["stdlib-3.1","runtime_tools-1.8.14",
 			  "kernel-3.0","inets-5.10","erts-7.0",
 			  "compiler-5.0"]}
  ]
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index e6287b0430..e066dbf5e9 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 2.8.5
+TOOLS_VSN = 2.8.6
-- 
cgit v1.2.1