about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--CHANGES6
-rw-r--r--PACKAGE/debian/changelog6
-rw-r--r--PACKAGE/lynx.nsi6
-rw-r--r--PACKAGE/lynx.spec4
-rw-r--r--PACKAGE/version.iss2
-rw-r--r--configure.in6
-rw-r--r--lynx.cfg4
-rw-r--r--makefile.in4
-rw-r--r--src/LYCurses.c4
-rw-r--r--src/LYIcon.rc10
-rw-r--r--userdefs.h4
11 files changed, 31 insertions, 25 deletions
diff --git a/CHANGES b/CHANGES
index c7099a44..32787a9a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,12 @@
--- $LynxId: CHANGES,v 1.739 2014/02/14 13:32:54 tom Exp $
+-- $LynxId: CHANGES,v 1.740 2014/02/21 01:20:21 Thomas.Klausner Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2014-02-14 (2.8.8rel.2)
+* build-fix for NetBSD, whose curses library provides use_default_colors(),
+  but the package turns off the keymap feature (patch by Thomas Klausner).
+
 2014-02-14 (2.8.8rel.1)
 2014-02-14 (2.8.8pre.5)
 * change quoting for fixup to help_files.sed in 2.8.8dev.17 to work around
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index f3dd9053..8113186c 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.8.8rel.1) unstable; urgency=low
+lynx-dev (2.8.8rel.2) unstable; urgency=low
 
-  * stable release
+  * maintenance updates
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 14 Feb 2014 08:35:07 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 20 Feb 2014 20:18:50 -0500
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index af3cfd9d..393d9c19 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.16 2014/02/14 13:35:07 tom Exp $

+; $LynxId: lynx.nsi,v 1.17 2014/02/21 01:18:50 tom Exp $

 ; Script originally generated with the Venis Install Wizard, but customized.

 ; The Inno Setup script is preferred; but this can be built via cross-compiling.

 

@@ -9,8 +9,8 @@
 !define VERSION_EPOCH "2"

 !define VERSION_MAJOR "8"

 !define VERSION_MINOR "8"

-!define VERSION_LEVEL "01"

-!define VERSION_PATCH "rel.1"

+!define VERSION_LEVEL "02"

+!define VERSION_PATCH "rel.2"

 

 !define SUBKEY "Lynx"

 

diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 3d0d0ef2..05538be8 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.24 2014/02/14 13:35:07 tom Exp $
+# $LynxId: lynx.spec,v 1.25 2014/02/21 01:18:50 tom Exp $
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.8
-Release: rel.1
+Release: rel.2
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index 5da928ce..2c9be9c5 100644
--- a/PACKAGE/version.iss
+++ b/PACKAGE/version.iss
@@ -1,7 +1,7 @@
 ; version used for Inno Setup files.

 

 ; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$

-#define LYNX_VERSION "2.8.8rel.1"
+#define LYNX_VERSION "2.8.8rel.2"
 

 ; most-recent full release and target

 #define LYNX_RELEASE "2.8.8"

diff --git a/configure.in b/configure.in
index 1da97271..a9a6ae2b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.265 2014/02/14 13:36:30 tom Exp $
+dnl $LynxId: configure.in,v 1.266 2014/02/21 01:18:50 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.8rel.1)
+AC_REVISION(2.8.8rel.2)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -64,7 +64,7 @@ AC_ARG_PROGRAM
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.8rel.1
+VERSION=2.8.8rel.2
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
diff --git a/lynx.cfg b/lynx.cfg
index 8a9c1ce1..9838e31f 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,10 +1,10 @@
-# $LynxId: lynx.cfg,v 1.244 2014/02/14 13:36:38 tom Exp $
+# $LynxId: lynx.cfg,v 1.245 2014/02/21 01:18:50 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.8rel.1"
+#PRCS LYNX_VERSION "2.8.8rel.2"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
 #PRCS LYNX_DATE "Fri, 14 Feb 2014 05:00:16 -0800"
diff --git a/makefile.in b/makefile.in
index 8ac6f477..12980e37 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.143 2014/02/14 13:36:45 tom Exp $
+# $LynxId: makefile.in,v 1.144 2014/02/21 01:18:50 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -46,7 +46,7 @@ TAR_UP		= $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@
 TAR_DOWN	= $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
 
 # $Format: "LYNX_VERSION	= $ProjectVersion$"$
-LYNX_VERSION	= 2.8.8rel.1
+LYNX_VERSION	= 2.8.8rel.2
 
 ## This is the version which we are developing (or, upon release, make this
 ## the same).  Use no dots in the name, since it must work on VMS and MS-DOS.
diff --git a/src/LYCurses.c b/src/LYCurses.c
index c4c5e0f4..06ed6017 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYCurses.c,v 1.178 2013/11/28 11:52:34 tom Exp $ */
+/* $LynxId: LYCurses.c,v 1.179 2014/02/20 23:14:31 Thomas.Klausner Exp $ */
 #include <HTUtils.h>
 #include <HTAlert.h>
 
@@ -1180,10 +1180,12 @@ void restart_curses(void)
     keypad(LYwin, TRUE);
     lynx_enable_mouse(1);
 
+#if defined(USE_KEYMAPS)  
     if (-1 == lynx_initialize_keymaps()) {
 	endwin();
 	exit_immediately(EXIT_FAILURE);
     }
+#endif
     if (has_colors()) {
 	start_color();
     }
diff --git a/src/LYIcon.rc b/src/LYIcon.rc
index e6de6432..88f835b3 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.10 2014/02/14 13:35:07 tom Exp $
+// $LynxId: LYIcon.rc,v 1.11 2014/02/21 01:18:50 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,8,8,01
-PRODUCTVERSION 2,8,8,01
+FILEVERSION    2,8,8,02
+PRODUCTVERSION 2,8,8,02
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS_NT_WINDOWS32
@@ -19,12 +19,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName",      "http://lynx.isc.org"
       VALUE "FileDescription",  "Lynx - web browser"
-      VALUE "FileVersion",      "2.8.8.01"
+      VALUE "FileVersion",      "2.8.8.02"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "©1997-2014 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.8.8.01"
+      VALUE "ProductVersion",   "2.8.8.02"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/userdefs.h b/userdefs.h
index 22fc7e10..daf85f07 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.292 2014/02/14 15:04:49 tom Exp $
+ * $LynxId: userdefs.h,v 1.293 2014/02/21 01:18:50 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -1442,7 +1442,7 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.8rel.1"
+#define LYNX_VERSION "2.8.8rel.2"
 #define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */