diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | COPYING | 39 | ||||
| -rw-r--r-- | COPYING.asc | 8 | ||||
| -rw-r--r-- | PACKAGE/debian/copyright | 29 | ||||
| -rw-r--r-- | PACKAGE/debian/lynx-dev.lintian-overrides | 9 | ||||
| -rw-r--r-- | PACKAGE/debian/menu | 2 | ||||
| -rwxr-xr-x | PACKAGE/debian/rules | 8 | ||||
| -rw-r--r-- | WWW/Library/vms/COPYING.LIB | 20 |
8 files changed, 57 insertions, 63 deletions
diff --git a/CHANGES b/CHANGES index ce42752b..9a1d25a6 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,10 @@ --- $LynxId: CHANGES,v 1.897 2017/05/12 03:37:02 tom Exp $ +-- $LynxId: CHANGES,v 1.898 2017/06/21 21:05:32 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== -2017-05-11 (2.8.9dev.15) +2017-06-21 (2.8.9dev.15) +* fix lintian warnings in ".deb" test-package -TD * build-fix for PGI compilers, e.g., symbol conflicts -TD * update eo.po from http://translationproject.org/latest/lynx diff --git a/COPYING b/COPYING index ccbfd0d9..01b6151a 100644 --- a/COPYING +++ b/COPYING @@ -1,14 +1,14 @@ See the COPYHEADER file which gives copyright information for Lynx. ------------------------------------------------------------------------------ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -17,7 +17,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -57,8 +57,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -112,7 +112,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -170,7 +170,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -227,7 +227,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -257,7 +257,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -279,9 +279,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -305,10 +305,9 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. @@ -338,5 +337,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/COPYING.asc b/COPYING.asc index 4c107899..d95eb5c8 100644 --- a/COPYING.asc +++ b/COPYING.asc @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v1.4.12 (GNU/Linux) Comment: See http://invisible-island.net/public/public.html for info -iD8DBQBFJtJ/cCNT4PfkjtsRArLIAJ4gKHdikok6gCcKfizm9T3HdEEP+wCfUj+N -9sC1gLEOekFUgKVqYsSTP+w= -=aDfb +iEYEABECAAYFAllK95IACgkQcCNT4PfkjtvvMQCfTRukMJdeFcMrh90cS7VdvjzF +etwAn1ZyAO6hHcIqxdbZpsu0ciSOmuYe +=2fkf -----END PGP SIGNATURE----- diff --git a/PACKAGE/debian/copyright b/PACKAGE/debian/copyright index 5eb37dfe..7832befd 100644 --- a/PACKAGE/debian/copyright +++ b/PACKAGE/debian/copyright @@ -4,6 +4,9 @@ Current maintainer: Thomas Dickey <dickey@invisible-island.net> ------------------------------------------------------------------------------- +Copyright 1997-2016,2017 Thomas E. Dickey +Copyright (C) 1995 University of Kansas. + Most of the content of the lynx release (and corresponding copyright) is the work of developers on the lynx-dev mailing list, who have agreed to distribute their work under the terms and conditions of the GNU General @@ -19,30 +22,6 @@ or to the maintainer (Thomas E. Dickey): dickey@invisible-island.net -For reference, below is the original copyright notice for Lynx (2.4.2). ------------------------------------------------------------------------------- -/* Copyright (C) 1995 University of Kansas. - - This file is part of Lynx, a text-based WWW browser. - - Lynx is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. - - Lynx is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public - License for more details. - - You should have received a copy of the GNU General Public License - along with Lynx; see the file COPYING. If not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. - - Any licensing or usage questions should be directed to Michael - Grobe <grobe@ukans.edu>. -*/ - ------------------------------------------------------------------------------- Files: aclocal.m4 @@ -101,7 +80,7 @@ License: other-BSD shared with many OS's install programs. Files: debian/* -Copyright: 2010-2015,2016 Thomas E. Dickey +Copyright: 2010-2016,2017 Thomas E. Dickey License: other-BSD Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, diff --git a/PACKAGE/debian/lynx-dev.lintian-overrides b/PACKAGE/debian/lynx-dev.lintian-overrides new file mode 100644 index 00000000..280b562d --- /dev/null +++ b/PACKAGE/debian/lynx-dev.lintian-overrides @@ -0,0 +1,9 @@ +# Lynx's version-numbering is not understood by lintian, though legal. +lynx-dev: rc-version-greater-than-expected-version 2.8.9dev.15 > 2.8.9 (consider using 2.8.9~dev.15) + +# This is intentional because it is referenced from the documentation. +lynx-dev: extra-license-file usr/share/doc/lynx-dev/COPYING + +# These are intentional, part of the sample files: +lynx-dev: zero-byte-file-in-doc-directory usr/share/doc/lynx-dev/test/X +lynx-dev: zero-byte-file-in-doc-directory usr/share/doc/lynx-dev/test/nobody diff --git a/PACKAGE/debian/menu b/PACKAGE/debian/menu index 1df6ef8d..6421345c 100644 --- a/PACKAGE/debian/menu +++ b/PACKAGE/debian/menu @@ -1,2 +1,2 @@ ?package(lynx-dev):needs="text" section="Applications/Network/Web Browsing"\ - title="Lynx-dev" command="lynx" + title="Lynx-dev" command="lynx-dev" diff --git a/PACKAGE/debian/rules b/PACKAGE/debian/rules index c9a22268..99695b19 100755 --- a/PACKAGE/debian/rules +++ b/PACKAGE/debian/rules @@ -22,7 +22,9 @@ helpdir := $(docdir)/help_dir DSTDIR := $(CURDIR)/debian/$(PACKAGE) DOCDIR := $(DSTDIR)$(docdir) -CFLAGS = +CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS := $(shell dpkg-buildflags --get CFLAGS) +LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) DEBOP=--enable-debug @@ -48,6 +50,9 @@ configure: configure-stamp configure-stamp: dh_testdir + CPPFLAGS="$(CPPFLAGS)" \ + CFLAGS="$(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" \ env cf_cv_SYSTEM_MAIL=/usr/sbin/sendmail \ COMPRESS=/usr/bin/compress \ BZIP2=/bin/bzip2 \ @@ -163,6 +168,7 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot + dh_lintian dh_installdebconf dh_installdocs dh_installmenu diff --git a/WWW/Library/vms/COPYING.LIB b/WWW/Library/vms/COPYING.LIB index eb685a5e..5bc8fb2c 100644 --- a/WWW/Library/vms/COPYING.LIB +++ b/WWW/Library/vms/COPYING.LIB @@ -1,15 +1,15 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. [This is the first released version of the library GPL. It is numbered 2 because it goes with version 2 of the ordinary GPL.] - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -99,7 +99,7 @@ works together with the library. Note that it is possible for a library to be covered by the ordinary General Public License rather than by this special one. - GNU LIBRARY GENERAL PUBLIC LICENSE + GNU LIBRARY GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library which @@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. @@ -434,9 +434,9 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Libraries + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that @@ -463,8 +463,8 @@ convey the exclusion of warranty; and each file should have at least the Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. |