tags 369386 patch
tags 481774 patch
tags 481778 patch
tags 474928 patch
tags 474926 patch
thanks

Hello,

I have prepared a NMU/patch for lynx-cur fixing the rc-issues wit
respect to configuration file handling and replacement of lynx:

 lynx-cur (2.8.7dev9-1.1) unstable; urgency=low
 .
   * Non-maintainer upload.
   * Remove local.cfg on purge instead of remove. Closes: #474928
   * Revamp handling of debconf managed configuration file local.cfg as
     described in debconf-devel(7).
     Closes: #474926
   * lynx-cur-wrapper: Simply ship the /etc/lynx-cur/lynx-??.cfg as dpkg
     conffiles instead of generating (and removing) them in the
     maintainerscripts. Closes: #481778,#481774
   * Add a dummy package lynx, which switches from lynx to lynx-cur. The old
     stable codebase (lynx) is deadm upstream suggest using the lynx-cur
     releases. Closes: #369386

Interdiff to 2.8.7dev9-1 is attached, complete packages on
<http://www.bebt.de/debian/lynx-cur/>.

Some explanations:
==================
* Remove local.cfg on purge instead of remove. Closes: #474928
Trivial change.

   * Revamp handling of debconf managed configuration file local.cfg as
     described in debconf-devel(7).
There is a extensive example on how to do this correctly in
debconf-devel(7), the suggested change follows the example quite
closely. Now direct changes (editor) of local.cfg are not overwritten
but even fed back into debconf.

   * lynx-cur-wrapper: Simply ship the /etc/lynx-cur/lynx-??.cfg as
     dpkg conffiles instead of generating (and removing) them in the
     maintainerscripts. Closes: #481778,#481774

This was a straightforward change. In my comments to 481778 I was wrong.

   * Add a dummy package lynx, which switches from lynx to lynx-cur. The old
     stable codebase (lynx) is deadm upstream suggest using the lynx-cur
     releases. Closes: #369386

We end up with a dummy package lynx that depends on lynx-cur. (I think
we should keep it permanently.) It should work correctly, lynx
configuration files are handled as good as possible on upgrades:

 - if they are not modified locally thy are simply removed.
 - Otherwise they are moved to /etc/lynx-cur/ *unless* the config
   files in _that_ directory already exist.

Uploading considerations:
=========================

Imho lynx 2.8.6-2.1 should propagate to testing before uploading this
change. (Should happen on Thursday). I am willing to NMU lynx-cur with
this patch, since people won't be too happy with lynx without SSL
suport in lenny.

cu andreas

