r15017 - in packages/trunk/nethack/debian: . patches

[Vincent Cheng]

Author: vcheng
Date: 2014-04-01 20:38:06 +0000 (Tue, 01 Apr 2014)
New Revision: 15017

Modified:
   packages/trunk/nethack/debian/changelog
   packages/trunk/nethack/debian/control
   packages/trunk/nethack/debian/patches/series
   packages/trunk/nethack/debian/rules
Log:
Add nethack curses build


Modified: packages/trunk/nethack/debian/changelog
===================================================================
--- packages/trunk/nethack/debian/changelog	2014-03-31 23:19:49 UTC (rev 15016)
+++ packages/trunk/nethack/debian/changelog	2014-04-01 20:38:06 UTC (rev 15017)
@@ -1,4 +1,4 @@
-nethack (3.4.3-15) unstable; urgency=low
+nethack (3.4.3-15) unstable; urgency=medium
 
   [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
@@ -14,6 +14,8 @@
       dh_installinit.
 
   [ Vincent Cheng ]
+  * Build nethack with curses interface. Thanks to Ivan Krylov for the patch!
+    (Closes: #705029)
   * Do not remove alternatives on upgrades.
     (https://lists.debian.org/debian-devel/2012/09/msg00575.html)
   * Update to Standards version 3.9.5.

Modified: packages/trunk/nethack/debian/control
===================================================================
--- packages/trunk/nethack/debian/control	2014-03-31 23:19:49 UTC (rev 15016)
+++ packages/trunk/nethack/debian/control	2014-04-01 20:38:06 UTC (rev 15017)
@@ -25,7 +25,7 @@
 Package: nethack-common
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: nethack-console | nethack-x11
+Recommends: nethack-console | nethack-x11 | nethack-curses | nethack-lisp
 Description: dungeon crawl game - common files
  NetHack is a wonderfully silly, yet quite addictive, Dungeons &
  Dragons-style adventure game. You play a character from one of many
@@ -40,6 +40,7 @@
  original non-graphical version, and they can all be installed
  at the same time:
   - nethack-console: no graphics, just plain NetHack;
+  - nethack-curses : alternate text-mode user interface
   - nethack-x11    : original X11/Athena-based graphical version;
   - nethack-lisp   : Lisp window version.
  .
@@ -74,11 +75,39 @@
  original non-graphical version, and they can all be installed
  at the same time:
   - nethack-console: no graphics, just plain NetHack;
+  - nethack-curses : alternate text-mode user interface
   - nethack-x11    : original X11/Athena-based graphical version;
   - nethack-lisp   : Lisp window version.
  .
  This package provides the plain console version of NetHack.
 
+Package: nethack-curses
+Depends:
+ nethack-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Architecture: any
+Provides: nethack
+Description: dungeon crawl game - curses interface
+ NetHack is a wonderfully silly, yet quite addictive, Dungeons &
+ Dragons-style adventure game. You play a character from one of many
+ classes (such as wizard, ranger, or tourist), fighting your way down to
+ retrieve the Amulet of Yendor (try saying THAT one backwards!) for your
+ god. On the way, you might encounter a quantum mechanic or two, or
+ perhaps King Arthur, or - if you're REALLY lucky - the Ravenous
+ Bugblatter Beast of Traal.
+ .
+ You should install a front-end for NetHack if you
+ wish to play the game.  Each of them includes the
+ original non-graphical version, and they can all be installed
+ at the same time:
+  - nethack-console: no graphics, just plain NetHack;
+  - nethack-curses : alternate text-mode user interface
+  - nethack-x11    : original X11/Athena-based graphical version;
+  - nethack-lisp   : Lisp window version.
+ .
+ This package provides the curses interface of NetHack.
+
 Package: nethack-lisp
 Depends:
  nethack-common (= ${binary:Version}),
@@ -101,6 +130,7 @@
  original non-graphical version, and they can all be installed
  at the same time:
   - nethack-console: no graphics, just plain NetHack;
+  - nethack-curses : alternate text-mode user interface
   - nethack-x11    : original X11/Athena-based graphical version;
   - nethack-lisp   : Lisp window version.
  .
@@ -128,6 +158,7 @@
  original non-graphical version, and they can all be installed
  at the same time:
   - nethack-console: no graphics, just plain NetHack;
+  - nethack-curses : alternate text-mode user interface
   - nethack-x11    : original X11/Athena-based graphical version;
   - nethack-lisp   : Lisp window version.
  .

Modified: packages/trunk/nethack/debian/patches/series
===================================================================
--- packages/trunk/nethack/debian/patches/series	2014-03-31 23:19:49 UTC (rev 15016)
+++ packages/trunk/nethack/debian/patches/series	2014-04-01 20:38:06 UTC (rev 15017)
@@ -19,3 +19,4 @@
 0019-stay-in-array-bounds.patch
 0020-fix-64-bit-issues-in-lisp-code.patch
 0021-fix-kfreebsd-ftbfs.patch
+0022-add-curses-ui.patch

Modified: packages/trunk/nethack/debian/rules
===================================================================
--- packages/trunk/nethack/debian/rules	2014-03-31 23:19:49 UTC (rev 15016)
+++ packages/trunk/nethack/debian/rules	2014-04-01 20:38:06 UTC (rev 15017)
@@ -39,10 +39,10 @@
 		$(EXTRA_$1) GAME='nethack.$1' \
 		-C src 'nethack.$1'
 endef
-SRC_console = $$(WINTTYSRC)
-OBJ_console = $$(WINTTYOBJ)
+SRC_console = $$(WINTTYSRC) $$(WINCURSESSRC)
+OBJ_console = $$(WINTTYOBJ) $$(WINCURSESOBJ)
 LIB_console = -lncurses
-EXTRACPP_console =
+EXTRACPP_console = -DCURSES_GRAPHICS
 SRC_x11 = $$(WINTTYSRC) $$(WINX11SRC)
 OBJ_x11 = $$(WINTTYOBJ) $$(WINX11OBJ)
 LIB_x11 = -lncurses -lXaw -Wl,--as-needed -lXmu -lXext -Wl,--no-as-needed -lXt -lXpm -lX11 -Wl,--as-needed -lm -Wl,--no-as-needed