snapshot of project "lynx", label v2-8-9dev_14c

4 files changed, 21 insertions, 27 deletions

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