-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
diff -u lynx-cur-2.8.7dev9/debian/changelog lynx-cur-2.8.7dev9/debian/changelog
--- lynx-cur-2.8.7dev9/debian/changelog
+++ lynx-cur-2.8.7dev9/debian/changelog
@@ -1,3 +1,19 @@
+lynx-cur (2.8.7dev9-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Remove local.cfg on purge instead of remove. Closes: #474928
+  * Revamp handling of debconf managed configuration file local.cfg as
+    described in debconf-devel(7).
+    Closes: #474926
+  * lynx-cur-wrapper: Simply ship the /etc/lynx-cur/lynx-??.cfg as dpkg
+    conffiles instead of generating (and removing) them in the
+    maintainerscripts. Closes: #481778,#481774
+  * Add a dummy package lynx, which switches from lynx to lynx-cur. The old
+    stable codebase (lynx) is deadm upstream suggest using the lynx-cur
+    releases. Closes: #369386
+
+ -- Andreas Metzler <[EMAIL PROTECTED]>  Sat, 28 Jun 2008 13:06:25 +0200
+
 lynx-cur (2.8.7dev9-1) unstable; urgency=low
 
   * New Upstream Release.
diff -u lynx-cur-2.8.7dev9/debian/config lynx-cur-2.8.7dev9/debian/config
--- lynx-cur-2.8.7dev9/debian/config
+++ lynx-cur-2.8.7dev9/debian/config
@@ -1,5 +1,8 @@
 #!/bin/sh -e
 
+CONFIGFILE=/etc/lynx-cur/local.cfg
+
+
 # Use debconf.
 . /usr/share/debconf/confmodule
 
@@ -7,13 +10,23 @@
 db_version
 db_title 'Lynx-cur Configuration'
 
-# Main
-db_fget lynx-cur/defaulturl seen
-if [ "$RET" = false ]; then
-    if [ ! -z "`dnsdomainname`" ]; then
-	db_set lynx-cur/defaulturl "http://www.`dnsdomainname`/";
-    else
-	db_reset lynx-cur/defaulturl
+if [ -e $CONFIGFILE ]; then
+    # parse configfile
+    if grep -q '^STARTFILE:' $CONFIGFILE ; then
+        defaulturl=`sed -n '/^STARTFILE:/{s/^STARTFILE://p}' < $CONFIGFILE`
+        # Store values from config file into debconf_db
+        db_set lynx-cur/defaulturl "$defaulturl"
+    fi
+else
+    #set a sane default value if no preconfiguration has yet happened
+    # (either by preseeding debconf or by pre-generating local.cfg
+    db_fget lynx-cur/defaulturl seen
+    if [ "$RET" = false ]; then
+        if [ ! -z "`dnsdomainname`" ]; then
+            db_set lynx-cur/defaulturl "http://www.`dnsdomainname`/";
+        else
+            db_reset lynx-cur/defaulturl
+        fi
     fi
 fi
 
@@ -45,0 +59,2 @@
+
+# vim:tabstop=4:expandtab:shiftwidth=4
diff -u lynx-cur-2.8.7dev9/debian/control lynx-cur-2.8.7dev9/debian/control
--- lynx-cur-2.8.7dev9/debian/control
+++ lynx-cur-2.8.7dev9/debian/control
@@ -9,7 +9,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: lynx, www-browser, news-reader
-Conflicts: lynx, lynx-ssl
+Conflicts: lynx (<< 2.8.7dev9-1.1), lynx-ssl
 Recommends: mime-support
 Suggests: lynx-cur-wrapper
 Description: Text-mode WWW Browser with NLS support (development version)
@@ -32,0 +33,9 @@
+
+Package: lynx
+Architecture: all
+Depends: lynx-cur (>= ${source:Version})
+Conflicts: lynx-ssl
+Replaces: lynx-ssl
+Description: Text-mode WWW Browser (transitional package)
+ This is a transitional package and can safely be removed; see the
+ lynx-cur package instead.
reverted:
--- lynx-cur-2.8.7dev9/debian/lynx
+++ lynx-cur-2.8.7dev9.orig/debian/lynx
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-cnfdir=/etc/lynx-cur
-binary=lynx.cur
-### default settings
-OPT=""
-
-# nl=dutch no=norwegian pl=polish pt=portuguese sl=slovenia sv=swedish
-# chinese=zh_CN.GB2312 and/or zh_TW.Big5 korean=ko_KR.eucKR
-
-case $LANG in
-	*.utf-8|*.UTF-8)   flg=utf   ;;
-	cs*) flg=cs ;;
-	da*) flg=da ;;
-	de*) flg=de ;;
-	es*) flg=es ;;
-	fr*) flg=fr ;;
-	it*) flg=it ;;
-	ja*) flg=ja ;;
-	ko*) flg=ko ;;
-	nl*) flg=nl ;;
-	no*) flg=no ;;
-	pl*) flg=pl ;;
-	pt*) flg=pt ;;
-	ru*) flg=ru ;;
-	sl*) flg=sl ;;
-	sv*) flg=sv ;;
-	zh*) flg=zh ;;
-	*)   flg=   ;;
-esac
-
-if [ X$LYNX_CFG = X ] ; then
- if [ X$flg = Xja ] ; then
-###
-### Japanese environment
-###
-  if [ X$DISPLAY = X ] ; then
-############ non-X #############
-    if [ X$TERM = Xkon -o X$TERM = Xjfbterm ] ; then
-### kon or jfbterm?
-      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg.blck ${1+"$@"}
-    elif [ X$TERM = Xlinux ] ; then
-### linux console ?
-      export LANG=C
-      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg ${1+"$@"}
-    else
-### unsure, but ...
-      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg.dflt ${1+"$@"}
-    fi
-  else
-########## X Window ############
-    if [ X$TERM = Xkterm ] ; then
-      if [ X$COLORTERM = X -o X$COLORTERM = Xrxvt-xpm -o X$COLORTERM = Xrxvt ]
-### kterm or non-package krxvt ?
-      then
-        exec /usr/bin/${binary} -cfg=${cnfdir}/lynx-ja.cfg ${1+"$@"}
-# If reverse video
-#        exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg.blck ${1+"$@"}
-      fi
-    elif [ X$COLORTERM = Xrxvt-xpm -o X$COLORTERM = Xgnome-terminal ] ; then
-### krxvt or gnome-terminal?
-      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx-ja.cfg ${1+"$@"}
-    elif [ X$COLORTERM = Xrxvt -o X$TERM = Xxterm-debian -o X$TERM = Xxterm ]
-    then
-### rxvt or xterm ?
-      export LANG=C
-      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg ${1+"$@"}
-    else
-### unsure, but ...
-      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg.dflt ${1+"$@"}
-    fi
-  fi
-###
-### Unicode ?
- elif [ X$flg = Xutf ]; then
-    if [ X$TERM = Xmlterm ]
-    then
-### mlterm ?
-      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx-utf.cfg ${1+"$@"}
-    elif [ X$TERM = Xxterm ]
-    then
-### uxterm ?
-      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx-utf.cfg ${1+"$@"}
-    else
-### unsure, but ...
-      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg.dflt ${1+"$@"}
-    fi
-###
-### non-Japanese environment ?
-###
- else
-  if [ X$flg != X ] ; then
-    exec /usr/bin/${binary} -cfg=${cnfdir}/lynx-${flg}.cfg ${1+"$@"}
-  else
-    exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg ${1+"$@"}
-  fi
- fi
-else
-    exec /usr/bin/${binary} ${1+"$@"}
-fi
diff -u lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper.postinst lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper.postinst
--- lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper.postinst
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper.postinst
@@ -17,57 +17,6 @@
     --slave /usr/share/man/man1/lynx.1.gz lynx.1.gz \
        /usr/share/man/man1/lynx-cur.1.gz
 
