[ngspice] 56/61: * Non-maintainer upload. * Run lyx with a temporary -userdir to not rely on $HOME, thanks to Johann Klammer. (Closes: #813119)

[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 edee69cebeaa6423f42ba52ac51b90b0cdf7b80e
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date:   Sat Nov 25 16:36:26 2017 +0000

    * Non-maintainer upload.
    * Run lyx with a temporary -userdir to not rely on $HOME, thanks to
      Johann Klammer.  (Closes: #813119)
---
 debian/changelog      | 13 +++++--------
 debian/control        |  4 ++--
 debian/copyright      | 10 ++++++++++
 debian/patches/series |  1 -
 debian/rules          | 12 ++++--------
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7453676..b1c4726 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,10 @@
-ngspice (26-2) UNRELEASED; urgency=medium
+ngspice (26-1.1) unstable; 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
+  * Non-maintainer upload.
+  * Run lyx with a temporary -userdir to not rely on $HOME, thanks to
+    Johann Klammer.  (Closes: #813119)
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Mon, 28 Mar 2016 20:54:04 +0200
+ -- Andreas Beckmann <anbe at debian.org>  Mon, 25 Apr 2016 20:50:13 +0200
 
 ngspice (26-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d20379b..3c7ba0e 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.7
+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: https://anonscm.debian.org/viewvc/debian-science/packages/ng-spice-rework/trunk/
+Vcs-Browser: http://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 aac84cb..d388e37 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -82,6 +82,16 @@ 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/series b/debian/patches/series
index fd4bb9d..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_spelling.patch
diff --git a/debian/rules b/debian/rules
index c21e07a..5426623 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,6 @@
 # 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)
@@ -35,6 +33,7 @@ config.status-stamp:
 	#cp -f /usr/share/misc/config.sub build/ngspice/doc/config.sub
 	#cp -f /usr/share/misc/config.guess build/ngspice/doc/config.guess
 	cp -a manual build/
+	mkdir -p build/manual/.lyx
 	# Make build dir for tclspice
 	mkdir -p build/tclspice
 	cp -Rl `ls . |grep -v build|grep -v debian` build/tclspice
@@ -79,10 +78,9 @@ build-arch: config.status
 build-indep: config.status
 	# Build documentation
 	dh_testdir
-	#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 
+	#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 html manual.lyx 
 	touch $@
 
 clean:
@@ -189,8 +187,6 @@ 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