Author: branden
Date: 2004-06-15 16:42:17 -0500 (Tue, 15 Jun 2004)
New Revision: 1543
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/control
trunk/debian/rules
trunk/debian/xterm.doc-base
Log:
Revert to using lynx instead of html2text for converting XTerm FAQ from
HTML to plain text. Drop build-dependency on html2text. Ship
(compressed) plain text version of XTerm FAQ as
/usr/share/doc/xterm/xterm.faq.gz, not
/usr/share/doc/xterm/xterm.faq.text.gz. Update xterm's doc-base
information accordingly.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-06-15 21:33:52 UTC (rev 1542)
+++ trunk/debian/CHANGESETS 2004-06-15 21:42:17 UTC (rev 1543)
@@ -176,4 +176,12 @@
Update XTerm FAQ to latest version from Thomas Dickey's website.
1542
+Revert to using lynx instead of html2text for converting XTerm FAQ from
+HTML to plain text. Drop build-dependency on html2text. Ship
+(compressed) plain text version of XTerm FAQ as
+/usr/share/doc/xterm/xterm.faq.gz, not
+/usr/share/doc/xterm/xterm.faq.text.gz. Update xterm's doc-base
+information accordingly.
+ 1543
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-06-15 21:33:52 UTC (rev 1542)
+++ trunk/debian/changelog 2004-06-15 21:42:17 UTC (rev 1543)
@@ -13,6 +13,13 @@
* Update XTerm FAQ to latest version from Thomas Dickey's website.
+ * Revert to using lynx instead of html2text for converting XTerm FAQ from
+ HTML to plain text. Drop build-dependency on html2text. Ship
+ (compressed) plain text version of XTerm FAQ as
+ /usr/share/doc/xterm/xterm.faq.gz, not
+ /usr/share/doc/xterm/xterm.faq.text.gz. Update xterm's doc-base
+ information accordingly.
+
-- Branden Robinson <[EMAIL PROTECTED]> Tue, 15 Jun 2004 16:31:22 -0500
xfree86 (4.3.0.dfsg.1-4+SVN) unstable; urgency=low
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2004-06-15 21:33:52 UTC (rev 1542)
+++ trunk/debian/control 2004-06-15 21:42:17 UTC (rev 1543)
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL
PROTECTED]>
Standards-Version: 3.6.1
-Build-Depends: dpkg (>= 1.7.0), flex, bison, bsdmainutils, groff, zlib1g-dev |
libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev,
libfreetype6-dev, libpaperg, libstdc++5-dev | libstdc++-dev, tetex-bin,
po-debconf, debhelper (>= 4.1.16), html2text, lynx, libglide2-dev (>>
2001.01.26) [i386], libglide3-dev (>= 2002.04.10-3) [alpha i386],
linux-kernel-headers [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc
s390 sh], linux-kernel-headers (>= 2.5.999-test7-bk-15) [sparc], libpng12-dev |
libpng-dev, libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft-dev
(>= 2.1.2), libxrender-dev (>= 0.8.3), libxcursor-dev, dbs, m4
+Build-Depends: dpkg (>= 1.7.0), flex, bison, bsdmainutils, groff, zlib1g-dev |
libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev,
libfreetype6-dev, libpaperg, libstdc++5-dev | libstdc++-dev, tetex-bin,
po-debconf, debhelper (>= 4.1.16), lynx, libglide2-dev (>> 2001.01.26) [i386],
libglide3-dev (>= 2002.04.10-3) [alpha i386], linux-kernel-headers [alpha amd64
arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh], linux-kernel-headers (>=
2.5.999-test7-bk-15) [sparc], libpng12-dev | libpng-dev, libexpat1-dev,
libfontconfig1-dev, fontconfig, bzip2, libxft-dev (>= 2.1.2), libxrender-dev
(>= 0.8.3), libxcursor-dev, dbs, m4
Build-Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1)
Package: lbxproxy
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2004-06-15 21:33:52 UTC (rev 1542)
+++ trunk/debian/rules 2004-06-15 21:42:17 UTC (rev 1543)
@@ -40,8 +40,7 @@
export GROFF_NO_SGR=1
# Define commands for converting HTML and XHTML to plain text.
-#HTML2TEXT=lynx -dump -nolist
-HTML2TEXT=html2text -nobs -style pretty
+HTML2TEXT=lynx -dump -nolist
XHTML2TEXT=lynx -dump -nolist -force_html
# Set up parameters for the upstream build environment.
@@ -139,8 +138,9 @@
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
perl $(SCRIPT_DIR)/dbs_split clean
rm -rf imports debian/local/xlibmesa-drm-source/modules
- dh_clean debian/local/xserver-wrapper debian/local/xterm.faq.text.gz \
- debian/MANIFEST.$(ARCH).new debian/shlibs.local
+ dh_clean debian/local/xserver-wrapper debian/local/FAQ.gz \
+ debian/local/xterm.faq.gz debian/MANIFEST.$(ARCH).new \
+ debian/shlibs.local
# All 'important' targets have 2 lines. The one that is run by
# dpkg-buildpackage or the user, and the one that does the actual work. This
@@ -230,8 +230,11 @@
endif
# build Debian's X server wrapper
$(CC) -Wall -g -O2 -o debian/local/xserver-wrapper
debian/local/xserver-wrapper.c
- $(HTML2TEXT) debian/local/xterm.faq.html > debian/local/xterm.faq.text
- gzip -9f debian/local/xterm.faq.text
+ # Generate plain text documents from (X)HTML.
+ $(HTML2TEXT) debian/local/xterm.faq.html >debian/local/xterm.faq
+ gzip -9f debian/local/xterm.faq
+ $(XHTML2TEXT) debian/local/FAQ.xhtml >debian/local/FAQ
+ gzip -9f debian/local/FAQ
ifndef test_rules
$(MAKE) -C $(SOURCE_TREE) WORLDOPTS="" IMAKE_DEFINES="$(IMAKE_DEFINES)"
World
ifndef NOT_BUILDING_XFREE86_X_SERVER
Modified: trunk/debian/xterm.doc-base
===================================================================
--- trunk/debian/xterm.doc-base 2004-06-15 21:33:52 UTC (rev 1542)
+++ trunk/debian/xterm.doc-base 2004-06-15 21:42:17 UTC (rev 1543)
@@ -7,7 +7,7 @@
Section: XShells
Format: text
-Files: /usr/share/doc/xterm/xterm.faq.text.gz
+Files: /usr/share/doc/xterm/xterm.faq.gz
Format: HTML
Index: /usr/share/doc/xterm/xterm.faq.html
