From 86e7b7cac4bd15acfc04fb2ba17acab87fbfb51f Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Thu, 19 May 2011 12:28:55 +0200
Subject: Fix wx app file, sed didn't work on all platforms

---
 lib/wx/src/Makefile     | 7 +++----
 lib/wx/src/wx.appup.src | 3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/wx')

diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile
index 3cc668375f..46bc06271c 100644
--- a/lib/wx/src/Makefile
+++ b/lib/wx/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2008-2010. All Rights Reserved.
+# Copyright Ericsson AB 2008-2011. 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
@@ -29,8 +29,7 @@ ERL_COMPILE_FLAGS += -I$(ERLINC) +warn_unused_vars
 
 ARCHIVE         = wx-$(VSN).ez
 
-ErlMods         = \
-		wx \
+ErlMods         = wx \
 		wx_object \
                 wxe_master \
                 wxe_server \
@@ -44,7 +43,7 @@ GEN_FILES       = $(wildcard gen/wx*.erl) \
 		gen/glu.erl \
 		gen/gl.erl
 
-GEN_MODS        = $(GEN_FILES:gen/%.erl=  %,\n )
+GEN_MODS        = $(GEN_FILES:gen/%.erl=%,)
 
 GEN_HRL		= \
 		$(EGEN)/wxe_debug.hrl \
diff --git a/lib/wx/src/wx.appup.src b/lib/wx/src/wx.appup.src
index c02edd2afb..1102af612e 100644
--- a/lib/wx/src/wx.appup.src
+++ b/lib/wx/src/wx.appup.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2011. 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,5 +18,6 @@
 %% %CopyrightEnd%
 
 {"%VSN%",
+ [ ],
  [ ]
 }.
-- 
cgit v1.2.3


From 4a5a75811e2cd590b5c94f71864a5245fd511ccf Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 24 May 2011 13:16:24 +0200
Subject: Prepare release

---
 lib/wx/doc/src/notes.xml | 16 ++++++++++++++++
 lib/wx/vsn.mk            |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'lib/wx')

diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 4282e19769..26d1f892b2 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -31,6 +31,22 @@
   <p>This document describes the changes made to the wxErlang
     application.</p>
 
+<section><title>Wx 0.98.10</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed wx app files on mac and solaris. Thanks Jachym
+	    Holecek and Joe Williams.</p>
+          <p>
+	    Own Id: OTP-9324</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Wx 0.98.9</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index 7c440a7f5b..02899f4115 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 0.98.9
+WX_VSN = 0.98.10
-- 
cgit v1.2.3