-# removed po in 2.8.5; es it ko no pl pt zh
-# creating misc cfg files
-for i in cs da de en es fr it ja ko nl no pl pt pt_BR ru sl sv zh utf
-    do rm -f ${cnfdir}/lynx-${i}.cfg
-done
-rm -f ${cnfdir}/lynx.cfg.blck ${cnfdir}/lynx.cfg.dflt
-
-#1 ja
-sed -n -e '/^CHARACTER_SET:/p' -e '/^PREFERRED_LANGUAGE:/p' \
-    < ${cnfdir}/lynx.cfg | \
-    sed -e 's/iso-8859-1/euc-jp/' -e 's/:en/:ja,en;q=0.9,*;q=0.5/' \
-    > ${cnfdir}/lynx-ja_$$ && \
-sed -e '1i\
-# Include all the common options:\
-INCLUDE:/etc/lynx-cur/lynx.cfg\
-# Now override a couple:' < ${cnfdir}/lynx-ja_$$ > ${cnfdir}/lynx-ja.cfg && \
-rm -f ${cnfdir}/lynx-ja_$$
-#2 
-for j in cs da de es fr it nl no pl pt ru sl sv
-do sed -e "s/ja,en/${j},en/" -e 's/euc-jp/iso-8859-1/' \
-    < ${cnfdir}/lynx-ja.cfg > ${cnfdir}/lynx-${j}.cfg
-done
-#3 zh(chinese)
-sed -e 's/ja,en/zh,en/' -e 's/euc-jp/big5/' ${cnfdir}/lynx-ja.cfg > \
-    ${cnfdir}/lynx-zh.cfg
-#4 ko(korean)
-sed -e 's/ja,en/ko,en/' -e 's/euc-jp/euc-kr/' ${cnfdir}/lynx-ja.cfg > \
-    ${cnfdir}/lynx-ko.cfg
-#5 utf-8
-sed -e 's/ja,en/utf-8,en/' -e 's/euc-jp/utf-8/' ${cnfdir}/lynx-ja.cfg > \
-    ${cnfdir}/lynx-utf.cfg
-#6 reverse video
-sed -e '$a\
-COLOR:0:lightgray:black \
-COLOR:1:blue:black \
-COLOR:2:yellow:blue \
-COLOR:3:green:black \
-COLOR:4:magenta:black \
-COLOR:5:blue:black \
-COLOR:6:red:black \
-COLOR:7:magenta:cyan' ${cnfdir}/lynx-ja.cfg > ${cnfdir}/lynx.cfg.blck
-#7 default ?
-sed -e '$a\
-COLOR:0:default:default \
-COLOR:1:blue:default \
-COLOR:2:yellow:blue \
-COLOR:3:green:default \
-COLOR:4:magenta:default \
-COLOR:5:blue:default \
-COLOR:6:red:default \
-COLOR:7:magenta:cyan' ${cnfdir}/lynx-ja.cfg > ${cnfdir}/lynx.cfg.dflt
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
reverted:
--- lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper.postrm
+++ lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper.postrm
@@ -1,18 +0,0 @@
-#! /bin/sh
-# postrm script for lynx-cur-wrapper
-pack=lynx-cur
-cnfdir=/etc/${pack}
-
-set -e
-
-if [ "$1" = "remove" ]; then
-    for i in cs da de en es fr it ja ko nl no pl pt pt_BR ru sl sv zh utf
-    do rm -f ${cnfdir}/lynx-${i}.cfg
-    done
-    rm -f ${cnfdir}/lynx.cfg.blck ${cnfdir}/lynx.cfg.dflt
-fi
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
diff -u lynx-cur-2.8.7dev9/debian/postinst lynx-cur-2.8.7dev9/debian/postinst
--- lynx-cur-2.8.7dev9/debian/postinst
+++ lynx-cur-2.8.7dev9/debian/postinst
@@ -2,6 +2,7 @@
 # postinst script for lynx-beta
 pack=lynx-cur
 cnfdir=/etc/${pack}
