[yorick] 01/01: get rid of texi2html
Thibaut Jean-Claude Paumard
thibaut at moszumanska.debian.org
Thu May 21 14:14:08 UTC 2015
This is an automated email from the git hooks/post-receive script.
thibaut pushed a commit to branch master
in repository yorick.
commit 9cc39a110d1a6db0238ab9787a2942a165bfee9c
Author: Thibaut Paumard <thibaut at debian.org>
Date: Thu May 21 15:17:11 2015 +0200
get rid of texi2html
---
debian/changelog | 3 +-
debian/control | 2 +-
debian/patches/get-rid-of-texi2html | 77 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/patches/template_html | 43 ++++++++++++++++-----
debian/rules | 2 +
6 files changed, 117 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7178bd1..2c6a064 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
yorick (2.2.04+dfsg1-2) UNRELEASED; urgency=low
* Include autopkgtest suite;
- * Also run X11 tests during build (in xfb-run).
+ * Also run X11 tests during build (in xfb-run);
+ * Get rid of texi2html build-dep.
-- Thibaut Paumard <thibaut at debian.org> Thu, 21 May 2015 11:03:38 +0200
diff --git a/debian/control b/debian/control
index 99108d4..9bb1c84 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Thibaut Paumard <thibaut at debian.org>
Build-Depends: libx11-dev, texinfo, debhelper (>= 7.0.0), quilt (>= 0.40),
- imagemagick, po-debconf, texi2html, mpi-default-dev,
+ imagemagick, po-debconf, mpi-default-dev,
libmpich-dev [!powerpcspe !sh4 !x32],
libopenmpi-dev [!hppa !s390 !sh4 !x32 !s390x],
xvfb, xauth, xfonts-base
diff --git a/debian/patches/get-rid-of-texi2html b/debian/patches/get-rid-of-texi2html
new file mode 100644
index 0000000..baa293b
--- /dev/null
+++ b/debian/patches/get-rid-of-texi2html
@@ -0,0 +1,77 @@
+Description: get rid of texi2html, which is obsolete
+Author: Thibaut Paumard <thibaut at debian.org>
+Origin: Vendor
+Forwarded: not-needed
+Last-Update: 2015-05-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -6,9 +6,9 @@
+ # http://www.nongnu.org/texi2html/
+ include ../Make.cfg
+ MAKEINFO = makeinfo
+-TEXI2DVI = texi2dvi
++TEXI2DVI = makeinfo --dvi
+ #TEXI2PDF = texi2pdf
+-TEXI2PDF = texi2dvi --pdf
++TEXI2PDF = makeinfo --pdf
+ TEX = tex
+ PDFTEX = pdftex
+ YORICK = ../yorick/yorick$(EXE_SFX)
+--- a/doc/html/Makefile
++++ b/doc/html/Makefile
+@@ -6,7 +6,7 @@
+ include ../../Make.cfg
+ YORICK = ../../yorick/yorick$(EXE_SFX)
+ DESTDIR = /usr/local/share/doc/yorick
+-TEXI2HTML = texi2html -init_file html/texi2html.init -output yorick
++TEXI2HTML = makeinfo --html --css-ref=../skull.css --output yorick
+ #select mac or win version of ../README.html
+ PLATFORM=mac
+ BUILDDIR=compiled-doc/
+--- a/doc/html/README-install.html.content
++++ b/doc/html/README-install.html.content
+@@ -16,10 +16,10 @@
+ <p>Yorick is
+ <a href="http://opensource.org">open source software</a>.
+ You may use, distribute, or modify yorick under the terms of a
+-<a href="./doc/manual/yorick.html">BSD license</a>. The
++BSD license. The
+ source code for yorick is available from the
+-<a href="http://yorick.sourceforge.net">yorick homepage</a>
+-hosted by <a href="http://sourceforge.net">SourceForge.net</a>.</p>
++<a href="http://dhmunro.github.io/yorick-doc/">yorick homepage</a>
++hosted by <a href="http://github.com">GitHub</a>.</p>
+
+ %onlydoc:installwin%<p>This Microsoft Windows binary distribution of yorick includes two
+ %onlydoc:installwin%versions of the yorick executable: The first is a standalone program
+--- a/doc/html/htmldoc.i
++++ b/doc/html/htmldoc.i
+@@ -966,7 +966,7 @@
+ f = f;
+ wryte, f, "<ul>";
+ wryte, f, "<li>";
+- wryte, f, "<a href = http://yorick.sourceforge.net>the official yorick homepage</a>";
++ wryte, f, "<a href = http://dhmunro.github.io/yorick-doc/>the official yorick homepage</a>";
+
+ wryte, f, "<li>";
+ wryte, f, "<a href = http://www.maumae.net/yorick/doc/index.php>";
+@@ -1436,7 +1436,7 @@
+ " alt=\"yorick banner\">",
+ " <FONT face=\"Arial,Helvetica\">",
+ " <P><B><A href=\"../index.html\">Home</A></B></P>",
+- " <P><B><A href=\"../manual/yorick.html\">Manual</A></B></P>",
++ " <P><B><A href=\"../manual/index.html\">Manual</A></B></P>",
+ " <P><B><A href=\"../html_xref/packages.html\">Packages</A></B></P>",
+ " <P><B><A href=\"../html_xref/global-index.html\">Global Index</A></B></P>",
+ " <P><B><A href=\"../html_xref/keywords.html\">Keywords</A></B></P>",
+@@ -1559,7 +1559,7 @@
+ // this (obsolete) routine should be customized.
+ if (is_void(toroot)) toroot="../";
+ htags = ["home", "manual", "packages", "index", "keywords"];
+- hfiles = toroot+["index.html", "manual/yorick.html",
++ hfiles = toroot+["index.html", "manual/index.html",
+ "html_xref/packages.html",
+ "html_xref/global-index.html", "html_xref/keywords.html"];
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 34ded65..2f93e62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+get-rid-of-texi2html
template_html
help_text
packinfo_txt
diff --git a/debian/patches/template_html b/debian/patches/template_html
index 6e6b002..9714290 100644
--- a/debian/patches/template_html
+++ b/debian/patches/template_html
@@ -4,15 +4,30 @@ Forwarded: not-needed
--- a/doc/html/template.html
+++ b/doc/html/template.html
-@@ -51,7 +51,6 @@
+@@ -39,7 +39,7 @@
+ <body text="#000000" bgcolor="#ffffff" link="#0000ff" vlink="#800080" alink="#ff0000">
+ <div id="l-bar">
+ <div id="links">
+-<div class="nav1"><A href="http://yorick.sourceforge.net/index.php">Web Home</A></div>
++<div class="nav1"><A href="http://dhmunro.github.io/yorick-doc/">Web Home</A></div>
+ %onlydoc:installmac%<div class="nav1"><a href="./README.html">Installation</a></div>
+ %onlydoc:installmac%<div class="nav2"><a href="./README.html#emacs">Emacs help</a></div>
+ %onlydoc:installmac%<div class="nav2"><a href="./README.html#ghost">Graphics help</a></div>
+@@ -50,12 +50,7 @@
+ %onlydoc:installwin%<div class="nav2"><a href="./README.html#folder">Folders help</a></div>
%onlydoc:installwin%<div class="nav2"><a href="./README.html#extend">C Extensions</a></div>
<div class="nav1"><a href="%toroot%README.html">Getting Started</a></div>
- %onlydoc:index%<div class="nav2"><A href="%toroot%manual/yorick.html">BSD License</A></div>
+-%onlydoc:index%<div class="nav2"><A href="%toroot%manual/yorick.html">BSD License</A></div>
-%onlydoc:index%<div class="nav2"><A href="%toroot%../README.html">Installation</A></div>
- <div class="nav1"><A href="%toroot%manual/yorick_1.html">Manual</A></div>
- %onlydoc:manual%<div class="nav2"><A href="%toroot%manual/yorick_toc.html">Contents</A></div>
- %onlydoc:manual%<div class="nav2"><A href="%toroot%manual/yorick.html">Copyright</A></div>
-@@ -77,9 +76,9 @@
+-<div class="nav1"><A href="%toroot%manual/yorick_1.html">Manual</A></div>
+-%onlydoc:manual%<div class="nav2"><A href="%toroot%manual/yorick_toc.html">Contents</A></div>
+-%onlydoc:manual%<div class="nav2"><A href="%toroot%manual/yorick.html">Copyright</A></div>
+-%onlydoc:manual%<div class="nav2"><A href="%toroot%manual/yorick_prt.html">Print Manual</A></div>
++<div class="nav1"><A href="%toroot%manual/index.html">Manual</A></div>
+ <div class="nav1"><A href="%toroot%html_xref/packages.html">Packages</A></div>
+ %onlydoc:xref%<div class="nav2"><A href="%toroot%html_xref/global-index.html">Global Index</A></div>
+ %onlydoc:xref%<div class="nav2"><A href="%toroot%html_xref/keywords.html">Keywords</A></div>
+@@ -77,9 +72,9 @@
<ol>
<li>The terminal window where you type
interactive commands is not part of yorick. Neither is the text
@@ -25,7 +40,7 @@ Forwarded: not-needed
<li>Quickly read the first three chapters of the
<a href="./manual/yorick_1.html">user manual</a>. The first chapter,
in particular, is a yorick tutorial.</li>
-@@ -89,22 +88,22 @@
+@@ -89,39 +84,34 @@
familiar with it.</li>
<li>Choose one or more of the demonstration programs and work through it.
<dl>
@@ -53,9 +68,19 @@ Forwarded: not-needed
+the yorick interpreted code in the <a href="/usr/share/yorick/i"><tt>Y_SITE/i</tt></a>
+and <a href="/usr/share/yorick/i0"><tt>Y_SITE/i0</tt></a> directories. Often, the program
you want to write will be similar to something in those directories.</li>
- <li>The <a href="http://yorick.sourceforge.net/index.php">
+-<li>The <a href="http://yorick.sourceforge.net/index.php">
++<li>The <a href="http://dhmunro.github.io/yorick-doc/">
yorick homepage</a> has much more information about yorick, including
-@@ -121,7 +120,7 @@
+ user forums where you can get help.</li>
+ </ol>
+
+ %embedded:manual/yorick_prt.html:manual:../%Yorick: Printable Manual
+-<table cellpadding="1" cellspacing="1" border="0"><tbody>
+-<tr><td valign="middle" align="left"><a href="yorick.html" title="Cover (top) of document"><img src="../images/a_top.gif" border="0" alt="Top: Yorick: An Interpreted Language" align="middle"></a></td>
+-<td valign="middle" align="left"><a href="yorick_toc.html" title="Table of contents"><img src="../images/a_tableofcon.gif" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+-<td valign="middle" align="left"><a href="yorick_abt.html" title="About (help)"><img src="../images/a_help.gif" border="0" alt="About: About This Document" align="middle"></a></td>
+-</tr></tbody></table>
+ <hr size="1">
<h1 class="settitle">Printable Manual</h1>
<p>A printable version of the manual is
diff --git a/debian/rules b/debian/rules
index 843d64c..a21c8d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,6 +70,8 @@ build-stamp: configure-stamp
cp doc/html/packinfo.txt build/00yorick.packinfo
cp doc/html/keywords.txt build/00yorick.keywords
cp doc/html/aliases.txt build/00yorick.aliases
+ find build/doc/manual -name "*.html" -not -name yorick_prt.html | xargs sed -e 's|^<body .*$$|&<div id="l-bar"><div id="links"><div class="nav1"><A href="http://dhmunro.github.io/yorick-doc/">Web Home</A></div><div class="nav1"><a href="../README.html">Getting Started</a></div><div class="nav1"><A href="../manual/index.html">Manual</A></div><div class="nav1"><A href="../html_xref/packages.html">Packages</A></div><div class="nav1"><a href="../refcard/index.html">Quick Reference</a></div> [...]
+ sed 's|yorick_1.html|index.html|' -i build/doc/*.html build/doc/*/*.html
touch build-stamp
build-mpy-stamp: build-stamp
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yorick.git
More information about the debian-science-commits
mailing list