[ngspice] 57/61: * Change standards version to 4.0.1, no changes needed * Add hardening +all * Change vcs browser field from http to https * Remove adms from source, licensing issues * Fix copyright file * Add patch 03_fix_spelling * Change compat level to 9
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 5faa37983dab0cd95a0a3c6617edf200945c5468
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date: Sat Nov 25 17:51:55 2017 +0000
* Change standards version to 4.0.1, no changes needed
* Add hardening +all
* Change vcs browser field from http to https
* Remove adms from source, licensing issues
* Fix copyright file
* Add patch 03_fix_spelling
* Change compat level to 9
---
debian/changelog | 12 ++++++
debian/compat | 2 +-
debian/control | 4 +-
debian/copyright | 10 -----
debian/patches/01_fix_manpages.patch | 73 ------------------------------------
debian/patches/series | 3 +-
debian/rules | 6 ++-
7 files changed, 22 insertions(+), 88 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b1c4726..e0ff484 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ngspice (27-1) UNRELEASED; urgency=medium
+
+ * Change standards version to 4.0.1, no changes needed
+ * Add hardening +all
+ * Change vcs browser field from http to https
+ * Remove adms from source, licensing issues
+ * Fix copyright file
+ * Add patch 03_fix_spelling
+ * Change compat level to 9
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Mon, 28 Mar 2016 20:54:04 +0200
+
ngspice (26-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 3c7ba0e..d75df2b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,10 +9,10 @@ Build-Depends: debhelper (>= 8), automake, libtool, libxaw7-dev, flex,
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.5
+Standards-Version: 4.0.1
Homepage: http://ngspice.sourceforge.net
Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/ng-spice-rework/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/debian-science/packages/ng-spice-rework/trunk/
+Vcs-Browser: https://anonscm.debian.org/viewvc/debian-science/packages/ng-spice-rework/trunk/
XS-Autobuild: yes
Package: ngspice
diff --git a/debian/copyright b/debian/copyright
index d388e37..aac84cb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -82,16 +82,6 @@ Files: src/spicelib/devices/adms/admst/*
Copyright: 2011 Noovela - Author Laurent Lemaitre
License: GPL-2+
-Files: src/spicelib/devices/adms/admst/prengspice.xml
- src/spicelib/devices/adms/admst/ngspice.xml
-Copyright: 2011 Noovela - Author Laurent Lemaitre
-License: NOOVELA
- This code IS to be used for non-commercial usage ONLY.
- Note: publishing technical papers with the affiliation of a commercial company
- which results are produced by the tool are typical commercial usage of the tool.
- Commercial usage are subject to special fees.
- Contact: r29173 at noovela.com or www.noovela.com
-
Files: src/spicelib/devices/adms/psp102/*
Copyright: 2007, All Rights Reserved, NXP Semiconductors
License: None
diff --git a/debian/patches/01_fix_manpages.patch b/debian/patches/01_fix_manpages.patch
index 81c1fe1..43e5cd6 100644
--- a/debian/patches/01_fix_manpages.patch
+++ b/debian/patches/01_fix_manpages.patch
@@ -1,74 +1 @@
Fix minor spelling errors in manpages
---- a/man/man1/ngnutmeg.1
-+++ b/man/man1/ngnutmeg.1
-@@ -3,14 +3,14 @@
-
- (woman-find-file buffer-file-name)
-
--(let* ((man-args (concat "-l " buffer-file-name))
-+(let* ((man-args (concat "\-l " buffer-file-name))
- (bufname (concat "*Man " man-args "*")))
- (when (get-buffer bufname)
- (kill-buffer bufname))
- (man man-args))
-
- (compile
-- (concat "groff -t -e -man -Tps "
-+ (concat "groff \-t \-e \-man \-Tps "
- buffer-file-name
- " > /tmp/tmp.ps && gv /tmp/tmp.ps"))
-
---- a/man/man1/ngspice.1
-+++ b/man/man1/ngspice.1
-@@ -3,13 +3,13 @@
-
- (woman-find-file buffer-file-name)
-
--(let* ((man-args (concat "-l " buffer-file-name))
-+(let* ((man-args (concat "\-l " buffer-file-name))
- (bufname (concat "*Man " man-args "*")))
- (when (get-buffer bufname)
- (kill-buffer bufname))
- (man man-args))
-
--(compile (concat "groff -t -e -man -Tps "
-+(compile (concat "groff \-t \-e \-man \-Tps "
- buffer-file-name
- " > /tmp/tmp.ps && gv /tmp/tmp.ps"))
-
-@@ -23,12 +23,12 @@
- \fBngspice\fP [\fIoptions\fP] [\fIfile\fP ...]
- .SH "DESCRIPTION"
- This man page is just a small overview.
--The primary documentation of ngspice is in the \*[ngspice] User's Manual,
-+The primary documentation of ngspice is in the ngspice User's Manual,
- which is available as a pdf file.
- .SH "OPTIONS"
- .TP
- \fB\-n\fP or \fB\*=no\-spiceinit\fP
--Don't try to source the file ".spiceinit" upon startup. Normally \*[ngspice]
-+Don't try to source the file ".spiceinit" upon startup. Normally ngspice
- tries to find the file in the current directory, and if it is not found then
- in the user's home directory.
- .TP
-@@ -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
-+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
-@@ -136,7 +136,7 @@
- .SH "SEE ALSO"
- sconvert(1), ngnutmeg(1), mfb(3), writedata(3), and
- .br
--\*[ngspice] User's Manual at \fBhttp://ngspice.sourceforge.net/docs.html\fP
-+ngspice User's Manual at \fBhttp://ngspice.sourceforge.net/docs.html\fP
- .SH "BUGS"
- Please report bugs to the ngspice project via
- .br
diff --git a/debian/patches/series b/debian/patches/series
index cfb384a..dc811a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-01_fix_manpages.patch
+#01_fix_manpages.patch
02_fix_tcl_examples.patch
+03_fix_spelling.patch
diff --git a/debian/rules b/debian/rules
index 5426623..7181952 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
export CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
export CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
export CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
@@ -79,7 +81,7 @@ 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 pdf2 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 $@
@@ -187,6 +189,8 @@ get-orig-source:
rm -f ngspice-$$VER/config.guess ;\
rm -rf ngspice-$$VER/examples/TransImpedanceAmp ;\
rm -rf ngspice-$$VER/examples/tclspice\tcl-testbench3 ;\
+ rm -rf ngspice-$$VER/examples/adms
+ rm -rf ngspice-$$VER/src/spicelib/devices/adms
tar czf ngspice_$$VER.orig.tar.gz ngspice-$$VER; \
rm -f ngspice-$$VER.tar.gz; \
rm -rf ngspice-$$VER; \
--
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