[ngspice] 03/61: Preparing for version 19
Andreas Tille
tille at debian.org
Tue Dec 12 14:08:38 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 0704752cafc4a0bf032bcb282352c7fff9dc850f
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date: Thu May 21 08:40:15 2009 +0000
Preparing for version 19
---
debian/changelog | 10 ++++
debian/patches/01_manpages-hyphen.diff | 86 ----------------------------------
debian/patches/02_fix_getopt.diff | 11 -----
debian/patches/03_fix_libdir.diff | 26 ----------
debian/patches/series | 3 --
debian/rules | 10 ++--
debian/watch | 2 +-
7 files changed, 14 insertions(+), 134 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cb4042f..a1ae831 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ng-spice-rework (19-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Remove all patches since they are already in upstream
+ * Remove call to autogen and --enable experimental option when building
+ * Fix watch file
+ * Not removing getopt files, since they are BSD now
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Thu, 21 May 2009 10:39:47 +0200
+
ng-spice-rework (18-1) unstable; urgency=low
* Initial release (Closes: #489768)
diff --git a/debian/patches/01_manpages-hyphen.diff b/debian/patches/01_manpages-hyphen.diff
deleted file mode 100644
index 2bd7109..0000000
--- a/debian/patches/01_manpages-hyphen.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-Fix the hyphens in ngnutmeg.1 & ngspice.1 manpages.
-Index: ng-spice-rework-18.dfsg/man/man1/ngnutmeg.1
-===================================================================
---- ng-spice-rework-18.dfsg.orig/man/man1/ngnutmeg.1 2009-01-21 17:09:40.000000000 +0200
-+++ ng-spice-rework-18.dfsg/man/man1/ngnutmeg.1 2009-01-21 17:13:05.000000000 +0200
-@@ -6,12 +6,12 @@
- .SH NAME
- nutmeg \- spice post-processor
- .SH SYNOPSIS
--\fBnutmeg [ - ] [ -n ] [ -t term ] [ datafile ... ]\fR
-+\fBnutmeg [ \- ] [ \-n ] [ \-t term ] [ datafile ... ]\fR
- .SH DESCRIPTION
- .B Nutmeg
- is a post processor for \s-2SPICE\s+2 \- it takes the raw
- output file created
--by \fBspice -r\fR
-+by \fBspice \-r\fR
- and plots the data on a graphics terminal or a workstation display.
- Note that the raw output file is different from the
- data that \s-2SPICE\s+2 writes to the standard output.
-@@ -92,7 +92,7 @@
- The phase of vector.
- .IP
- \fBj(vector) \-\fR
--\fIi\fR (sqrt(-1)) times vector.
-+\fIi\fR (sqrt(\-1)) times vector.
- .IP
- \fBreal(vector) \-\fR
- The real component of vector.
-@@ -439,12 +439,12 @@
- \fBcpdebug\fR
- .br
- Print \fIcshpar\fR debugging information. (Must be complied with the
---DCPDEBUG flag.)
-+\-DCPDEBUG flag.)
- .IP
- \fBdebug\fR
- .br
- If set then a lot of debugging information is printed. (Must be
--compiled with the -DFTEDEBUG flag.)
-+compiled with the \-DFTEDEBUG flag.)
- .IP
- \fBdevice\fR
- .br
-@@ -508,7 +508,7 @@
- .br
- If this is set, when the \fBhardcopy\fR command is run the resulting file
- is automatically printed on the printer named \fBhcopydev\fR with the
--command \fIlpr -P\fBhcopydev\fI -g \fBfile\fR.
-+command \fIlpr \-P\fBhcopydev\fI \-g \fBfile\fR.
- .IP
- \fBhcopydevtype\fR
- .br
-@@ -925,7 +925,7 @@
- pi pi
- e The base of natural logarithms
- c The speed of light
-- i The square root of -1
-+ i The square root of \-1
- kelvin Absolute 0 in Centigrade
- echarge The charge on an electron
- boltz Boltzman's constant
-Index: ng-spice-rework-18.dfsg/man/man1/ngspice.1
-===================================================================
---- ng-spice-rework-18.dfsg.orig/man/man1/ngspice.1 2009-01-21 17:14:18.000000000 +0200
-+++ ng-spice-rework-18.dfsg/man/man1/ngspice.1 2009-01-21 17:14:51.000000000 +0200
-@@ -7,8 +7,8 @@
- .SH NAME
- spice \- circuit simulator
- .SH SYNOPSIS
--\fBspice [ -n ] [ -t term ] [ -r rawfile] [ -b ]
--[ -i ] [ input file ... ]\fR
-+\fBspice [ \-n ] [ \-t term ] [ \-r rawfile] [ \-b ]
-+[ \-i ] [ input file ... ]\fR
- .SH DESCRIPTION
- This manual page describes the commands available for interactive
- use of \*S. For details of circuit descriptions and the
-@@ -35,7 +35,7 @@
- Run in batch mode. \*S will read the standard input or the specified
- input file and do the simulation. Note that if the standard input
- is not a terminal, \*S will default to batch mode, unless the
---i flag is given.
-+\-i flag is given.
- .TP
- \fB-s\fR (or \fB--server\fR)
- Run in server mode. This is like batch mode, except that a temporary
diff --git a/debian/patches/02_fix_getopt.diff b/debian/patches/02_fix_getopt.diff
deleted file mode 100644
index 658e8fb..0000000
--- a/debian/patches/02_fix_getopt.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/main.c
-+++ b/src/main.c
-@@ -58,7 +58,7 @@
- #include "spicelib/devices/dev.h"
- #include "spicelib/analysis/analysis.h"
- #include "misc/ivars.h"
--#include "misc/getopt.h"
-+#include <getopt.h>
- #include "frontend/resource.h"
- #include "frontend/variable.h"
- #include "frontend/display.h" /* added by SDB to pick up Input() fcn */
diff --git a/debian/patches/03_fix_libdir.diff b/debian/patches/03_fix_libdir.diff
deleted file mode 100644
index 441093f..0000000
--- a/debian/patches/03_fix_libdir.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -278,7 +278,6 @@
- AM_CONDITIONAL(TCL_MODULE, true)
- AC_DEFINE(TCL_MODULE,1,[Tcl Module])
- with_x=no
-- enable_shared=no
-
- AC_MSG_CHECKING([for tclConfig.sh])
- tcl_config_sh=""
-@@ -378,6 +377,7 @@
- fi
- rm -f conftest.tcl
-
-+if [ -z $libdir ]; then
- AC_CHECK_LIB(pthread,pthread_create)
- for TCL_PACKAGE_PATH_ELEMENT in $TCL_PACKAGE_PATH ; do
- if test -a $TCL_PACKAGE_PATH_ELEMENT ; then
-@@ -386,6 +386,7 @@
- break
- fi
- done
-+fi
-
- else
- TCL_PACKAGE_PATH=""
diff --git a/debian/patches/series b/debian/patches/series
index 90f443f..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +0,0 @@
-01_manpages-hyphen.diff
-02_fix_getopt.diff
-03_fix_libdir.diff
diff --git a/debian/rules b/debian/rules
index bcf186f..7bf55a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,6 @@ config.status-stamp:
cp -f /usr/share/misc/config.guess build/tclspice/config.guess
# Configure ngspice
(cd build/ngspice;\
- ./autogen.sh; \
./configure $(CROSS) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
@@ -50,13 +49,11 @@ config.status-stamp:
--enable-debug \
--enable-numparam=yes \
--enable-dot-global \
- --enable-experimental \
enable_adms=no \
CFLAGS="$(CFLAGS)")
#LDFLAGS="-Wl,-z,defs")
# Configure tclspice
(cd build/tclspice;\
- ./autogen.sh; \
./configure $(CROSS) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
@@ -72,7 +69,6 @@ config.status-stamp:
--enable-debug \
--enable-numparam=yes \
--enable-dot-global \
- --enable-experimental \
--disable-x \
--with-tcl=/usr/lib/tcl8.4 \
CFLAGS="$(CFLAGS)")
@@ -192,9 +188,9 @@ get-orig-source:
rm -f doc/*.pdf
rm -f config.sub
rm -f config.guess
- rm -f src/misc/getopt1.c
- rm -f src/misc/getopt.c
- rm -f src/misc/getopt.h
+ #rm -f src/misc/getopt1.c
+ #rm -f src/misc/getopt.c
+ #rm -f src/misc/getopt.h
tar -zcf ${TARNAME} ${DIRNAME}
rm -rf ${DIRNAME} ${ARCHIVE}
diff --git a/debian/watch b/debian/watch
index 13f0b61..0780c5b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://qa.debian.org/watch/sf.php/ngspice/ng-spice-rework-(.*)\.tar\.gz debian uupdate
+http://sf.net/ngspice/ng-spice-rework-(.*)\.tar\.gz debian uupdate
--
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