[starlink-ast] 01/01: Revert "Disable html generation due to some bug in latex2html"

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository starlink-ast.

commit 9d54cbee634ea8ad4ab1a3f9b58595dc18249dfb
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Dec 12 11:48:53 2013 +0100

    Revert "Disable html generation due to some bug in latex2html"
    
    This reverts commit 175da7e8d7e06c27a56075625815889a21484e09.
    
    Conflicts:
    	debian/changelog
    	debian/patches/series
---
 debian/changelog                     |  6 ++++++
 debian/libstarlink-ast-doc.doc-base  |  4 ++++
 debian/libstarlink-ast-doc.docs      |  1 +
 debian/patches/dont_build_html.patch | 15 ---------------
 debian/patches/series                |  1 -
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad5bc7e..cc9f2c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+starlink-ast (7.3.2+dfsg-2) unstable; urgency=low
+
+  * Re-enable html generation
+
+ -- Ole Streicher <debian at liska.ath.cx>  Thu, 12 Dec 2013 11:29:09 +0100
+
 starlink-ast (7.3.2+dfsg-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/libstarlink-ast-doc.doc-base b/debian/libstarlink-ast-doc.doc-base
index d797421..0273980 100644
--- a/debian/libstarlink-ast-doc.doc-base
+++ b/debian/libstarlink-ast-doc.doc-base
@@ -9,3 +9,7 @@ Abstract: The AST library provides a comprehensive range of facilities for
 
 Format: PDF
 Files: /usr/share/doc/*/sun???.pdf.gz
+
+Format: HTML
+Index: /usr/share/doc/libstarlink-ast-doc/index.html
+Files: /usr/share/doc/libstarlink-ast-doc/*.html
diff --git a/debian/libstarlink-ast-doc.docs b/debian/libstarlink-ast-doc.docs
index d9c3db1..617c7f2 100644
--- a/debian/libstarlink-ast-doc.docs
+++ b/debian/libstarlink-ast-doc.docs
@@ -1,3 +1,4 @@
 sun???.pdf
+sun???/*
 NEWS
 
diff --git a/debian/patches/dont_build_html.patch b/debian/patches/dont_build_html.patch
deleted file mode 100644
index 4454ada..0000000
--- a/debian/patches/dont_build_html.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Temporarily disable build of the html documentation.
- There seems to be a bug in latex2html, which causes an infinite loop.
-Bug: http://bugs.debian.org/723913
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -558,7 +558,7 @@
-     libstarlink_ast_pgplot.la \
-     libstarlink_ast_pgplot3d.la
- 
--dist_pkgdata_DATA =  @STARDOCS at .pdf @STARDOCS@/index.html
-+dist_pkgdata_DATA =  @STARDOCS at .pdf
- .tex.pdf:
- 	pdflatex $^ && pdflatex $^
- 
diff --git a/debian/patches/series b/debian/patches/series
index fc28709..b314010 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ rename_library
 use_std_automake.patch
 use_external_pal.patch
 use_liberfa.patch
-dont_build_html.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/starlink-ast.git