r46777 - in /packages/ng-spice-rework/trunk/debian: changelog control patches/01_fix_manpages.patch patches/03_fix_compilation.patch patches/series rules
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Mon Jun 30 18:28:49 UTC 2014
Author: gudjon-guest
Date: Mon Jun 30 18:28:48 2014
New Revision: 46777
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46777
Log:
* Bump standards version to 3.9.5
* Remove hardening wrapper and exchange for dpkg-buildflags
Removed:
packages/ng-spice-rework/trunk/debian/patches/03_fix_compilation.patch
Modified:
packages/ng-spice-rework/trunk/debian/changelog
packages/ng-spice-rework/trunk/debian/control
packages/ng-spice-rework/trunk/debian/patches/01_fix_manpages.patch
packages/ng-spice-rework/trunk/debian/patches/series
packages/ng-spice-rework/trunk/debian/rules
Modified: packages/ng-spice-rework/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/changelog?rev=46777&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/changelog (original)
+++ packages/ng-spice-rework/trunk/debian/changelog Mon Jun 30 18:28:48 2014
@@ -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 @@
* 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
Modified: packages/ng-spice-rework/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/control?rev=46777&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/control (original)
+++ packages/ng-spice-rework/trunk/debian/control Mon Jun 30 18:28:48 2014
@@ -6,10 +6,10 @@
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
Modified: packages/ng-spice-rework/trunk/debian/patches/01_fix_manpages.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/patches/01_fix_manpages.patch?rev=46777&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/patches/01_fix_manpages.patch (original)
+++ packages/ng-spice-rework/trunk/debian/patches/01_fix_manpages.patch Mon Jun 30 18:28:48 2014
@@ -36,13 +36,7 @@
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 @@
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
Modified: packages/ng-spice-rework/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/patches/series?rev=46777&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/patches/series (original)
+++ packages/ng-spice-rework/trunk/debian/patches/series Mon Jun 30 18:28:48 2014
@@ -1,3 +1,2 @@
01_fix_manpages.patch
02_fix_tcl_examples.patch
-03_fix_compilation.patch
Modified: packages/ng-spice-rework/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/rules?rev=46777&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/rules (original)
+++ packages/ng-spice-rework/trunk/debian/rules Mon Jun 30 18:28:48 2014
@@ -15,7 +15,8 @@
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 @@
--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 @@
--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 @@
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
More information about the debian-science-commits
mailing list