+CONFIGFILE=${cnfdir}/local.cfg
 
 set -e
 
@@ -16,37 +17,39 @@
     --slave /usr/share/man/man1/lynx.1.gz lynx.1.gz \
        /usr/share/man/man1/lynx.cur.1.gz
 
-# First, setup local.cfg
-if [ ! -f ${cnfdir}/local.cfg ] ; then
-cp /usr/share/doc/${pack}/local.cfg.in ${cnfdir}/local.cfg
-fi
-
 # Use debconf.
 . /usr/share/debconf/confmodule
 
-LINE1=`fgrep -n "STARTFILE:Not-Configured-Yet" \
-    ${cnfdir}/local.cfg | awk -F: '{print $1;}'`
-if [ ! -z "$LINE1" ]; then
-    db_get ${pack}/defaulturl
-    URL=`echo "$RET" | sed -e 's|:|\\\\:|g'`
-    sed -e "$LINE1 s:Not-Configured-Yet:$URL:" ${cnfdir}/local.cfg \
-    	> ${cnfdir}/local.cfg-$$-1 && mv -f ${cnfdir}/local.cfg-$$-1 ${cnfdir}/local.cfg
+if [ ! -f $CONFIGFILE ] ; then
+	cat << EOF > $CONFIGFILE
+# local overides for lynx-cur configuration
+STARTFILE:Not-Configured-Yet
+EOF
+	chmod 644 $CONFIGFILE
 fi
 
-LINE2=`fgrep -n "#NNTPSERVER:news.server.dom" \
-    ${cnfdir}/local.cfg | awk -F: '{print $1;}'`
-if [ ! -z "$LINE2" ]; then
-    NNTPSERVER=`grep -s -v '^#' /etc/news/server | head -n 1`;
-    if [ -n "$NNTPSERVER" ]; then
-	sed -e "$LINE2 s/#NNTPSERVER:news.server.dom/NNTPSERVER:$NNTPSERVER/" ${cnfdir}/local.cfg \
-	    > ${cnfdir}/local.cfg-$$-2 && mv -f ${cnfdir}/local.cfg-$$-2 ${cnfdir}/local.cfg
-    fi
-fi
+cp -a $CONFIGFILE $CONFIGFILE.tmp
 
-if [ -f ${cnfdir}/local.cfg-$$-[12] ]; then
-    rm -f ${cnfdir}/local.cfg-$$-[12]
+db_get ${pack}/defaulturl
+# escape colons
+defaulturl=`echo "$RET" | sed -e 's_:_\\\\:_g'`
+
+# Check whether /etc/news/server exists and sync its value to NNTPSERVER setting:
+if [ -e /etc/news/server ] ; then
+	NNTPSERVER=`grep -s -v '^#' /etc/news/server | head -n 1`
 fi
 
