From ac6b25294ea083b9cf025348176de7ff746442e9 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Wed, 18 Jun 2014 20:55:15 +1000 Subject: [PATCH 1/8] Start preparing for the next version of Star Traders --- INSTALL | 8 ++++---- NEWS | 6 ++++++ configure.ac | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/INSTALL b/INSTALL index 2ca2683..c3ab28b 100644 --- a/INSTALL +++ b/INSTALL @@ -102,12 +102,12 @@ You can also run configure in a separate build-only directory tree. This feature requires GNU Make and allows you to keep the source code tree from being modified by the compilation process. To use this option, create a separate build directory, then run configure. For example, if you placed -the Star Traders source code tree in $HOME/src/trader-7.5, you could run +the Star Traders source code tree in $HOME/src/trader-7.6, you could run something like: - mkdir $HOME/build/trader-build-7.5 - cd $HOME/build/trader-build-7.5 - $HOME/src/trader-7.5/configure + mkdir $HOME/build/trader-build-7.6 + cd $HOME/build/trader-build-7.6 + $HOME/src/trader-7.6/configure Once again, the Autoconf manual describes these options (and many others): diff --git a/NEWS b/NEWS index 6fca7da..af96be4 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,12 @@ consult the Subversion repository for "trader" on The ZAP Group web server at http://www.zap.org.au/services/svn/. +Version 7.6 (not yet released) +------------------------------ + +(Nothing yet...) + + Version 7.5 (24th May, 2014) ---------------------------- diff --git a/configure.ac b/configure.ac index f93d444..fe14b94 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program. If not, see http://www.gnu.org/licenses/. -AC_INIT([Star Traders], [7.5], [J.Zaitseff@zap.org.au], [trader], [http://www.zap.org.au/software/trader/]) +AC_INIT([Star Traders], [7.6], [J.Zaitseff@zap.org.au], [trader], [http://www.zap.org.au/software/trader/]) AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author]) AC_PREREQ([2.67]) From be276094eac68d77509bed91410c94cbddacfcde Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Wed, 18 Jun 2014 20:56:09 +1000 Subject: [PATCH 2/8] Rearrange library includes to allow compilation under Cygwin --- NEWS | 3 ++- src/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index af96be4..5c14342 100644 --- a/NEWS +++ b/NEWS @@ -18,7 +18,8 @@ at http://www.zap.org.au/services/svn/. Version 7.6 (not yet released) ------------------------------ -(Nothing yet...) +A minor release to fix compilation bugs under Cygwin: the libiconv library +must be listed AFTER the GNU Portability Library on that platform. Version 7.5 (24th May, 2014) diff --git a/src/Makefile.am b/src/Makefile.am index e4f6429..238f06a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,6 +43,6 @@ trader_SOURCES = \ trader_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \ -DLOCALEDIR=\"$(localedir)\" -trader_LDADD = @CURSES_LIB@ @LIBICONV@ $(top_builddir)/lib/libgnu.a @LIBINTL@ +trader_LDADD = @CURSES_LIB@ $(top_builddir)/lib/libgnu.a @LIBICONV@ @LIBINTL@ EXTRA_DIST = README From 452519ccda5cf984eb75978ba1de9f39965d2d52 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 19 Jun 2014 13:52:46 +1000 Subject: [PATCH 3/8] Development packages may have either -dev or -devel suffixes --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index c3ab28b..f371be1 100644 --- a/INSTALL +++ b/INSTALL @@ -45,7 +45,7 @@ and installation: it), you may pass "--disable-nls" to the configure script. 5. Development libraries and header files for all of the above. On many - systems, these files are part of XXX-dev packages. + systems, these files are part of XXX-dev or XXX-devel packages. 6. The GNU Perfect Hash Function Generator, gperf. This utility program may be required for parts of the GNU Portability Library. From 4ef0578792d291ea6e4102deb30a9be424eea66d Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Wed, 13 Aug 2014 11:32:27 +1000 Subject: [PATCH 4/8] Change minimum and maximum share return percentages to -15% and 25% --- src/globals.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/globals.h b/src/globals.h index c442881..e84c5d5 100644 --- a/src/globals.h +++ b/src/globals.h @@ -74,8 +74,8 @@ #define DEC_SHARE_PRICE 0.65 // 65% x 35% chance of decrementing same #define PRICE_CHANGE_RATE 0.25 // Up to 25% of share price is used to incr./decr. #define INITIAL_RETURN 0.05 // Initial return per share: 5% -#define MIN_COMPANY_RETURN -0.10 // Minimum return per share (yes, negative!) -#define MAX_COMPANY_RETURN 0.20 // Maximum return per share +#define MIN_COMPANY_RETURN -0.15 // Minimum return per share (yes, negative!) +#define MAX_COMPANY_RETURN 0.25 // Maximum return per share #define CHANGE_COMPANY_RETURN 0.50 // Chance of randomly changing return #define DEC_COMPANY_RETURN 0.50 // Chance such change will decrease return #define RETURN_MAX_CHANGE 0.03 // Maximum that company return will change From d0bc71f63dcd3b38094356049ad852cc97d9231d Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Wed, 13 Aug 2014 11:36:35 +1000 Subject: [PATCH 5/8] Document the changed share return percentages --- NEWS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS b/NEWS index 5c14342..d25eeec 100644 --- a/NEWS +++ b/NEWS @@ -21,6 +21,11 @@ Version 7.6 (not yet released) A minor release to fix compilation bugs under Cygwin: the libiconv library must be listed AFTER the GNU Portability Library on that platform. +In addition, the minimum and maximum share return values were changed from +-10% to -15% and 20% to 25% respectively. This gives more incentive to +borrow money from the Interstellar Trading Bank, whose interest rate can +reach a maximum of 20%. + Version 7.5 (24th May, 2014) ---------------------------- From 23226131a573d62e16ba6a2fb9b02781fa2eb89f Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Wed, 13 Aug 2014 11:54:16 +1000 Subject: [PATCH 6/8] Update version numbers and dates on PO files --- po/da.po | 6 +++--- po/de.po | 6 +++--- po/en_AU.po | 6 +++--- po/en_CA.po | 6 +++--- po/en_GB.po | 6 +++--- po/en_US.po | 6 +++--- po/eo.po | 6 +++--- po/fi.po | 6 +++--- po/fr.po | 6 +++--- po/hr.po | 6 +++--- po/nb.po | 6 +++--- po/ru.po | 6 +++--- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/po/da.po b/po/da.po index 7747a8d..4dbf328 100644 --- a/po/da.po +++ b/po/da.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.5\n" +"Project-Id-Version: trader 7.6\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" -"PO-Revision-Date: 2014-05-22 10:57+1000\n" +"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"PO-Revision-Date: 2014-08-13 11:50+1000\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "Language: da\n" diff --git a/po/de.po b/po/de.po index 7635518..45f9e61 100644 --- a/po/de.po +++ b/po/de.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.5\n" +"Project-Id-Version: trader 7.6\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" -"PO-Revision-Date: 2014-05-22 10:57+1000\n" +"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"PO-Revision-Date: 2014-08-13 11:51+1000\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" "Language: de\n" diff --git a/po/en_AU.po b/po/en_AU.po index 2244512..37537e2 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.5\n" +"Project-Id-Version: trader 7.6\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" -"PO-Revision-Date: 2014-05-22 10:57+1000\n" +"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"PO-Revision-Date: 2014-08-13 11:51+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" "Language: en_AU\n" diff --git a/po/en_CA.po b/po/en_CA.po index 42a1022..75b1ba3 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.5\n" +"Project-Id-Version: trader 7.6\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" -"PO-Revision-Date: 2014-05-22 10:58+1000\n" +"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"PO-Revision-Date: 2014-08-13 11:51+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" "Language: en_CA\n" diff --git a/po/en_GB.po b/po/en_GB.po index c97cc8e..046edcd 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.5\n" +"Project-Id-Version: trader 7.6\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" -"PO-Revision-Date: 2014-05-22 10:58+1000\n" +"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" "Language: en_GB\n" diff --git a/po/en_US.po b/po/en_US.po index 7f3f523..c1293e5 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.5\n" +"Project-Id-Version: trader 7.6\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" -"PO-Revision-Date: 2014-05-22 10:58+1000\n" +"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" "Language: en_US\n" diff --git a/po/eo.po b/po/eo.po index 2c3fea5..dd5e52e 100644 --- a/po/eo.po +++ b/po/eo.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.5\n" +"Project-Id-Version: trader 7.6\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" -"PO-Revision-Date: 2014-05-22 10:59+1000\n" +"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" "Language: eo\n" diff --git a/po/fi.po b/po/fi.po index 3fc8ea0..359af22 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.5\n" +"Project-Id-Version: trader 7.6\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" -"PO-Revision-Date: 2014-05-22 10:59+1000\n" +"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" "Language: fi\n" diff --git a/po/fr.po b/po/fr.po index 38d667a..c1cf03f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -12,10 +12,10 @@ # Frédéric Marchal , 2012. msgid "" msgstr "" -"Project-Id-Version: trader 7.5\n" +"Project-Id-Version: trader 7.6\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" -"PO-Revision-Date: 2014-05-22 11:00+1000\n" +"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" "Language: fr\n" diff --git a/po/hr.po b/po/hr.po index 643df83..844c8fa 100644 --- a/po/hr.po +++ b/po/hr.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.5\n" +"Project-Id-Version: trader 7.6\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" -"PO-Revision-Date: 2014-05-22 11:00+1000\n" +"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" "Language: hr\n" diff --git a/po/nb.po b/po/nb.po index 08cbbf8..b988746 100644 --- a/po/nb.po +++ b/po/nb.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.5\n" +"Project-Id-Version: trader 7.6\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" -"PO-Revision-Date: 2014-05-22 11:00+1000\n" +"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" "Language: nb\n" diff --git a/po/ru.po b/po/ru.po index 8748392..9d5c00c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -15,10 +15,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.5\n" +"Project-Id-Version: trader 7.6\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2014-05-23 19:00+1000\n" -"PO-Revision-Date: 2014-05-22 11:01+1000\n" +"POT-Creation-Date: 2014-08-13 11:39+1000\n" +"PO-Revision-Date: 2014-08-13 11:52+1000\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" "Language: ru\n" From 35ea0f596566641bdc877a5d07c63e5b671ee4c4 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Wed, 13 Aug 2014 11:55:30 +1000 Subject: [PATCH 7/8] Update the manual page date --- doc/trader.6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/trader.6 b/doc/trader.6 index 152233c..2580caf 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -41,7 +41,7 @@ .if \n[.g] .mso www.tmac .\" .\" ********************************************************************* -.TH TRADER 6 "24th May, 2014" "Unix-like systems" +.TH TRADER 6 "13th August, 2014" "Unix-like systems" .SH NAME trader \- a game of interstellar trading .\" ********************************************************************* From 8862bfeb3a15d923d6c9ad6c3c92b69c2b511495 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Wed, 13 Aug 2014 11:56:20 +1000 Subject: [PATCH 8/8] Add today's date to the NEWS file: we release! --- NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index d25eeec..296c9dd 100644 --- a/NEWS +++ b/NEWS @@ -15,8 +15,8 @@ consult the Subversion repository for "trader" on The ZAP Group web server at http://www.zap.org.au/services/svn/. -Version 7.6 (not yet released) ------------------------------- +Version 7.6 (13th August, 2014) +------------------------------- A minor release to fix compilation bugs under Cygwin: the libiconv library must be listed AFTER the GNU Portability Library on that platform.