snapshot of project "lynx", label v2-8-8pre_1a

10 files changed, 45 insertions, 25 deletions

diff --git a/CHANGES b/CHANGES
index 5e6fe90e..fda53e1d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,13 @@
--- $LynxId: CHANGES,v 1.701 2013/11/29 01:16:04 tom Exp $
+-- $LynxId: CHANGES,v 1.703 2013/12/01 01:33:06 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2013-11-30 (2.8.8pre.2)
+* omit request for admin-access in NullSoft installer, since lynx could be
+  installed in user's directory -TD
+* change Windows default for LYNX_LSS_FILE to not use a directory-path -TD
+
 2013-11-28 (2.8.8pre.1)
 2013-11-28 (2.8.8dev.17)
 * revise/update counts in README.metrics, using a script replacing a manual
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index 8d4c0885..4f847dfe 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.8.8dev.17) unstable; urgency=low
+lynx-dev (2.8.8pre.2) unstable; urgency=low
 
-  * changes for dev.17
+  * maintenance updates
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 29 Sep 2013 19:33:16 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 30 Nov 2013 20:12:55 -0500
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index bbacb3ec..cb324403 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.9 2013/10/17 00:52:26 tom Exp $

+; $LynxId: lynx.nsi,v 1.11 2013/12/01 01:31:22 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 "1017"

-!define VERSION_PATCH "dev.17"

+!define VERSION_LEVEL "2002"

+!define VERSION_PATCH "pre.2"

 

 !define SUBKEY "Lynx"

 

@@ -23,8 +23,6 @@ InstallDir "$PROGRAMFILES\${INSTALL}"
 InstallDirRegKey HKLM "Software\${SUBKEY}" "$INSTDIR\bin"

 OutFile "NSIS-Output\${APPNAME}-${VERSION}-setup.exe"

 

-RequestExecutionLevel highest

-

 CRCCheck on

 SetCompressor /SOLID lzma

 

diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 33e3aafb..bb1fc43b 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.19 2013/10/24 00:21:20 tom Exp $
+# $LynxId: lynx.spec,v 1.20 2013/12/01 01:12:55 tom Exp $
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.8
-Release: dev.17
+Release: pre.2
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
new file mode 100644
index 00000000..850c38f0
--- /dev/null
+++ b/PACKAGE/version.iss
@@ -0,0 +1,13 @@
+; version used for Inno Setup files.

+

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

+#define LYNX_VERSION "2.8.8pre.2"
+

+; most-recent full release and target

+#define LYNX_RELEASE "2.8.7"

+#define LYNX_TARGETS "2.8.8"

+

+#define MyAppName "Lynx - web browser"

+#define MyAppPublisher "Thomas E Dickey"

+#define MyAppURL "http://lynx.isc.org"

+#define MyAppVerName "Lynx " + LYNX_VERSION

diff --git a/configure.in b/configure.in
index 368fc273..ca6237dc 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.253 2013/11/29 00:52:56 tom Exp $
+dnl $LynxId: configure.in,v 1.254 2013/12/01 01:12:55 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.8pre.1)
+AC_REVISION(2.8.8pre.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.8pre.1
+VERSION=2.8.8pre.2
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
diff --git a/lynx.cfg b/lynx.cfg
index f81d79c2..1e9112a0 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,10 +1,10 @@
-# $LynxId: lynx.cfg,v 1.231 2013/11/29 00:52:56 tom Exp $
+# $LynxId: lynx.cfg,v 1.232 2013/12/01 01:12:55 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.8pre.1"
+#PRCS LYNX_VERSION "2.8.8pre.2"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
 #PRCS LYNX_DATE "Thu, 28 Nov 2013 17:17:12 -0800"
diff --git a/makefile.in b/makefile.in
index 50b816df..c9519b8a 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.133 2013/11/29 00:52:56 tom Exp $
+# $LynxId: makefile.in,v 1.134 2013/12/01 01:12:55 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -38,7 +38,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.8pre.1
+LYNX_VERSION	= 2.8.8pre.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/LYIcon.rc b/src/LYIcon.rc
index 6fce1ec5..23cf6617 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.4 2013/10/14 23:34:13 tom Exp $
+// $LynxId: LYIcon.rc,v 1.5 2013/12/01 01:12:55 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,8,8,1017
-PRODUCTVERSION 2,8,8,1017
+FILEVERSION    2,8,8,2002
+PRODUCTVERSION 2,8,8,2002
 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.1017"
+      VALUE "FileVersion",      "2.8.8.2002"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "©1997-2013 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.8.8.1017"
+      VALUE "ProductVersion",   "2.8.8.2002"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/userdefs.h b/userdefs.h
index 67a8833e..254188c1 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.280 2013/11/29 00:52:56 tom Exp $
+ * $LynxId: userdefs.h,v 1.281 2013/12/01 01:12:55 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -457,7 +457,11 @@
  * -lss command line switch will override these definitions.
  */
 #ifndef LYNX_LSS_FILE
+#ifdef DOSPATH
+#define LYNX_LSS_FILE "lynx.lss"
+#else
 #define LYNX_LSS_FILE "/usr/local/lib/lynx.lss"
+#endif
 #endif /* LYNX_LSS_FILE */
 
 #endif /* VMS OR UNIX */
@@ -1438,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.8pre.1"
+#define LYNX_VERSION "2.8.8pre.2"
 #define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */