[master]: New upstream release

Upstream development of version 2 has moved into maintenance mode,
with a new upstream git repository at:
     git://gitorious.org/tome2/tome2.git

 - Don't generate impassable glass walls.
 - Mark *all* quest monsters properly.
 - Avoid generating up staircases in selected dungeons.
 - Mimicry cloaks of Abomination now aggravate properly.
 - Properly handle item set effects with certain traps.
 - Fix crash bug during character dumps.
 - Misc. Mimicry fixes.
 - Prevent immunities from Balrog Form persisting too long.
 - Fix for loading/saving on Linux distribution using Fortify.
 - Fix for module directory paths.
 - Fix miscellaneous problems on 64-bit platforms.
 - Princess room should now always be generated.
 - Extra Blows applies to barehand combat too.

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

3 files changed, 27 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index fc3c457a..3ca712e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+tome (2.3.6-ah-1) unstable; urgency=medium
+
+  * Upstream development of version 2 has moved into maintenance mode,
+    with a new upstream git repository at:
+    git://gitorious.org/tome2/tome2.git
+    - Don't generate impassable glass walls.
+    - Mark *all* quest monsters properly.
+    - Avoid generating up staircases in selected dungeons.
+    - Mimicry cloaks of Abomination now aggravate properly.
+    - Properly handle item set effects with certain traps.
+    - Fix crash bug during character dumps.
+    - Misc. Mimicry fixes.
+    - Prevent immunities from Balrog Form persisting too long.
+    - Fix for loading/saving on Linux distribution using Fortify.
+    - Fix for module directory paths.
+    - Fix miscellaneous problems on 64-bit platforms.
+    - Princess room should now always be generated.
+    - Extra Blows applies to barehand combat too.
+
+ -- Manoj Srivastava <srivasta@debian.org>  Wed, 14 May 2014 13:49:42 -0700
+
 tome (2.3.5-4) unstable; urgency=low
 
   * On purge, get rid of /var/games/tome directory (and all the score
diff --git a/debian/patches/0001-debcherry-fixup-patch.patch b/debian/patches/0001-debcherry-fixup-patch.patch
index c8f6c4ec..16aecf1f 100644
--- a/debian/patches/0001-debcherry-fixup-patch.patch
+++ b/debian/patches/0001-debcherry-fixup-patch.patch
@@ -1,6 +1,6 @@
-From 303b40dfacae90506045a867e9faf742b6318c69 Mon Sep 17 00:00:00 2001
+From 38e8771b6ba3701a472618ab59af1e86190837e6 Mon Sep 17 00:00:00 2001
 From: Manoj Srivastava <srivasta@golden-gryphon.com>
-Date: Wed, 30 Apr 2014 22:53:05 -0700
+Date: Wed, 14 May 2014 13:30:41 -0700
 Subject: [PATCH 1/2] debcherry fixup patch
 
 36e907c [topic--debian]: FTBFS due to binutils-gold
@@ -75,7 +75,7 @@ index d626062..6db4ff8 100644
  /* Do we want different characters for different races? */
  #define VARIABLE_PLAYER_GRAPH
 diff --git a/src/makefile.std b/src/makefile.std
-index c9247df..9407cdb 100644
+index 3d762d4..4139c11 100644
 --- a/src/makefile.std
 +++ b/src/makefile.std
 @@ -54,15 +54,16 @@
@@ -268,5 +268,5 @@ index 0000000..4d48ce9
 +This manual page was written Manoj Srivastava <srivasta@debian.org>,
 +for the Debian GNU/Linux system.
 -- 
-2.0.0.rc0
+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 3e12b189..774e4b6e 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 808d268f231e0ff1f3e0fed733b9221c48270c88 Mon Sep 17 00:00:00 2001
+From 9558c380a07f8dd133ddf49dc140f769e78262e4 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
@@ -54,5 +54,5 @@ index 4b12450..39a1e0d 100644
  
  #define MAX_SIZET	((size_t)(~(size_t)0)-2)
 -- 
-2.0.0.rc0
+2.0.0.rc2