[ngspice] 16/61: * Add dependency on lyx, elyxer and texlive-lang-greek * Fix compilation of doc in rules file

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ngspice.

commit 42b41bd410c05bd8fbfcffd2ee637ca28d55abe5
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date:   Sat Jul 10 18:23:15 2010 +0000

    * Add dependency on lyx, elyxer and texlive-lang-greek
    * Fix compilation of doc in rules file
---
 debian/changelog            |  4 +++-
 debian/control              |  2 +-
 debian/ngspice-doc.doc-base |  2 +-
 debian/ngspice.install      |  2 +-
 debian/rules                | 17 +++++++++--------
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f287f7..d791f0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ ng-spice-rework (21-1) UNRELEASED; urgency=low
   * Bump standards version to 3.9.0
   * Rewrite get-orig-source
   * Switch to dpkg-source 3.0 (quilt) format
+  * Add dependency on lyx, elyxer and texlive-lang-greek
+  * Fix compilation of doc in rules file
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sat, 10 Jul 2010 16:45:17 +0200
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sat, 10 Jul 2010 20:22:39 +0200
 
 ng-spice-rework (20-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6d51a35..dd14a18 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Gudjon I. Gudjonsson <gudjon at gudjon.org>,
  Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 7), automake, libtool, libxaw7-dev, flex,
  bison, gfortran, libeditline-dev, libncurses5-dev, quilt,
- texinfo, texlive-latex-base,
+ lyx, elyxer, texinfo, texlive-latex-base, texlive-lang-greek,
  tcl8.4-dev, tcl8.4, tk8.4-dev, tk8.4, blt-dev
 Standards-Version: 3.9.0
 Homepage: http://ngspice.sourceforge.net
diff --git a/debian/ngspice-doc.doc-base b/debian/ngspice-doc.doc-base
index ea8dd47..0d7cc1f 100644
--- a/debian/ngspice-doc.doc-base
+++ b/debian/ngspice-doc.doc-base
@@ -8,5 +8,5 @@ Format: postscript
 Files: /usr/share/doc/ngspice-doc/ngspice.ps.gz
 
 Format: HTML
-Index: /usr/share/doc/ngspice-doc/html/index.html
+Index: /usr/share/doc/ngspice-doc/html/manual.html
 Files: /usr/share/doc/ngspice-doc/html/*.html
diff --git a/debian/ngspice.install b/debian/ngspice.install
index 41dad0c..f67765c 100644
--- a/debian/ngspice.install
+++ b/debian/ngspice.install
@@ -1,5 +1,5 @@
 usr/bin/*
 usr/lib/spice/*
-usr/share/info/*
+#usr/share/info/*
 usr/share/man/*
 usr/share/ngspice/*
diff --git a/debian/rules b/debian/rules
index 306cd82..7e14fed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-include /usr/share/quilt/quilt.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -18,13 +17,15 @@ endif
 
 
 config.status: config.status-stamp configure
-config.status-stamp: $(QUILT_STAMPFN)
+config.status-stamp:
 	dh_testdir
 	# Make build dir for ngspice
 	mkdir -p build/ngspice
 	cp -Rl `ls . |grep -v build|grep -v debian` build/ngspice
 	cp -f /usr/share/misc/config.sub build/ngspice/config.sub
 	cp -f /usr/share/misc/config.guess build/ngspice/config.guess
+	cp -f /usr/share/misc/config.sub build/ngspice/doc/config.sub
+	cp -f /usr/share/misc/config.guess build/ngspice/doc/config.guess
 	# Make build dir for tclspice
 	mkdir -p build/tclspice
 	cp -Rl `ls . |grep -v build|grep -v debian` build/tclspice
@@ -78,12 +79,12 @@ build-stamp:  config.status
 	cd build/ngspice && $(MAKE)
 	cd build/tclspice && $(MAKE)
 	# Build documentation
-	cd build/ngspice/doc && $(MAKE) ps
-	cd build/ngspice/doc && $(MAKE) html
+	cd build/ngspice/doc && lyx --export ps manual.lyx 
+	cd build/ngspice/doc && lyx --export html manual.lyx 
 
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
@@ -120,10 +121,10 @@ endif
 	##	$(CURDIR)/debian/tclspice/usr/share/lintian/overrides/tclspice
 	# Documentation for ngspice, the same as for tclspice
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/ngspice-doc/html
-	install -o root -g root -m 644 build/ngspice/doc/ngspice.html/* \
+	cp -a build/ngspice/doc/manual.html.LyXconv/* \
 		$(CURDIR)/debian/tmp/usr/share/doc/ngspice-doc/html
-	install -o root -g root -m 644 build/ngspice/doc/ngspice.ps \
-		$(CURDIR)/debian/tmp/usr/share/doc/ngspice-doc/
+	install -o root -g root -m 644 build/ngspice/doc/manual.ps \
+		$(CURDIR)/debian/tmp/usr/share/doc/ngspice-doc/ngspice.ps
 	# Removing /usr/share/info/dir file
 	rm -f $(CURDIR)/debian/tmp/usr/share/info/dir
 

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