[ngspice] 28/61: * New upstream release * Bump standards version to 3.9.3 * Move /usr/lib/spice to /usr/lib/ngspice and /usr/lib/tcltk to /usr/lib/tcltk/ngspice reflecting changes in upstream * Move install of tclspice prior to ngspice, both will install spinit but the one from ngspice is the correct. * Add tclspice binary dependency on ngspice * Remove all patches. Fixed in upstream.
Andreas Tille
tille at debian.org
Tue Dec 12 14:08:41 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 f011078751b82d07938ccf1579085706b47e68eb
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date: Sun Apr 22 21:10:01 2012 +0000
* New upstream release
* Bump standards version to 3.9.3
* Move /usr/lib/spice to /usr/lib/ngspice
and /usr/lib/tcltk to /usr/lib/tcltk/ngspice
reflecting changes in upstream
* Move install of tclspice prior to ngspice, both will install spinit but
the one from ngspice is the correct.
* Add tclspice binary dependency on ngspice
* Remove all patches. Fixed in upstream.
---
debian/changelog | 14 ++++++
debian/control | 2 +-
debian/ngspice.dirs | 2 +-
debian/ngspice.install | 2 +-
debian/patches/01_fix_manpages.patch | 89 ------------------------------------
debian/patches/02_fix_spelling.patch | 23 ----------
debian/patches/series | 2 -
debian/rules | 8 ++--
debian/tclspice.dirs | 2 +-
debian/tclspice.install | 4 +-
10 files changed, 25 insertions(+), 123 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1f17a3e..b6beb29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+ngspice (24-1) unstable; urgency=low
+
+ * New upstream release
+ * Bump standards version to 3.9.3
+ * Move /usr/lib/spice to /usr/lib/ngspice
+ and /usr/lib/tcltk to /usr/lib/tcltk/ngspice
+ reflecting changes in upstream
+ * Move install of tclspice prior to ngspice, both will install spinit but
+ the one from ngspice is the correct.
+ * Add tclspice binary dependency on ngspice
+ * Remove all patches. Fixed in upstream.
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Sun, 22 Apr 2012 22:11:07 +0200
+
ngspice (23-1) unstable; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index 13cdcee..5e84ec6 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Description: NGspice library for Tcl, development files
Package: tclspice
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, blt, tcl8.4, tk8.4
+Depends: ${shlibs:Depends}, ${misc:Depends}, ngspice, blt, tcl8.4, tk8.4
Description: NGspice library for Tcl
TclSpice brings NGspice simulation engine into your Tcl-scripts.
All spice directives are available as Tcl functions and it features
diff --git a/debian/ngspice.dirs b/debian/ngspice.dirs
index 56a8b61..5e69c54 100644
--- a/debian/ngspice.dirs
+++ b/debian/ngspice.dirs
@@ -1,5 +1,5 @@
usr/bin
-usr/lib/spice
+usr/lib/ngspice
#usr/share/info
usr/share/man
usr/share/ngspice
diff --git a/debian/ngspice.install b/debian/ngspice.install
index f67765c..5234705 100644
--- a/debian/ngspice.install
+++ b/debian/ngspice.install
@@ -1,5 +1,5 @@
usr/bin/*
-usr/lib/spice/*
+usr/lib/ngspice/*
#usr/share/info/*
usr/share/man/*
usr/share/ngspice/*
diff --git a/debian/patches/01_fix_manpages.patch b/debian/patches/01_fix_manpages.patch
deleted file mode 100644
index d01af5a..0000000
--- a/debian/patches/01_fix_manpages.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Fix minor spelling errors in manpages
---- a/man/man1/ngnutmeg.1
-+++ b/man/man1/ngnutmeg.1
-@@ -5,14 +5,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
-@@ -5,13 +5,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"))
-
-@@ -20,17 +20,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"
- \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
-@@ -41,9 +41,9 @@
- The program is being run on a terminal with \fBmfb\fP name \fIterm\fP.
- .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.
- .TP
- \fB\-s\fP or \fB\*=server\fP
-@@ -81,7 +81,7 @@
- ngspice through a pipe. Thus ngspice will assume that the pipe
- is a tty and allows 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
-@@ -131,7 +131,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/02_fix_spelling.patch b/debian/patches/02_fix_spelling.patch
deleted file mode 100644
index 4a921b1..0000000
--- a/debian/patches/02_fix_spelling.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fixes a minor spelling error
---- a/man/man1/ngnutmeg.1
-+++ b/man/man1/ngnutmeg.1
-@@ -61,7 +61,7 @@
- Further arguments are taken to be data files in binary or ascii format
- (see \fBsconvert\fP(1)) which are loaded into ngnutmeg. If the file
- is in binary format, it may be only partially completed (useful for
--examining \*[ngspice] ouput before the simulation is finished). One
-+examining \*[ngspice] output before the simulation is finished). One
- file may contain any number of data sets from different analyses.
- .SH "ENVIRONMENT"
- See ngspice(1)
---- a/man/man1/ngspice.1
-+++ b/man/man1/ngspice.1
-@@ -79,7 +79,7 @@
- \fB\-p\fP or \fB\*=pipe\fP
- Allow a program (e.g., xcircuit) to act as a GUI frontend for
- ngspice through a pipe. Thus ngspice will assume that the pipe
--is a tty and allows to run in interactive mode.
-+is a tty and allows one to run in interactive mode.
- .PP
- Further arguments are taken to be spice input decks, which are read
- and saved. (If batch mode is requested then they are run immediately.)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 87089f4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01_fix_manpages.patch
-02_fix_spelling.patch
diff --git a/debian/rules b/debian/rules
index 1d5efb3..73d9916 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,12 +104,14 @@ install: build
dh_installdirs
# Make ngspice and tclspice
+ # tclspice must be installed prior to ngspice. Some files will be overwritten by ngspice
+ # but the ngspice are the correct ones.
+ cd build/tclspice && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
cd build/ngspice && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
- cd build/tclspice && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# The code model files must be stripped
ifneq ("nostrip","$(findstring nostrip,$(DEB_BUILD_OPTIONS))")
- strip $(CURDIR)/debian/tmp/usr/lib/spice/*.cm
- strip $(CURDIR)/debian/tmp/usr/lib/tcltk/spice/*.cm
+ strip $(CURDIR)/debian/tmp/usr/lib/ngspice/*.cm
+ strip $(CURDIR)/debian/tmp/usr/lib/tcltk/ngspice/*.cm
endif
# Remove empty dirs:
diff --git a/debian/tclspice.dirs b/debian/tclspice.dirs
index ecfb2ca..abfdead 100644
--- a/debian/tclspice.dirs
+++ b/debian/tclspice.dirs
@@ -1,2 +1,2 @@
-usr/lib/tcltk/spice
+usr/lib/tcltk/ngspice
usr/share/doc/tclspice/examples
diff --git a/debian/tclspice.install b/debian/tclspice.install
index b60676b..74cf509 100644
--- a/debian/tclspice.install
+++ b/debian/tclspice.install
@@ -1,2 +1,2 @@
-usr/lib/tcltk/libspice*.so.* usr/lib/tcltk/
-usr/lib/tcltk/spice/* usr/lib/tcltk/
+usr/lib/tcltk/libspice*.so.*
+usr/lib/tcltk/ngspice/*
--
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