about summary refs log tree commit diff stats
path: root/PACKAGE
diff options
context:
space:
mode:
Diffstat (limited to 'PACKAGE')
-rw-r--r--PACKAGE/debian/changelog6
-rw-r--r--PACKAGE/debian/lynx-dev.lintian-overrides3
-rwxr-xr-xPACKAGE/debian/rules3
-rw-r--r--PACKAGE/lynx-newssl.iss6
-rw-r--r--PACKAGE/lynx-oldssl.iss7
-rw-r--r--PACKAGE/lynx.iss11
-rw-r--r--PACKAGE/lynx.spec11
-rw-r--r--PACKAGE/version.iss7
8 files changed, 23 insertions, 31 deletions
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index 8d7eaace..048e3cfd 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.9.0dev.13) unstable; urgency=low
+lynx-dev (2.9.0) unstable; urgency=high
 
-  * maintenance updates
+  * new release
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 23 Jan 2023 16:39:23 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 14 Jan 2024 17:15:53 -0500
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/debian/lynx-dev.lintian-overrides b/PACKAGE/debian/lynx-dev.lintian-overrides
index f19330da..9b0aa406 100644
--- a/PACKAGE/debian/lynx-dev.lintian-overrides
+++ b/PACKAGE/debian/lynx-dev.lintian-overrides
@@ -1,6 +1,3 @@
-# Lynx's version-numbering is not understood by lintian, though legal.
-lynx-dev: rc-version-greater-than-expected-version
-
 # This is intentional because it is referenced from the documentation.
 lynx-dev: extra-license-file usr/share/doc/lynx-dev/COPYING
 
diff --git a/PACKAGE/debian/rules b/PACKAGE/debian/rules
index 6b48b9fe..908ed5e0 100755
--- a/PACKAGE/debian/rules
+++ b/PACKAGE/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $LynxId: rules,v 1.18 2023/05/26 22:51:25 tom Exp $
+# $LynxId: rules,v 1.19 2024/01/15 01:16:07 tom Exp $
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -67,6 +67,7 @@ configure-stamp:
 		--sysconfdir=/etc/$(PACKAGE) \
 		--with-cfg-path=/etc/$(PACKAGE):$(docdir)/samples \
 		--localstatedir=/var \
+		--disable-rpath-hack \
 		--libdir=/etc/$(PACKAGE) \
 		--enable-8bit-toupper \
 		--enable-cgi-links \
diff --git a/PACKAGE/lynx-newssl.iss b/PACKAGE/lynx-newssl.iss
index c6ebc979..fb572862 100644
--- a/PACKAGE/lynx-newssl.iss
+++ b/PACKAGE/lynx-newssl.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx-newssl.iss,v 1.6 2022/12/29 00:38:07 tom Exp $

+; $LynxId: lynx-newssl.iss,v 1.7 2024/01/15 21:35:29 tom Exp $

 ;

 ; This is an installer for Lynx built with "new" OpenSSL (1.1.x).

 ;

@@ -6,8 +6,8 @@
 ; data which is used by the installer (see "lynx.lss" for details).

 

 #define NoScreenDll

-#define SslGlob1      "'libssl-1*.dll'"

-#define SslGlob2      "'libcrypto-1*.dll'"

+#define SslGlob1      "'libssl-3*.dll'"

+#define SslGlob2      "'libcrypto-3*.dll'"

 #define SetupBaseName "lynx-newssl"

 #define SourceExeName "lynx-newssl.exe"

 

diff --git a/PACKAGE/lynx-oldssl.iss b/PACKAGE/lynx-oldssl.iss
index afe026a2..92575d2a 100644
--- a/PACKAGE/lynx-oldssl.iss
+++ b/PACKAGE/lynx-oldssl.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx-oldssl.iss,v 1.5 2022/12/28 22:37:15 tom Exp $

+; $LynxId: lynx-oldssl.iss,v 1.6 2024/01/15 21:35:19 tom Exp $

 ;

 ; This is an installer for Lynx built with "old" OpenSSL (before 1.1.x).

 ;

@@ -6,10 +6,9 @@
 ; data which is used by the installer (see "lynx.lss" for details).

 

 #define NoScreenDll

-#define SslGlob1      "'ssleay32.dll'"

-#define SslGlob2      "'libeay32.dll'"

+#define SslGlob1      "'libssl-1*.dll'"

+#define SslGlob2      "'libcrypto-1*.dll'"

 #define SetupBaseName "lynx-oldssl"

 #define SourceExeName "lynx-oldssl.exe"

-#define RuntimeBundle "'msvcr120.dll'"

 

 #include "lynx.iss"

