Merge for 1.6.1 release

Author: benmwebb

ChangeLog

@@ -5,7 +5,7 @@ SCOREDIR       = ${DESTDIR}${localstatedir}
 SCORE          = ${SCOREDIR}/dopewars.sco
 EXTRA_DIST     = ABOUT-NLS LICENCE dopewars.desktop rpm/dopewars.spec.in \
                  runindent.sh win32/README.md win32/install.nsi.in README.md \
-		 win32/mingw/Dockerfile
+		 win32/mingw/Dockerfile ChangeLog.md
 CLEANFILES     = dopewars.sco dopewars-log.txt dopewars-config.txt
 DISTCLEANFILES = rpm/dopewars.spec
 ACLOCAL_AMFLAGS= -I m4

ChangeLog.md

@@ -1,3 +1,8 @@
+11th December 2020
+     dopewars-1.6.1 released. This improves the appearance of the text-mode
+client, adds a British English translation, and fixes a bug selecting sounds
+from the options dialog of the Windows client.
+
 6th December 2020
      dopewars-1.6.0 released. The metaserver, broken since SourceForge moved
 to HTTPS, should work again. This release also adds support for modern 64-bit

Makefile.am

@@ -1,15 +1,15 @@
 [![Build Status](https://travis-ci.com/benmwebb/dopewars.svg?branch=develop)](https://travis-ci.com/benmwebb/dopewars)
 
-This is dopewars 1.6.0, a game simulating the life of a drug dealer in
+This is dopewars 1.6.1, a game simulating the life of a drug dealer in
 New York. The aim of the game is to make lots and lots of money...
 unfortunately, you start the game with a hefty debt, accumulating interest,
 and the cops take a rather dim view of drug dealing...
 
 These are brief instructions; see the HTML documentation for full information.
 
-dopewars 1.6.0 servers should handle clients as old as version 1.4.3 with
+dopewars 1.6.1 servers should handle clients as old as version 1.4.3 with
 hardly any visible problems (the reverse is also true). However, it is
-recommended that both clients and servers are upgraded to 1.6.0!
+recommended that both clients and servers are upgraded to 1.6.1!
 
 ## Installation
 
@@ -19,10 +19,10 @@ Either...
 
 Or...
 
-1. Get the tarball `dopewars-1.6.0.tar.gz` from the same URL
-2. Extract it via `tar -xvzf dopewars-1.6.0.tar.gz`
+1. Get the tarball `dopewars-1.6.1.tar.gz` from the same URL
+2. Extract it via `tar -xvzf dopewars-1.6.1.tar.gz`
 3. Follow the instructions in the `INSTALL` file in the newly-created
-   `dopewars-1.6.0` directory
+   `dopewars-1.6.1` directory
 
 Once you're done, you can safely delete the RPM, tarball and dopewars
 directory. The dopewars binary is all you need!
@@ -97,7 +97,7 @@ if I can fix 'em... of course, a
 [working patch](https://github.com/benmwebb/dopewars/pulls) would be even
 nicer! ;)
 
-## Licence
+## License
 
 dopewars is released under the GNU General Public License; see the text file
 LICENCE for further information. dopewars is copyright (C) Ben Webb 1998-2020.

NEWS

@@ -1,9 +1,12 @@
 New version checklist:
 
 - cd po; rm dopewars.pot; make dopewars.pot; make update-po; ./check-cformat.sh
-- Add version number, date to ChangeLog
+- Add version number, date to ChangeLog.md
 - Change stable version number in NEWS README.md doc/installation.html doc/index.html doc/windows.html
 - git checkout -b release/x.y.z
 - Change SVN to x.y.z in configure.ac and commit
-- Merge into master, git tag -s x.y.z, git push
-- make dist, upload tar.gz plus RPMs and .exes
+- Merge into master, tag, and push:
+  git checkout master; git merge --no-ff -m 'Merge for x.y.z release' origin/release/x.y.z; git tag -s -u 22A3BF2B vx.y.z; git push origin vx.y.z
+- Delete temporary branch:
+  git branch -d release/x.y.z; git push origin :release/x.y.z
+- make dist, upload tar.gz plus RPMs and .exes to GitHub and SourceForge

README.md

@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([dopewars], [1.6.0])
+AC_INIT([dopewars], [1.6.1])
 AC_CONFIG_SRCDIR([src/dopewars.c])
 AC_CONFIG_AUX_DIR(auxbuild)
 
@@ -8,7 +8,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_TARGET
 AC_USE_SYSTEM_EXTENSIONS
 
-dnl Initialise automake
+dnl Initialize automake
 dnl 'foreign' because we have README.md instead of README
 AM_INIT_AUTOMAKE([foreign])
 
@@ -309,7 +309,7 @@ if test "$CURSES_CLIENT" = "probe"; then
 fi
 
 dnl Do i18n stuff
-ALL_LINGUAS="de pl pt_BR fr fr_CA nn es es_ES"
+ALL_LINGUAS="de pl pt_BR fr fr_CA nn es es_ES en_GB"
 AM_GNU_GETTEXT([external])
 if test "$gt_cv_func_gettext_libintl" = "yes"; then
     LIBS="-lintl $LIBS"

auxbuild/README-release

@@ -371,16 +371,16 @@ <h2><a id="combat">Basic configuration: guns and fighting</a></h2>
 <dt><b>Gun[<i>3</i>].Damage=<i>4</i></b></dt>
 <dd>Defines gun number <i>3</i> to do up to <i>4</i> points of damage.</dd>
 
-<dt><b>PlayerArmour=<i>100</i></b></dt>
-<dd>Sets the percentage armour rating of each player to <i>100</i> - this
+<dt><b>PlayerArmor=<i>100</i></b> or <b>PlayerArmour=<i>100</i></b></dt>
+<dd>Sets the percentage armor rating of each player to <i>100</i> - this
 defines the amount of health that you lose when you are successfully hit.
 If 100, you lose the same number of health points as the gun's damage.
 If more than 100, you lose fewer health points, and if less than 100, you lose
 <b>more</b> health points than the gun's damage. This rating applies only
 when you have no bitches.</dd>
 
-<dt><b>BitchArmour=<i>50</i></b></dt>
-<dd>Sets the percentage armour rating of each bitch to <i>50</i>.</dd>
+<dt><b>BitchArmor=<i>50</i></b> or <b>BitchArmour=<i>50</i></b></dt>
+<dd>Sets the percentage armor rating of each bitch to <i>50</i>.</dd>
 
 <dt><b>NumCop=<i>3</i></b></dt>
 <dd>Configures the game to have <i>3</i> cops. If you kill the first one, you
@@ -398,11 +398,11 @@ <h2><a id="combat">Basic configuration: guns and fighting</a></h2>
 <dd>Names more than one deputy accompanying the first cop
 <i>"deputies"</i>.</dd>
 
-<dt><b>Cop[<i>1</i>].Armour=<i>4</i></b></dt>
-<dd>Sets the armour rating of the first cop to <i>4%</i>.</dd>
+<dt><b>Cop[<i>1</i>].Armor=<i>4</i></b> or <b>Cop[<i>1</i>].Armour=<i>4</i></b></dt>
+<dd>Sets the armor rating of the first cop to <i>4%</i>.</dd>
 
-<dt><b>Cop[<i>1</i>].DeputyArmour=<i>3</i></b></dt>
-<dd>Sets the armour rating of the first cop's deputies to <i>3%</i>.</dd>
+<dt><b>Cop[<i>1</i>].DeputyArmor=<i>3</i></b> or <b>Cop[<i>1</i>].DeputyArmour=<i>3</i></b></dt>
+<dd>Sets the armor rating of the first cop's deputies to <i>3%</i>.</dd>
 
 <dt><b>Cop[<i>1</i>].AttackPenalty=<i>30</i></b></dt>
 <dd>When attacking another player, whether you successfully hit them depends

configure.ac

@@ -19,7 +19,7 @@ <h1>Notes for developers</h1>
 documentation and concept, and particularly welcome suggested improvements.</p>
 
 <p>You are free to distribute modified versions of the code,
-again subject to the licence, but I also additions to the code
+again subject to the license, but I also welcome additions to the code
 via <a href="https://github.com/benmwebb/dopewars/pulls">pull requests</a>.
 If I choose to include this code in a new dopewars version, you will of
 course be credited in the changelog (unless, of course, you don't want to

doc/configfile.html

@@ -368,14 +368,14 @@ Cop[1].DeputiesName = "deputies"
 Cop[2].DeputiesName = "deputies"
 Cop[3].DeputiesName = "cops"
 Cop[4].DeputiesName = "Thugs"
-Cop[1].Armour = 4
-Cop[2].Armour = 15
-Cop[3].Armour = 50
-Cop[4].Armour = 36
-Cop[1].DeputyArmour = 3
-Cop[2].DeputyArmour = 4
-Cop[3].DeputyArmour = 6
-Cop[4].DeputyArmour = 12
+Cop[1].Armor = 4
+Cop[2].Armor = 15
+Cop[3].Armor = 50
+Cop[4].Armor = 36
+Cop[1].DeputyArmor = 3
+Cop[2].DeputyArmor = 4
+Cop[3].DeputyArmor = 6
+Cop[4].DeputyArmor = 12
 Cop[1].MinDeputies = 2
 Cop[2].MinDeputies = 4
 Cop[3].MinDeputies = 6