From ebb10bad28c8befa8a944d54e6009793a3b721fd Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Fri, 30 Sep 2011 15:57:52 +0200
Subject: Version -> 0.11, update appup, minor app suite fix

---
 lib/diameter/src/base/diameter.appup.src | 25 ++++---------------------
 lib/diameter/test/diameter_app_SUITE.erl |  5 ++++-
 lib/diameter/vsn.mk                      |  2 +-
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/lib/diameter/src/base/diameter.appup.src b/lib/diameter/src/base/diameter.appup.src
index 6d8ceadb92..b1c94d4cc8 100644
--- a/lib/diameter/src/base/diameter.appup.src
+++ b/lib/diameter/src/base/diameter.appup.src
@@ -20,28 +20,11 @@
 
 {"%VSN%",
  [
-  {"0.9",
-   [
-    {load_module, diameter,           soft_purge, soft_purge, []},
-    {load_module, diameter_capx,      soft_purge, soft_purge, []},
-    {load_module, diameter_codec,     soft_purge, soft_purge, [diameter_lib]},
-    {load_module, diameter_lib,       soft_purge, soft_purge, []},
-    {load_module, diameter_types,     soft_purge, soft_purge, []},
-    {load_module, diameter_gen_base_accounting, soft_purge, soft_purge, []},
-    {load_module, diameter_gen_base_rfc3588,    soft_purge, soft_purge, []},
-    {load_module, diameter_gen_relay, soft_purge, soft_purge, []},
-    {update, diameter_service,  soft, soft_purge, soft_purge, [diameter_lib]},
-    {update, diameter_config,   soft, soft_purge, soft_purge, []},
-    {update, diameter_peer,     soft, soft_purge, soft_purge, []},
-    {update, diameter_peer_fsm, soft, soft_purge, soft_purge, [diameter_lib]},
-    {update, diameter_reg,      soft, soft_purge, soft_purge, []},
-    {update, diameter_sctp,     soft, soft_purge, soft_purge, []},
-    {update, diameter_stats,    soft, soft_purge, soft_purge, []},
-    {update, diameter_sync,     soft, soft_purge, soft_purge, []},
-    {update, diameter_watchdog, soft, soft_purge, soft_purge, [diameter_lib]}
-   ]
-  }
+  {"0.9",  [{restart_application, diameter}]},
+  {"0.10", [{restart_application, diameter}]}
  ],
  [
+  {"0.9",  [{restart_application, diameter}]},
+  {"0.10", [{restart_application, diameter}]}
  ]
 }.
diff --git a/lib/diameter/test/diameter_app_SUITE.erl b/lib/diameter/test/diameter_app_SUITE.erl
index d5ecdea291..f2258d385f 100644
--- a/lib/diameter/test/diameter_app_SUITE.erl
+++ b/lib/diameter/test/diameter_app_SUITE.erl
@@ -216,12 +216,15 @@ relup(Config) ->
     UpFrom = acc_rel(Dir, Rel, Up),
     DownTo = acc_rel(Dir, Rel, Down),
 
-    {[Name], [Name], UpFrom, DownTo}  %% no intersections
+    {[Name], [Name], [], []}  %% no current in up/down and go both ways
         = {[Name] -- UpFrom,
            [Name] -- DownTo,
            UpFrom -- DownTo,
            DownTo -- UpFrom},
 
+    [[], []] = [S -- sets:to_list(sets:from_list(S))
+                || S <- [UpFrom, DownTo]],
+
     {ok, _, _, []} = systools:make_relup(Name, UpFrom, DownTo, [{path, [Dir]},
                                                                 {outdir, Dir},
                                                                 silent]).
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index c783450c9f..b1d3ba2241 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 0.10
+DIAMETER_VSN = 0.11
 PRE_VSN      =
 APP_VSN      = "$(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)"
 
-- 
cgit v1.2.3