[ngspice] 52/61: * Bump standards version to 3.9.5 * Remove hardening wrapper and exchange for dpkg-buildflags
Andreas Tille
tille at debian.org
Tue Dec 12 14:08:43 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository ngspice.
commit 54bb630bab08b334b8d88bb6956a6f7497621f8a
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date: Mon Jun 30 18:28:48 2014 +0000
* Bump standards version to 3.9.5
* Remove hardening wrapper and exchange for dpkg-buildflags
---
debian/changelog | 5 +-
debian/control | 4 +-
debian/patches/01_fix_manpages.patch | 35 ++++-------
debian/patches/03_fix_compilation.patch | 103 --------------------------------
debian/patches/series | 1 -
debian/rules | 14 +++--
6 files changed, 23 insertions(+), 139 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bb3e54b..fc38fbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-ngspice (25-1) UNRELEASED; urgency=low
+ngspice (26-1) UNRELEASED; urgency=low
* New upstream release (Closes: #706821)
- * Bump standards version to 3.9.4
+ * Bump standards version to 3.9.5
* Make VCS field canonical
* Change tcl version to 8.6
* Remove part of patch, wish8.4 changed back to wish for tclspice examples
@@ -13,6 +13,7 @@ ngspice (25-1) UNRELEASED; urgency=low
* Add -BLT and -ltcl8.6 to configure for tclspice.
Needed by libtclspice
* Remove ps manual
+ * Remove hardening wrapper and exchange for dpkg-buildflags
-- Gudjon I. Gudjonsson <gudjon at gudjon.org> Tue, 08 Oct 2013 21:40:10 +0200
diff --git a/debian/control b/debian/control
index e2ca1cf..d077b7a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,10 @@ 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.6-dev, tcl8.6, tk8.6-dev, tk8.6, blt-dev, hardening-wrapper
+ texinfo, tcl8.6-dev, tcl8.6, tk8.6-dev, tk8.6, blt-dev
Build-Depends-Indep: lyx, elyxer, texlive, texlive-latex-extra, texlive-lang-greek,
texlive-generic-recommended, imagemagick
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://ngspice.sourceforge.net
Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/ng-spice-rework/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/ng-spice-rework/trunk
diff --git a/debian/patches/01_fix_manpages.patch b/debian/patches/01_fix_manpages.patch
index afd1a94..81c1fe1 100644
--- a/debian/patches/01_fix_manpages.patch
+++ b/debian/patches/01_fix_manpages.patch
@@ -36,13 +36,7 @@ Fix minor spelling errors in manpages
buffer-file-name
" > /tmp/tmp.ps && gv /tmp/tmp.ps"))
-@@ -18,17 +18,17 @@
- .ds = \-\^\-
- .ds ngspice \s-2NGSPICE\s+2
- .SH "NAME"
--ngspice \- circuit simulator derived from \*[spice]\&3f5
-+ngspice \- circuit simulator derived from spice\&3f5
- .SH "SYNOPSIS"
+@@ -23,12 +23,12 @@
\fBngspice\fP [\fIoptions\fP] [\fIfile\fP ...]
.SH "DESCRIPTION"
This man page is just a small overview.
@@ -57,28 +51,19 @@ Fix minor spelling errors in manpages
tries to find the file in the current directory, and if it is not found then
in the user's home directory.
.TP
-@@ -39,9 +39,9 @@
- The program is being run on a terminal with \fBmfb\fP name \fIterm\fP.
+@@ -40,9 +40,9 @@
.TP
\fB\-b\fP or \fB\*=batch\fP
--Run in batch mode. \*[ngspice] will read the standard input or the specified
-+Run in batch mode. ngspice will read the standard input or the specified
- input file and do the simulation. Note that if the standard input
--is not a terminal, \*[ngspice] will default to batch mode, unless the
-+is not a terminal, ngspice will default to batch mode, unless the
- \-i flag is given.
+ Run in batch mode.
+-\*[ngspice] will read the standard input or the specified
++ngspice will read the standard input or the specified
+ input file and do the simulation.
+-Note that if the standard input is not a terminal, \*[ngspice] will default
++Note that if the standard input is not a terminal, ngspice will default
+ to batch mode, unless the \-i flag is given.
.TP
\fB\-s\fP or \fB\*=server\fP
-@@ -79,7 +79,7 @@
- ngspice through a pipe. Thus ngspice will assume that the pipe
- is a tty and allows one to run in interactive mode.
- .PP
--Further arguments are taken to be \*[spice] input decks, which are read
-+Further arguments are taken to be spice input decks, which are read
- and saved. (If batch mode is requested then they are run immediately.)
- .SH "ENVIRONMENT"
- .TP
-@@ -129,7 +129,7 @@
+@@ -136,7 +136,7 @@
.SH "SEE ALSO"
sconvert(1), ngnutmeg(1), mfb(3), writedata(3), and
.br
diff --git a/debian/patches/03_fix_compilation.patch b/debian/patches/03_fix_compilation.patch
deleted file mode 100644
index b0f6e09..0000000
--- a/debian/patches/03_fix_compilation.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-#Fix minor compilation errors + applying a patch to tclspice.c from Robert Larice (in
-# upstream team)
---- 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
-@@ -962,7 +962,7 @@
- return TCL_ERROR;
- }
- for (v = pl->pl_dvecs; v; v = v->v_next)
-- if (!strcmp(v->v_name, name))
-+ if (!strcmp(v->v_name, name)) {
- if (index < v->v_length) {
- Tcl_SetObjResult(interp, Tcl_NewDoubleObj((double) v->v_realdata[index]));
- return TCL_OK;
-@@ -970,6 +970,7 @@
- Tcl_SetResult(interp, "Bad index", TCL_STATIC);
- return TCL_ERROR;
- }
-+ }
-
- Tcl_SetResult(interp, "variable not found", TCL_STATIC);
- return TCL_ERROR;
-@@ -1456,8 +1457,7 @@
- if (argc == 2)
- (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);
-+ Tcl_SetObjResult(interp, Tcl_NewDoubleObj((ft_curckt->ci_ckt)->CKTdelta));
- return TCL_OK;
- }
-
-@@ -1484,8 +1484,7 @@
- if (argc == 2)
- job->TRANmaxStep = atof(argv[1]);
-
-- /*Ok, as log as string less than 200 chars*/
-- sprintf(interp->result, "%G", job->TRANmaxStep);
-+ Tcl_SetObjResult(interp, Tcl_NewDoubleObj(job->TRANmaxStep));
- return TCL_OK;
- }
-
-@@ -1495,8 +1494,6 @@
- get_initTime TCL_CMDPROCARGS(clientData, interp, argc, argv)
- {
- TRANan *job;
-- double itime;
-- char buf[128];
- NG_IGNORE(argv);
- NG_IGNORE(clientData);
-
-@@ -1510,9 +1507,7 @@
- }
-
- job = (TRANan*)(ft_curckt->ci_ckt)->CKTcurJob;
-- itime = job->TRANinitTime;
-- sprintf(buf, "%g", itime);
-- Tcl_SetResult(interp, buf, TCL_VOLATILE);
-+ Tcl_SetObjResult(interp, Tcl_NewDoubleObj(job->TRANinitTime));
- return TCL_OK;
- }
-
-@@ -1522,8 +1517,6 @@
- get_finalTime TCL_CMDPROCARGS(clientData, interp, argc, argv)
- {
- TRANan *job;
-- double ftime;
-- char buf[128];
- NG_IGNORE(argv);
- NG_IGNORE(clientData);
-
-@@ -1537,9 +1530,7 @@
- }
-
- job = (TRANan*)(ft_curckt->ci_ckt)->CKTcurJob;
-- ftime = job->TRANfinalTime;
-- sprintf(buf, "%g", ftime);
-- Tcl_SetResult(interp, buf, TCL_VOLATILE);
-+ Tcl_SetObjResult(interp, Tcl_NewDoubleObj(job->TRANfinalTime));
- return TCL_OK;
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index b89ff3c..cfb384a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
01_fix_manpages.patch
02_fix_tcl_examples.patch
-03_fix_compilation.patch
diff --git a/debian/rules b/debian/rules
index d971f49..8d30b6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,8 @@ else
CROSS= --build $(DEB_BUILD_GNU_TYPE)
endif
-CFLAGS=-fPIC
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
config.status: config.status-stamp configure
config.status-stamp:
@@ -43,7 +44,8 @@ config.status-stamp:
--enable-xspice \
--enable-cider \
--disable-debug \
- CFLAGS="$(CFLAGS)")
+ CFLAGS="$(CFLAGS) -fPIC" \
+ LDFLAGS="$(LDFLAGS)")
#LDFLAGS="-Wl,-z,defs")
# Configure tclspice
(cd build/tclspice;\
@@ -59,8 +61,8 @@ config.status-stamp:
--disable-debug \
--disable-x \
--with-tcl=/usr/lib/tcl8.6 \
- CFLAGS="$(CFLAGS)" \
- LDFLAGS="-lBLT -ltcl8.6")
+ CFLAGS="$(CFLAGS) -fPIC" \
+ LDFLAGS="$(LDFLAGS) -lBLT -ltcl8.6")
touch $@
build: build-arch build-indep
@@ -118,8 +120,8 @@ install-indep: build-indep
mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/ngspice-doc/html
cp -a $(CURDIR)/build/manual/manual.html.LyXconv/* \
$(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.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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ngspice.git
More information about the debian-science-commits
mailing list