[master]: New upstream release

User Interface:
- Always display list of selectable objects, i.e. remove the option of
  pressing '*' to hide list.
- GTK2: Allow running with Shift + arrow keys. (Thanks to Lord
  Estraven.)
- SDL fixes. (Thanks to Lord Estraven.)
- System-wide character scores were removed. Use the ladder at
  http://angband.oook.cz instead.
- Panic saves are no longer created. Saving state when memory is
  likely corrupted seems like a bad idea.
- Remove long-obsolete front-ends.
- Unix: Removed pointless and error-prone signal handling aimed at
  preventing cheating.
- Removed gamma correction.
Game:
- Killerbunnies: Character dump now lists companions.
- Killerbunnies: Fix dodge messages.
- Imported Theme 1.2.0 since this excellent module by Furiosity seems
  to not be downloadable any more.
- Further Thaumaturgy tweaks by Lord Estraven

Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>

3 files changed, 65 insertions, 145 deletions

diff --git a/debian/changelog b/debian/changelog
index ccf7d400..a842ca21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,52 @@
+tome (2.3.10-ah-1) unstable; urgency=low
+
+  * New upstream release
+    User Interface:
+    - Always display list of selectable objects, i.e. remove the option of
+      pressing '*' to hide list.
+    - GTK2: Allow running with Shift + arrow keys. (Thanks to Lord
+      Estraven.)
+    - SDL fixes. (Thanks to Lord Estraven.)
+    - System-wide character scores were removed. Use the ladder at
+      http://angband.oook.cz instead.
+    - Panic saves are no longer created. Saving state when memory is
+      likely corrupted seems like a bad idea.
+    - Remove long-obsolete front-ends.
+    - Unix: Removed pointless and error-prone signal handling aimed at
+      preventing cheating.
+    - Removed gamma correction.
+    Game:
+    - Killerbunnies: Character dump now lists companions.
+    - Killerbunnies: Fix dodge messages.
+    - Imported Theme 1.2.0 since this excellent module by Furiosity seems
+      to not be downloadable any more.
+    - Further Thaumaturgy tweaks by Lord Estraven
+
+ -- Manoj Srivastava <srivasta@debian.org>  Wed, 14 May 2014 20:29:54 -0700
+
+tome (2.3.9-ah-1) unstable; urgency=low
+
+  * New upstream release
+    User Interface:
+    - Always display list of selectable objects immediately
+      instead of requiring user to press '*'.
+    - Fix display issues with extremely wide terminals.
+    - Automatizer: Fix memory corruption issues.
+    - Remove obsolete and pointless options.
+    Game:
+    - Items are now immediately pseudo-identified upon pickup.
+    - Psycometry now always Identifies regardless of level.
+    - Remove the need to instantly leave for a certain quest. Lots
+      of players would get caught out by this.
+    - A few Mindcraft powers now scale with skill level. (Credit
+      for these goes to Lord Estraven.)
+    - "Far reaching attack" now works for *all* polearms.
+    - Fixes and tweaks for Thaumaturgy to make view/area spells less
+      overpowered and to make bolt/ball spells more useful. (Credit
+      goes to Lord Estraven.)
+
+ -- Manoj Srivastava <srivasta@debian.org>  Wed, 14 May 2014 20:29:27 -0700
+
 tome (2.3.8-ah-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/0001-debcherry-fixup-patch.patch b/debian/patches/0001-debcherry-fixup-patch.patch
index e2f2ec85..a155fd85 100644
--- a/debian/patches/0001-debcherry-fixup-patch.patch
+++ b/debian/patches/0001-debcherry-fixup-patch.patch
@@ -1,10 +1,12 @@
-From d87f41f54d9b8dfb0b5919e4b3a8d81ced96a8a5 Mon Sep 17 00:00:00 2001
+From eadbb0e82af4cdbbb26287f70fac89d48e32fb26 Mon Sep 17 00:00:00 2001
 From: Manoj Srivastava <srivasta@golden-gryphon.com>
-Date: Wed, 14 May 2014 19:55:51 -0700
+Date: Wed, 14 May 2014 20:31:04 -0700
 Subject: [PATCH 1/2] debcherry fixup patch
 
-dad3b13 [master]:  New upstream release
+271bea2 [master]: New upstream release
 	 - no changes against upstream or conflicts
+786d26c [master]:  New upstream release
+	 - extra changes or conflicts
 36e907c [topic--debian]: FTBFS due to binutils-gold
 	 - extra changes or conflicts
 1021e15 [master]: First phase of a ove to a new build system using dh.
@@ -16,7 +18,7 @@ b15c77f Reduce divergence from upstream, and move to sdl variant
 815d966 Set the maintainewr address to be a debian role address
 	 - no changes against upstream or conflicts
 a83a04d Fix typo in man page
-	 - no changes against upstream or conflicts
+	 - extra changes or conflicts
 a3d690b Revert the -m32 flags; use linux32 instead at run-time
 	 - extra changes or conflicts
 79cab02 Build in 32bit mode
@@ -30,16 +32,14 @@ a2f1a5c Added a manual page
 18bd448 Changes to integrate tome into Debian
 	 - extra changes or conflicts
 ---
- src/config.h |   8 ++--
- src/tome.man | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 127 insertions(+), 4 deletions(-)
- create mode 100644 src/tome.man
+ src/config.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/config.h b/src/config.h
-index 143740e..8892a14 100644
+index 7c1cf1d..c9f460e 100644
 --- a/src/config.h
 +++ b/src/config.h
-@@ -90,7 +90,7 @@
+@@ -89,7 +89,7 @@
  /*
   * OPTION: Include "ncurses.h" instead of "curses.h" in "main-gcu.c"
   */
@@ -48,7 +48,7 @@ index 143740e..8892a14 100644
  
  
  /*
-@@ -269,7 +269,7 @@
+@@ -226,7 +226,7 @@
   * that file.
   */
  #ifndef DEFAULT_PATH
@@ -57,7 +57,7 @@ index 143740e..8892a14 100644
  #endif
  
  
-@@ -338,7 +338,7 @@
+@@ -261,7 +261,7 @@
  /*
   * OPTION: Person to bother if something goes wrong.
   */
@@ -66,144 +66,15 @@ index 143740e..8892a14 100644
  
  
  /*
-@@ -374,7 +374,7 @@
+@@ -282,7 +282,7 @@
  /* ToME options: */
  
  /* Should the player know his / her starting life rate? */
 -/* #define SHOW_LIFE_RATE */
 +#define SHOW_LIFE_RATE
  
- /* Do we want different characters for different races? */
- #define VARIABLE_PLAYER_GRAPH
-diff --git a/src/tome.man b/src/tome.man
-new file mode 100644
-index 0000000..4d48ce9
---- /dev/null
-+++ b/src/tome.man
-@@ -0,0 +1,123 @@
-+.\" Hey, Emacs! This is an -*- nroff -*- source file.
-+.\" Copyright (c) 2003 Manoj Srivastava <srivasta@debian.org>
-+.\"
-+.\" This is free documentation; you can redistribute it and/or
-+.\" modify it under the terms of the GNU General Public License as
-+.\" published by the Free Software Foundation; either version 2 of
-+.\" the License, or (at your option) any later version.
-+.\"
-+.\" The GNU General Public License's references to "object code"
-+.\" and "executables" are to be interpreted as the output of any
-+.\" document formatting or typesetting system, including
-+.\" intermediate and printed output.
-+.\"
-+.\" This manual is distributed in the hope that it will be useful,
-+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+.\" GNU General Public License for more details.
-+.\"
-+.\" You should have received a copy of the GNU General Public
-+.\" License along with this manual; if not, write to the Free
-+.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-+.\" USA.
-+.\"
-+.\" This manual is distributed in the hope that it will be useful,
-+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+.\" GNU General Public License for more details.
-+.\"
-+.\" You should have received a copy of the GNU General Public
-+.\" License along with this manual; if not, write to the Free
-+.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-+.\" USA.
-+.\"
-+.\" $Id: tome.man,v 1.1 2003/08/02 05:01:25 srivasta Exp $
-+.TH TOME 6 "August 1 2003" "Debian" "Debian GNU/Linux manual"
-+.SH NAME
-+tome \- is a graphical dungeon adventure game in the vein of rogue
-+.SH SYNOPSIS
-+.B tome
-+.I [options]
-+.I [\-\- suboptions]
-+.SH DESCRIPTION
-+This manual page explains the Debian package
-+.B "tome".
-+.B Tome 
-+is a single-player, 
-+.I graphical
-+dungeon adventure game using textual characters
-+to represent the walls and floors of a dungeon and the inhabitants therein,
-+in the vein of 
-+.I rogue, 
-+.I hack, 
-+.I nethack, 
-+and 
-+.I moria.
-+.PP
-+This version of
-+.B Tome
-+has been compiled with both 
-+.I ncurses
-+and the 
-+.I X Windowing system.
-+and hence can be played on a virtual console as well as under 
-+.I X.
-+In the latter case, the game pulls up multiple windows.
-+.SH OPTIONS
-+.PD 0
-+.TP 10
-+.B \-h 
-+Print out a usage message.
-+.TP
-+.BR \-n
-+Start a new character
-+.TP
-+.BR \-f
-+Request fiddle mode (no high score entry)
-+.TP
-+.BR \-w
-+Request wizard mode (no high score entry)
-+.TP
-+.BR \-v
-+Request sound mode
-+.TP
-+.BR \-g
-+Request graphics mode
-+.TP
-+.BR \-o
-+Request original keyset
-+.TP
-+.BR \-r
-+Request rogue-like keyset
-+.TP
-+.BR \-s<num>  
-+Show <num> high scores
-+.TP
-+.BR \-u<who>  
-+Use your <who> savefile
-+.TP
-+.BR \-m<sys>  
-+Force 'main-<sys>.c' usage
-+.TP
-+.BR \-d<lib>=<path>  
-+Define a 'lib' dir sub-path. Valid values of lib are help info user
-+bone save data apex xtra edit file
-+.PD
-+.SH "GETTING STARTED"
-+To start with, you can just say tome -uTest, and that creates a
-+save file with the file name 
-+.I /var/games/tome/save/<UID>Test. 
-+The best place to get help is the program itself; help is reached by
-+the command
-+.B ?
-+and presents a menu of choices.
-+.PP
-+Program options can be set  using the = command. To see what the
-+various options mean, access the List of Options help menu with the ?
-+command. 
-+.SH "SEE ALSO"
-+.BR nethack (6).
-+.BR angband (6).
-+.SH AUTHOR
-+This manual page was written Manoj Srivastava <srivasta@debian.org>,
-+for the Debian GNU/Linux system.
+ /* Allow hordes of 'similar' monsters */
+ #define MONSTER_HORDES
 -- 
 2.0.0.rc2
 
diff --git a/debian/patches/0002-Fix-code-which-needed-a-32-bit-int-to-not-use-int-lo.patch b/debian/patches/0002-Fix-code-which-needed-a-32-bit-int-to-not-use-int-lo.patch
index 2588ef41..059895f0 100644
--- a/debian/patches/0002-Fix-code-which-needed-a-32-bit-int-to-not-use-int-lo.patch
+++ b/debian/patches/0002-Fix-code-which-needed-a-32-bit-int-to-not-use-int-lo.patch
@@ -1,4 +1,4 @@
-From 6d7634a95a4de1e3b209f4d905c97c811e79e165 Mon Sep 17 00:00:00 2001
+From 6a5e1f3afab967a7c7daad687feee6e0beb086d7 Mon Sep 17 00:00:00 2001
 From: Manoj Srivastava <srivasta@debian.org>
 Date: Tue, 21 Oct 2008 08:25:47 -0500
 Subject: [PATCH 2/2] Fix code which needed a 32 bit int to not use int/long