[ngspice] 55/61: * Change userdir for lyx (Closes: #813119) * Change standards version to 3.9.7, no changes needed * Add hardening +all * Change vcs browser field from http to https * Fix copyright file * Add patch 03_fix_spelling

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 fe31aeb19bb549def3c2f23607b85a5e8e7854a5
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date:   Fri Apr 1 18:21:36 2016 +0000

    * Change userdir for lyx (Closes: #813119)
    * Change standards version to 3.9.7, no changes needed
    * Add hardening +all
    * Change vcs browser field from http to https
    * Fix copyright file
    * Add patch 03_fix_spelling
---
 debian/changelog                     | 11 +++++++++++
 debian/control                       |  4 ++--
 debian/copyright                     | 10 ----------
 debian/patches/03_fix_spelling.patch | 20 ++++++++++++++++++++
 debian/patches/series                |  1 +
 debian/rules                         | 11 ++++++++---
 6 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d7bcd0..7453676 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ngspice (26-2) UNRELEASED; urgency=medium
+
+  * Change userdir for lyx (Closes: #813119)
+  * Change standards version to 3.9.7, no changes needed
+  * Add hardening +all
+  * Change vcs browser field from http to https
+  * Fix copyright file
+  * Add patch 03_fix_spelling
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Mon, 28 Mar 2016 20:54:04 +0200
+
 ngspice (26-1) unstable; urgency=low
 
   * New upstream release (Closes: #706821)
diff --git a/debian/control b/debian/control
index 3c7ba0e..d20379b 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: 3.9.7
 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/03_fix_spelling.patch b/debian/patches/03_fix_spelling.patch
new file mode 100644
index 0000000..f8fa73a
--- /dev/null
+++ b/debian/patches/03_fix_spelling.patch
@@ -0,0 +1,20 @@
+Fix minor spelling mistakes
+--- a/src/spicelib/parser/inpdomod.c
++++ b/src/spicelib/parser/inpdomod.c
+@@ -162,14 +162,14 @@
+ 					type = INPtypelook("MESA");
+ 					if (type < 0)
+ 					{
+-						err = INPmkTemp("Device type MESA not availabe\n");
++						err = INPmkTemp("Device type MESA not available\n");
+ 					}
+ 					break;
+ 				case 3:
+ 					type = INPtypelook("MESA");
+ 					if (type < 0)
+ 					{
+-						err = INPmkTemp("Device type MESA not availabe\n");
++						err = INPmkTemp("Device type MESA not available\n");
+ 					}
+ 					break;
+ 				case 4:
diff --git a/debian/patches/series b/debian/patches/series
index cfb384a..fd4bb9d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_fix_manpages.patch
 02_fix_tcl_examples.patch
+03_fix_spelling.patch
diff --git a/debian/rules b/debian/rules
index 92d3567..c21e07a 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)
@@ -77,9 +79,10 @@ build-arch: config.status
 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 
+	#cd build/manual && lyx --export ps manual.lyx
+	mkdir -p build/manual/.lyx 
+	cd build/manual && lyx -userdir ./.lyx --export pdf2 manual.lyx 
+	cd build/manual && lyx -userdir ./.lyx --export html manual.lyx 
 	touch $@
 
 clean:
@@ -186,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