[project @ 2002-11-17 19:36:52 by cjwatson]

Remove lynx-cfg, and use 'lynx -cfg=/dev/null' instead.

diff --git a/Makefile b/Makefile
index ae3dacf5d0812a004588bee7a1141c78da0fb5ff..ff5dc1debc7b2f912a6750d3ad4b7d23ade42b15 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,6 @@ $(var_dir)/spool/db-h $(scripts_dir) $(examples_dir) $(man8_dir); \
 
        # install the HTML pages etc
        $(foreach html, $(htmls_in), $(install_data) $(html) $(etc_dir)/html;)
-       $(install_data) html/lynx-cfg $(etc_dir)/html/lynx-cfg
        $(install_data) html/htaccess $(var_dir)/www/db/.htaccess
 
        # install the CGIs

diff --git a/build b/build
index 9ebfe4d0a0c84b7163f70efffe15eccea45c7645..c8342b5455d56789e9f118148a0881ed0aaa3981 100755 (executable)
--- a/build
+++ b/build
@@ -19,7 +19,7 @@ txtconvert () {
        rm -f html/txt/$dst.html html/txt/$dst.out
        perl -ne 'print unless m/^Other pages:$/ .. /^\<hr\>/' \
                html/$src.out >html/txt/$dst.html
-       HOME=/dev/null lynx -nolist -dump -cfg=html/lynx-cfg \
+       HOME=/dev/null lynx -nolist -dump -cfg=/dev/null \
                file://localhost/$cwd/html/txt/$dst.html >html/txt/$dst.out
        rm html/txt/$dst.html
 }

diff --git a/debian/changelog b/debian/changelog
index dac1dee804c9b80d5ec568a34e0cab8cc560bd6b..5fa8cd5566476d246519233f74f13d9650b43363 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -84,6 +84,7 @@ debbugs (2.4) experimental; urgency=low
   * Fix a few typos, closes: #146745, #152751.
   * Update the copyright file with the current list of maintainers and a
     pointer to ViewCVS.
+  * Remove lynx-cfg, and use 'lynx -cfg=/dev/null' instead. [Colin]
   * Various other things, not worth mentioning here.
 
  -- Colin Watson <cjwatson@debian.org>  Sun, 17 Nov 2002 17:54:49 +0000

diff --git a/debian/conffiles b/debian/conffiles
index 5081106cc17360758f126a28faca4f99be974783..e3ce09be7ab8de599087e514e3eeeacfa13c42fb 100644 (file)
--- a/debian/conffiles
+++ b/debian/conffiles
@@ -2,7 +2,6 @@
 /etc/debbugs/html/Developer.html.in
 /etc/debbugs/html/Reporting.html.in
 /etc/debbugs/html/index.html.in
-/etc/debbugs/html/lynx-cfg
 /etc/debbugs/html/server-control.html.in
 /etc/debbugs/html/server-refcard.html.in
 /etc/debbugs/html/server-request.html.in

diff --git a/debian/debbugsconfig b/debian/debbugsconfig
index 7959ce9113a3d7455524985b46ac51c7ce0a3a0e..135df92c869e98f657f0f38c35356d9ba3f6192d 100755 (executable)
--- a/debian/debbugsconfig
+++ b/debian/debbugsconfig
@@ -97,7 +97,7 @@ sub writefiles {
       die "\nunable to write $gDocDir/$text.txt\n";
     system ("rm -rf /tmp/.links/");
   } elsif (-x "/usr/bin/lynx") {
-    system ("lynx -nolist -dump -cfg=$gConfigDir/html/lynx-cfg $gDocDir/$text.html > $gDocDir/$text.txt") == 0 ||
+    system ("lynx -nolist -dump -cfg=/dev/null $gDocDir/$text.html > $gDocDir/$text.txt") == 0 ||
       die "\nunable to write $gDocDir/$text.txt\n";
   } else {
     print "unable to write text versions of the HTMLs!";

diff --git a/html/lynx-cfg b/html/lynx-cfg
deleted file mode 100644 (file)
index 792d600..0000000
--- a/html/lynx-cfg
+++ /dev/null
@@ -1 +0,0 @@
-#