diff --git a/PACKAGE/lynx.iss b/PACKAGE/lynx.iss
index bf7550d5..23530670 100644
--- a/PACKAGE/lynx.iss
+++ b/PACKAGE/lynx.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx.iss,v 1.39 2024/01/07 11:13:00 tom Exp $

+; $LynxId: lynx.iss,v 1.41 2024/01/15 23:28:41 tom Exp $

 ; vile:ts=4 sw=4 notabinsert fk=8bit

 ;

 ; This is the BASE script for different flavors of the installer for Lynx.

@@ -88,10 +88,7 @@
 AppName={#MyAppName}

 #emit 'AppVersion=' + LYNX_VERSION

 #emit 'VersionInfoDescription=Setup for "' + MyAppName + '"'

-#define LYNX_TARGET0 StringChange(LYNX_VERSION,LYNX_RELEASE + "rel.",LYNX_RELEASE + ".00")

-#define LYNX_TARGET1 StringChange(LYNX_TARGET0,LYNX_TARGETS + "dev.",LYNX_RELEASE + ".10")

-#define LYNX_TARGET2 StringChange(LYNX_TARGET1,LYNX_TARGETS + "pre.",LYNX_RELEASE + ".20")

-#emit 'VersionInfoVersion=' + LYNX_TARGET1

+#emit 'VersionInfoVersion=' + LYNX_VERSION

 AppVerName={#MyAppVerName}

 AppPublisher={#MyAppPublisher}

 AppCopyright=© 1997-2023,2024, Thomas E. Dickey

@@ -141,8 +138,8 @@ Name: "{app}\icon"
 #emit 'Source: "' + DllsSrcDir + '\' + BzipExeName + '"; DestDir: "{app}"; DestName: ' + BzipExeName + '; Flags: ignoreversion'

 #emit 'Source: "' + DllsSrcDir + '\' + GzipExeName + '"; DestDir: "{app}"; DestName: ' + GzipExeName + '; Flags: ignoreversion'

 #emit 'Source: "' + DocsSrcDir + '\*.*"; DestDir: "{app}\doc"; Flags: '

-#emit 'Source: "' + DocsSrcDir + '\..\samples\*.*"; DestDir: "{app}\doc\samples"; Flags: '

-#emit 'Source: "' + DocsSrcDir + '\..\test\*.*"; DestDir: "{app}\doc\test"; Flags: '

+#emit 'Source: "' + DocsSrcDir + '\samples\*.*"; DestDir: "{app}\doc\samples"; Flags: '

+#emit 'Source: "' + DocsSrcDir + '\test\*.*"; DestDir: "{app}\doc\test"; Flags: '

 #emit 'Source: "' + HelpSrcDir + '\*.*"; DestDir: "{app}\help"; Flags: '

 #emit 'Source: "' + HelpSrcDir + '\keystrokes\*.*"; DestDir: "{app}\help\keystrokes"; Flags: '

 

diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index bb3ac80e..a11a9a02 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,11 +1,11 @@
-# $LynxId: lynx.spec,v 1.70 2024/01/07 18:30:52 tom Exp $
+# $LynxId: lynx.spec,v 1.72 2024/01/15 11:47:26 tom Exp $
 Summary: A text-based Web browser
 Name: lynx-dev
 Version: 2.9.0
-Release: dev.13
+Release: 1
 License: GPLv2
 Group: Applications/Internet
-Source: lynx%{version}%{release}.tgz
+Source: lynx%{version}.tgz
 URL: https://lynx.invisible-island.net
 Provides: webclient >= 0.0
 Provides: text-www-browser >= 0.0
@@ -34,7 +34,7 @@ HTTP, FTP, WAIS, and NNTP servers.
 %prep
 
 %define debug_package %{nil}
-%setup -q -n lynx%{version}%{release}
+%setup -q -n lynx%{version}
 
 %build
 %configure \
@@ -111,6 +111,9 @@ strip $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %changelog
 
+* Mon Jan 15 2024 Thomas E. Dickey
+- simplified tarball name
+
 * Sun Jan 07 2024 Thomas E. Dickey
 - use rpm #find_lang macro for configuring language files
 - use noreplace flag for *.cfg and *.lss config files
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index ccd47e45..e3fe613b 100644
--- a/PACKAGE/version.iss
+++ b/PACKAGE/version.iss
@@ -1,11 +1,6 @@
 ; version used for Inno Setup files.

 

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

-#define LYNX_VERSION "2.9.0dev.13"

-

-; most-recent full release and target

-#define LYNX_RELEASE "2.9.0"

-#define LYNX_TARGETS "2.9.0"

+#define LYNX_VERSION "2.9.0"

 

 #define MyAppProg "Lynx"

 #define MyAppName "Lynx - web browser"