Merge remote branch 'upstream/maint'

* upstream/maint:
  Prepare for release
  Prepare for release
  Prepare for release

6 files changed, 17 insertions, 49 deletions

diff --git a/lib/public_key/src/public_key.appup.src b/lib/public_key/src/public_key.appup.src
index 2945fb1213..aacd3b866d 100644
--- a/lib/public_key/src/public_key.appup.src
+++ b/lib/public_key/src/public_key.appup.src
@@ -1,16 +1,8 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
-  {"0.13", [{restart_application, public_key}]},
-  {"0.11", [{restart_application, public_key}]},
-  {"0.10", [{restart_application, public_key}]},
-  {"0.9",  [{restart_application, public_key}]},
-  {"0.8",  [{restart_application, public_key}]}
+  {<<"0\\.*">>,  [{restart_application, public_key}]}
  ],
  [
-  {"0.13", [{restart_application, public_key}]},
-  {"0.11", [{restart_application, public_key}]},
-  {"0.10", [{restart_application, public_key}]},
-  {"0.9",  [{restart_application, public_key}]},
-  {"0.8",  [{restart_application, public_key}]}
+  {<<"0\\.*">>,  [{restart_application, public_key}]}
  ]}.
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index d8f811bf25..ab4ee8b0ff 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 0.14
+PUBLIC_KEY_VSN = 0.15
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 21a0582c06..0542054596 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -18,26 +18,12 @@
 %%
 
 {"%VSN%",	
- [		
-  {"2.0.8", [{load_module, ssh_sftpd_file_api, soft_purge, soft_purge, []},
-             {load_module, ssh_channel, soft_purge, soft_purge, []}]},
-  {"2.0.7", [{load_module, ssh_sftp, soft_purge, soft_purge, []}]},
-  {"2.0.6", [{load_module, ssh_userreg, soft_purge, soft_purge, []},
-             {load_module, ssh_sftp, soft_purge, soft_purge, []}]},
-  {"2.0.5", [{load_module, ssh_userreg, soft_purge, soft_purge, []},
-             {load_module, ssh_sftp, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_handler, soft_purge, soft_purge, [ssh_userreg]}]}
+ [			
+ {<<"2\\.*">>, [{restart_application, ssh}]},
+ {<<"1\\.*">>, [{restart_application, ssh}]}	
  ],
  [
-  {"2.0.8", [{load_module, ssh_sftpd_file_api, soft_purge, soft_purge, []},
-             {load_module, ssh_channel, soft_purge, soft_purge, []}]},	
-  {"2.0.7", [{load_module, ssh_sftp, soft_purge, soft_purge, []}]},
-  {"2.0.6", [{load_module, ssh_userreg, soft_purge, soft_purge, []},
-             {load_module, ssh_sftp, soft_purge, soft_purge, []}]},
-  {"2.0.5", [{load_module, ssh_userreg, soft_purge, soft_purge, []},
-             {load_module, ssh_sftp, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_handler, soft_purge, soft_purge, [ssh_userreg]}]}
+ {<<"2\\.*">>, [{restart_application, ssh}]},
+ {<<"1\\.*">>, [{restart_application, ssh}]}			   
  ]
 }.
-
-
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 42f860d6ae..bff73a1b40 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 2.0.9
+SSH_VSN = 2.1
 APP_VSN    = "ssh-$(SSH_VSN)"
 
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 1b07e76d6a..e346b1e9e6 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,23 +1,13 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
-  {"4.1.6", [{restart_application, ssl}]},
-  {"4.1.5", [{restart_application, ssl}]},
-  {"4.1.4", [{restart_application, ssl}]},
-  {"4.1.3", [{restart_application, ssl}]},
-  {"4.1.2", [{restart_application, ssl}]},
-  {"4.1.1", [{restart_application, ssl}]},
-  {"4.1",   [{restart_application, ssl}]},
-  {"4.0.1", [{restart_application, ssl}]}
+  {"5.0", [{restart_application, ssl}]},
+  {<<"4\\.*">>, [{restart_application, ssl}]},
+  {<<"3\\.*">>, [{restart_application, ssl}]}
  ], 
  [
-  {"4.1.6", [{restart_application, ssl}]},
-  {"4.1.5", [{restart_application, ssl}]},
-  {"4.1.4", [{restart_application, ssl}]},
-  {"4.1.3", [{restart_application, ssl}]},
-  {"4.1.2", [{restart_application, ssl}]},
-  {"4.1.1", [{restart_application, ssl}]},
-  {"4.1",   [{restart_application, ssl}]},
-  {"4.0.1", [{restart_application, ssl}]}
+  {"5.0", [{restart_application, ssl}]},
+  {<<"4\\.*">>, [{restart_application, ssl}]},
+  {<<"3\\.*">>, [{restart_application, ssl}]}
  ]}.
 
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 2255798f1d..0fccbfe908 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 5.0
+SSL_VSN = 5.0.1