[ngspice] 01/01: * Add dependency on texlive-science * Change lyx output from html to xhtml to avoid using elyxer

[Gudjon I. Gudjonsson]

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

gudjon-guest pushed a commit to branch master
in repository ngspice.

commit 535f1fe3590be338748ec683a542127d76deddd2
Author: Gudjon I. Gudjonsson <gudjon at fessender>
Date:   Tue Dec 26 08:59:10 2017 +0100

    * Add dependency on texlive-science
    * Change lyx output from html to xhtml to avoid using elyxer
---
 debian/changelog            |  7 ++++---
 debian/control              |  1 -
 debian/ngspice-doc.doc-base |  4 ++--
 debian/rules                | 10 ++++++++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7542092..7d09779 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ngspice (27-1) UNRELEASED; urgency=medium
+ngspice (27-1) unstable; urgency=medium
 
   [ Gudjon I. Gudjonsson ]
   * Change standards version to 4.1.2, no changes needed
@@ -13,10 +13,11 @@ ngspice (27-1) UNRELEASED; urgency=medium
   * Priority: extra -> optional
 
   [ Gudjon I. Gudjonsson ]
-  * Add dependency on texlive-science and elyxer
+  * Add dependency on texlive-science
   * Add lintian overrides file
+  * Change lyx output from html to xhtml to avoid using elyxer
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Mon, 28 Mar 2016 20:54:04 +0200
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Tue, 26 Dec 2017 07:26:13 +0100
 
 ngspice (26-1.2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 7bce818..833f136 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,6 @@ Build-Depends: debhelper (>= 8),
                blt-dev
 Build-Depends-Indep: lyx, 
                      texlive,
-                     elyxer,
                      texlive-science,
                      texlive-latex-extra, 
                      texlive-lang-greek,
diff --git a/debian/ngspice-doc.doc-base b/debian/ngspice-doc.doc-base
index 8a0b33a..3729ff0 100644
--- a/debian/ngspice-doc.doc-base
+++ b/debian/ngspice-doc.doc-base
@@ -8,5 +8,5 @@ Format: PDF
 Files: /usr/share/doc/ngspice-doc/ngspice.pdf.gz
 
 Format: HTML
-Index: /usr/share/doc/ngspice-doc/html/manual.html
-Files: /usr/share/doc/ngspice-doc/html/*.html
+Index: /usr/share/doc/ngspice-doc/html/manual.xhtml
+Files: /usr/share/doc/ngspice-doc/html/*.xhtml
diff --git a/debian/rules b/debian/rules
index 8067d0f..90512eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,8 +83,8 @@ build-indep: config.status
 	# Build documentation
 	dh_testdir
 	#cd build/manual && lyx -userdir ./.lyx -batch --export ps manual.lyx 
+	-cd build/manual && lyx -userdir ./.lyx -batch --export xhtml manual.lyx 
 	-cd build/manual && lyx -userdir ./.lyx -batch --export pdf2 manual.lyx 
-	cd build/manual && lyx -userdir ./.lyx -batch --export html manual.lyx 
 	touch $@
 
 clean:
@@ -124,7 +124,13 @@ install-arch: build-arch
 install-indep: build-indep
 	# Documentation for ngspice, the same as for tclspice
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/ngspice-doc/html
-	cp -a $(CURDIR)/build/manual/manual.html.LyXconv/* \
+	#cp -a $(CURDIR)/build/manual/manual.html.LyXconv/* \
+	#	$(CURDIR)/debian/tmp/usr/share/doc/ngspice-doc/html
+	cp -a $(CURDIR)/build/manual/Images \
+		$(CURDIR)/debian/tmp/usr/share/doc/ngspice-doc/html
+	cp -a $(CURDIR)/build/manual/*.png \
+		$(CURDIR)/debian/tmp/usr/share/doc/ngspice-doc/html
+	cp -a $(CURDIR)/build/manual/*.xhtml \
 		$(CURDIR)/debian/tmp/usr/share/doc/ngspice-doc/html
 	#install -o root -g root -m 644 build/manual/manual.ps \
 	#	$(CURDIR)/debian/tmp/usr/share/doc/ngspice-doc/ngspice.ps

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