+# add missing lines
+test -z "$defaulturl"  || grep -Eq '^STARTFILE:' $CONFIGFILE || \
+	echo "STARTFILE:Not-Configured-Yet" >> $CONFIGFILE
+test -z "$NNTPSERVER" || grep -Eq '^NNTPSERVER:' $CONFIGFILE || \
+	echo "NNTPSERVER:Not-Configured-Yet" >> $CONFIGFILE
+
+sed -e "s:^STARTFILE\\:.*:STARTFILE\\:${defaulturl}:" \
+	-e "s/^NNTPSERVER:.*/NNTPSERVER:${NNTPSERVER}/" \
+	< $CONFIGFILE > $CONFIGFILE.tmp
+mv -f $CONFIGFILE.tmp $CONFIGFILE
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 
diff -u lynx-cur-2.8.7dev9/debian/postrm lynx-cur-2.8.7dev9/debian/postrm
--- lynx-cur-2.8.7dev9/debian/postrm
+++ lynx-cur-2.8.7dev9/debian/postrm
@@ -5,22 +5,10 @@
 
 set -e
 
-if [ "$1" = "remove" ]; then
+if [ "$1" = "purge" ]; then
     rm -f ${cnfdir}/local.cfg
-# handle duplicated lynx.mo
-#    for l in ca cs da de et fr hu it ja nl pt_BR ru sl sv tr uk zh_CN zh_TW
-#    do
-#      dpkg-divert --package lynx-cur --remove --rename --divert \
-#      /usr/share/locale/${l}/LC_MESSAGES/lynx.mo.old \
-#	  /usr/share/locale/${l}/LC_MESSAGES/lynx.mo
-#    done
 fi
 
-if [ "$1" = "purge" ]; then
-    if [ -d ${cnfdir} ] ; then
-	rm -r ${cnfdir}
-    fi
-fi
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
diff -u lynx-cur-2.8.7dev9/debian/rules lynx-cur-2.8.7dev9/debian/rules
--- lynx-cur-2.8.7dev9/debian/rules
+++ lynx-cur-2.8.7dev9/debian/rules
@@ -79,7 +79,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs -i
-	install -m 755 debian/lynx $(SUBDIR)/usr/bin/lynx-cur
+	install -m 755 debian/lynx.cur.wrappper $(SUBDIR)/usr/bin/lynx-cur
 
 install-arch:
 	dh_testdir
@@ -97,8 +97,6 @@
 	cd $(DOCDIR) ; rm -f COPYING lynx_help/COPYING lynx_help/COPYHEADER \
 		CHANGES COPYING.asc COPYHEADER.asc
 	cd $(DSTDIR)/usr/share/man/man1 ; mv lynx.1 lynx.cur.1
-	install -m 644 debian/local.cfg \
-		$(DOCDIR)/local.cfg.in
 
 # Build architecture-independent files here.
 # for lynx-cur-wrapper
@@ -109,6 +107,7 @@
 	dh_installdocs
 	dh_installman debian/lynx-cur.1
 	dh_installchangelogs
+	dh_install
 	dh_link
 	dh_compress
 	dh_fixperms
@@ -128,6 +127,7 @@
 	dh_installmenu
 	dh_installmime
 	dh_installchangelogs CHANGES
