[ngspice] 47/61: * New upstream release (Closes: #706821) * Change tcl version to 8.6 * Add pdf manual

[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 4b0c1356b054a98ff03e6414aa5c6ca0bc4ea768
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date:   Sat Sep 28 20:16:17 2013 +0000

    * New upstream release (Closes: #706821)
    * Change tcl version to 8.6
    * Add pdf manual
---
 debian/changelog                        |  6 +++--
 debian/control                          |  2 +-
 debian/ngspice-doc.install              |  1 +
 debian/patches/03_fix_compilation.patch | 45 +++++++++++++++++++++++++++++++++
 debian/rules                            |  5 +++-
 5 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 225502d..66b4413 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
 ngspice (25-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release (Closes: #706821)
   * Bump standards version to 3.9.4
   * Make VCS field canonical
   * Add patch 03_fix_compilation.patch
+  * Change tcl version to 8.6
+  * Add pdf manual
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Thu, 15 Aug 2013 06:34:43 +0200
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Thu, 26 Sep 2013 22:33:07 +0200
 
 ngspice (24-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 89d981e..f1710bb 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 (>= 8), automake, libtool, libxaw7-dev, flex,
  bison, gfortran, libedit-dev, libncurses5-dev,
- texinfo, tcl8.4-dev, tcl8.4, tk8.4-dev, tk8.4, blt-dev, hardening-wrapper
+ texinfo, tcl8.6-dev, tcl8.6, tk8.6-dev, tk8.6, blt-dev, hardening-wrapper
 Build-Depends-Indep: lyx, elyxer, texlive, texlive-latex-extra, texlive-lang-greek,
  texlive-generic-recommended, imagemagick
 Standards-Version: 3.9.4
diff --git a/debian/ngspice-doc.install b/debian/ngspice-doc.install
index 003080c..35339aa 100644
--- a/debian/ngspice-doc.install
+++ b/debian/ngspice-doc.install
@@ -1 +1,2 @@
 usr/share/doc/ngspice-doc/*
+
diff --git a/debian/patches/03_fix_compilation.patch b/debian/patches/03_fix_compilation.patch
new file mode 100644
index 0000000..930ecf7
--- /dev/null
+++ b/debian/patches/03_fix_compilation.patch
@@ -0,0 +1,45 @@
+#Fix minor compilation errors
+#Well, in tclspice.c I am probably commenting out something important. Will 
+# be sent to upstream.
+--- a/src/xspice/mif/mifgetmod.c
++++ b/src/xspice/mif/mifgetmod.c
+@@ -224,7 +224,7 @@
+ 
+ 						sprintf(temp, "MIF: unrecognized parameter (%s) - ignored\n", parm);
+ 
+-						fprintf(stdout,temp);
++						fprintf(stdout,"%s",temp);
+ 						err = TMALLOC(char, 2 * strlen(temp) + 2);// K.A. added 5 March 2000
+                   
+ 						*err = '\0';// K.A. added 5 March 2000
+--- a/src/xspice/evt/evtinit.c
++++ b/src/xspice/evt/evtinit.c
+@@ -222,7 +222,7 @@
+                                           event_node->name,
+                                           err_collide);
+ 
+-		fprintf(stdout,errMsg);
++		fprintf(stdout,"%s",errMsg);
+ 
+                 return(E_PRIVATE);
+             }
+--- a/src/tclspice.c
++++ b/src/tclspice.c
+@@ -1457,7 +1457,7 @@
+         (ft_curckt->ci_ckt)->CKTdelta = atof(argv[1]);
+ 
+     /*Ok, as log as string less than 200 chars*/
+-    sprintf(interp->result, "%G", (ft_curckt->ci_ckt)->CKTdelta);
++    //sprintf(interp->result, "%G", (ft_curckt->ci_ckt)->CKTdelta);
+     return TCL_OK;
+ }
+ 
+@@ -1485,7 +1485,7 @@
+         job->TRANmaxStep = atof(argv[1]);
+ 
+     /*Ok, as log as string less than 200 chars*/
+-    sprintf(interp->result, "%G", job->TRANmaxStep);
++    //sprintf(interp->result, "%G", job->TRANmaxStep);
+     return TCL_OK;
+ }
+ 
diff --git a/debian/rules b/debian/rules
index fcd29ab..ff6aa21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,7 @@ config.status-stamp:
 		--enable-cider \
 		--disable-debug \
 		--disable-x \
-		--with-tcl=/usr/lib/tcl8.4 \
+		--with-tcl=/usr/lib/tcl8.6 \
 		CFLAGS="$(CFLAGS)")
 	touch $@
 
@@ -74,6 +74,7 @@ build-indep: config.status
 	# Build documentation
 	dh_testdir
 	cd build/manual && lyx --export ps manual.lyx 
+	cd build/manual && lyx --export pdf2 manual.lyx 
 	cd build/manual && lyx --export html manual.lyx 
 	touch $@
 
@@ -118,6 +119,8 @@ install-indep: build-indep
 		$(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
+	install -o root -g root -m 644 build/manual/manual.pdf \
+		$(CURDIR)/debian/tmp/usr/share/doc/ngspice-doc/ngspice.pdf
 	# Removing /usr/share/info directory
 	rm -rf $(CURDIR)/debian/tmp/usr/share/info
 	chmod a-x $(CURDIR)/build/tclspice/examples/tclspice/*/*.tcl

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