+	dh_install
 	dh_link
 	dh_strip
 	dh_compress
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx.preinst
+++ lynx-cur-2.8.7dev9/debian/lynx.preinst
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+set -e
+
+# Inspired by
+# http://wiki.debian.org/DpkgConffileHandling
+# Remove a no-longer used conffile
+rm_or_moveconffile() {
+    PKGNAME="$1"
+    CONFFILE="$2"
+    NEWDIR="$3"
+    if [ -e "$CONFFILE" ]; then
+        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+        old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
+        if [ "$md5sum" != "$old_md5sum" ]; then
+	    test -e "$NEWDIR" || mkdir -m 755 -p "$NEWDIR"
+            echo "Obsolete conffile $CONFFILE has been modified by you." 1>&2
+	    if [ -e "$NEWDIR/`basename $CONFFILE`" ]; then
+	        echo "replacement conffile $NEWDIR/`basename $CONFFILE` already exists." 1>&2
+                echo "Saving as $CONFFILE.dpkg-bak ..." 1>&2
+                mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+            else
+                echo "Moving conffile $CONFFILE to new location $NEWDIR" 1>&2
+                mv -f "$CONFFILE" "$NEWDIR/"
+            fi
+        else
+            echo "Removing obsolete conffile $CONFFILE ..." 1>&2
+            rm -f "$CONFFILE"
+        fi
+    fi
+}
+
+
+
+case "$1" in
+    install|upgrade)
+    # Upgrading from a a real, non-dummy lynx package.
+    if dpkg --compare-versions "$2" 'lt-nl' '2.8.7dev9-1.1' ; then
+        update-alternatives --quiet --remove www-browser /usr/bin/lynx
+	update-alternatives --quiet --remove lynx /usr/bin/lynx.stable
+        rm_or_moveconffile lynx /etc/lynx.cfg /etc/lynx-cur
+        rm_or_moveconffile lynx /etc/lynx.lss /etc/lynx-cur
+    fi
+    ;;
+    *)
+esac
+
+#DEBHELPER#
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx.cur.wrappper
+++ lynx-cur-2.8.7dev9/debian/lynx.cur.wrappper
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+cnfdir=/etc/lynx-cur
+binary=lynx.cur
+### default settings
+OPT=""
+
+# nl=dutch no=norwegian pl=polish pt=portuguese sl=slovenia sv=swedish
+# chinese=zh_CN.GB2312 and/or zh_TW.Big5 korean=ko_KR.eucKR
+
+case $LANG in
+	*.utf-8|*.UTF-8)   flg=utf   ;;
+	cs*) flg=cs ;;
+	da*) flg=da ;;
+	de*) flg=de ;;
+	es*) flg=es ;;
+	fr*) flg=fr ;;
+	it*) flg=it ;;
+	ja*) flg=ja ;;
+	ko*) flg=ko ;;
+	nl*) flg=nl ;;
+	no*) flg=no ;;
+	pl*) flg=pl ;;
+	pt*) flg=pt ;;
+	ru*) flg=ru ;;
+	sl*) flg=sl ;;
+	sv*) flg=sv ;;
+	zh*) flg=zh ;;
+	*)   flg=   ;;
+esac
+
+if [ X$LYNX_CFG = X ] ; then
+ if [ X$flg = Xja ] ; then
+###
+### Japanese environment
+###
+  if [ X$DISPLAY = X ] ; then
+############ non-X #############
+    if [ X$TERM = Xkon -o X$TERM = Xjfbterm ] ; then
+### kon or jfbterm?
+      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg.blck ${1+"$@"}
+    elif [ X$TERM = Xlinux ] ; then
+### linux console ?
+      export LANG=C
+      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg ${1+"$@"}
+    else
+### unsure, but ...
+      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg.dflt ${1+"$@"}
+    fi
+  else
+########## X Window ############
+    if [ X$TERM = Xkterm ] ; then
+      if [ X$COLORTERM = X -o X$COLORTERM = Xrxvt-xpm -o X$COLORTERM = Xrxvt ]
+### kterm or non-package krxvt ?
+      then
+        exec /usr/bin/${binary} -cfg=${cnfdir}/lynx-ja.cfg ${1+"$@"}
+# If reverse video
+#        exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg.blck ${1+"$@"}
+      fi
+    elif [ X$COLORTERM = Xrxvt-xpm -o X$COLORTERM = Xgnome-terminal ] ; then
+### krxvt or gnome-terminal?
+      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx-ja.cfg ${1+"$@"}
+    elif [ X$COLORTERM = Xrxvt -o X$TERM = Xxterm-debian -o X$TERM = Xxterm ]
+    then
+### rxvt or xterm ?
+      export LANG=C
+      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg ${1+"$@"}
+    else
+### unsure, but ...
+      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg.dflt ${1+"$@"}
+    fi
+  fi
+###
+### Unicode ?
+ elif [ X$flg = Xutf ]; then
+    if [ X$TERM = Xmlterm ]
+    then
+### mlterm ?
+      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx-utf.cfg ${1+"$@"}
+    elif [ X$TERM = Xxterm ]
+    then
+### uxterm ?
+      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx-utf.cfg ${1+"$@"}
+    else
+### unsure, but ...
+      exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg.dflt ${1+"$@"}
+    fi
+###
+### non-Japanese environment ?
+###
+ else
+  if [ X$flg != X ] ; then
+    exec /usr/bin/${binary} -cfg=${cnfdir}/lynx-${flg}.cfg ${1+"$@"}
+  else
+    exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg ${1+"$@"}
+  fi
+ fi
+else
+    exec /usr/bin/${binary} ${1+"$@"}
+fi
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper.install
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper.install
@@ -0,0 +1 @@
+debian/lynx-cur-wrapper-conffiles/* /etc/lynx-cur/
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-de.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-de.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:iso-8859-1
+PREFERRED_LANGUAGE:de,en;q=0.9,*;q=0.5
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-pt.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-pt.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:iso-8859-1
+PREFERRED_LANGUAGE:pt,en;q=0.9,*;q=0.5
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-ko.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-ko.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:euc-kr
+PREFERRED_LANGUAGE:ko,en;q=0.9,*;q=0.5
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-cs.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-cs.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:iso-8859-1
+PREFERRED_LANGUAGE:cs,en;q=0.9,*;q=0.5
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-pl.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-pl.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:iso-8859-1
+PREFERRED_LANGUAGE:pl,en;q=0.9,*;q=0.5
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-sl.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-sl.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:iso-8859-1
+PREFERRED_LANGUAGE:sl,en;q=0.9,*;q=0.5
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-zh.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-zh.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:big5
+PREFERRED_LANGUAGE:zh,en;q=0.9,*;q=0.5
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-ja.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-ja.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:euc-jp
+PREFERRED_LANGUAGE:ja,en;q=0.9,*;q=0.5
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-sv.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-sv.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:iso-8859-1
+PREFERRED_LANGUAGE:sv,en;q=0.9,*;q=0.5
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-da.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-da.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:iso-8859-1
+PREFERRED_LANGUAGE:da,en;q=0.9,*;q=0.5
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx.cfg.dflt
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx.cfg.dflt
@@ -0,0 +1,13 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:euc-jp
+PREFERRED_LANGUAGE:ja,en;q=0.9,*;q=0.5
+COLOR:0:default:default 
+COLOR:1:blue:default 
+COLOR:2:yellow:blue 
+COLOR:3:green:default 
+COLOR:4:magenta:default 
+COLOR:5:blue:default 
+COLOR:6:red:default 
+COLOR:7:magenta:cyan
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-es.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-es.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:iso-8859-1
+PREFERRED_LANGUAGE:es,en;q=0.9,*;q=0.5
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-nl.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-nl.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:iso-8859-1
+PREFERRED_LANGUAGE:nl,en;q=0.9,*;q=0.5
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-utf.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-utf.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:utf-8
+PREFERRED_LANGUAGE:utf-8,en;q=0.9,*;q=0.5
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-no.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-no.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:iso-8859-1
+PREFERRED_LANGUAGE:no,en;q=0.9,*;q=0.5
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-it.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-it.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:iso-8859-1
+PREFERRED_LANGUAGE:it,en;q=0.9,*;q=0.5
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-ru.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-ru.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:iso-8859-1
+PREFERRED_LANGUAGE:ru,en;q=0.9,*;q=0.5
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx.cfg.blck
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx.cfg.blck
@@ -0,0 +1,13 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:euc-jp
+PREFERRED_LANGUAGE:ja,en;q=0.9,*;q=0.5
+COLOR:0:lightgray:black 
+COLOR:1:blue:black 
+COLOR:2:yellow:blue 
+COLOR:3:green:black 
+COLOR:4:magenta:black 
+COLOR:5:blue:black 
+COLOR:6:red:black 
+COLOR:7:magenta:cyan
only in patch2:
unchanged:
--- lynx-cur-2.8.7dev9.orig/debian/lynx-cur-wrapper-conffiles/lynx-fr.cfg
+++ lynx-cur-2.8.7dev9/debian/lynx-cur-wrapper-conffiles/lynx-fr.cfg
@@ -0,0 +1,5 @@
+# Include all the common options:
+INCLUDE:/etc/lynx-cur/lynx.cfg
+# Now override a couple:
+CHARACTER_SET:iso-8859-1
+PREFERRED_LANGUAGE:fr,en;q=0.9,*;q=0.5

Attachment: signature.asc
Description: Digital signature

Reply via email to