[ngspice] 32/61: * Exclude .tcl and .cir files in examples from compression * Change configure parameters * Change readline dependency to libedit-dev * Make tcl examples executable * Add src/xspice/examples to ngspice examples * Remove tclspice-dev package and move content to tclspice * Started making copyright file machine readable, not finished XXXXXXX
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 09e34eb452e115d79244937e7e47b59af376be80
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date: Wed May 16 05:22:42 2012 +0000
* Exclude .tcl and .cir files in examples from compression
* Change configure parameters
* Change readline dependency to libedit-dev
* Make tcl examples executable
* Add src/xspice/examples to ngspice examples
* Remove tclspice-dev package and move content to tclspice
* Started making copyright file machine readable, not finished XXXXXXX
---
debian/changelog | 13 +++++++---
debian/control | 12 +---------
debian/copyright | 58 +++++++++++++++++++++++++++++++++++----------
debian/ngspice-doc.dirs | 2 +-
debian/ngspice-doc.install | 2 +-
debian/rules | 29 +++++++++--------------
debian/tclspice-dev.dirs | 2 --
debian/tclspice-dev.install | 2 --
debian/tclspice.install | 2 +-
9 files changed, 70 insertions(+), 52 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bba5c06..dd075de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ngspice (24-1) unstable; urgency=low
+ngspice (24-1) UNRELEASED; urgency=low
* New upstream release
* Bump standards version to 3.9.3
@@ -11,8 +11,15 @@ ngspice (24-1) unstable; urgency=low
* Remove patch 02_fix_spelling.patch. Fixed in upstream
* Refreshed patch 01_fix_manpages
* Create patch 02_fix_tcl_examples
-
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Mon, 23 Apr 2012 12:25:16 +0200
+ * Exclude .tcl and .cir files in examples from compression
+ * Change configure parameters
+ * Change readline dependency to libedit-dev
+ * Make tcl examples executable
+ * Add src/xspice/examples to ngspice examples
+ * Remove tclspice-dev package and move content to tclspice
+ * Started making copyright file machine readable, not finished XXXXXXX
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Wed, 16 May 2012 05:48:17 +0200
ngspice (23-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b92f3cd..65643c0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.
Uploaders: Gudjon I. Gudjonsson <gudjon at gudjon.org>,
Andreas Tille <tille at debian.org>
Build-Depends: debhelper (>= 8), automake, libtool, libxaw7-dev, flex,
- bison, gfortran, libeditline-dev, libncurses5-dev,
+ bison, gfortran, libedit-dev, libncurses5-dev,
lyx, elyxer, texinfo, texlive, texlive-latex-extra, texlive-lang-greek, imagemagick,
tcl8.4-dev, tcl8.4, tk8.4-dev, tk8.4, blt-dev
Standards-Version: 3.9.3
@@ -26,16 +26,6 @@ Description: Spice circuit simulator
NGspice is part of gEDA project, a full GPL'd suite of
Electronic Design Automation tools.
-Package: tclspice-dev
-Section: non-free/libdevel
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tclspice, blt-dev, tcl8.4-dev, tk8.4-dev
-Description: NGspice library for Tcl, development files
- TclSpice brings NGspice simulation engine into your Tcl-scripts.
- It includes XSpice. GUI is handled by Tk using BLT vectors.
- .
- This package contains the development files for TclSpice.
-
Package: tclspice
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ngspice, blt, tcl8.4, tk8.4
diff --git a/debian/copyright b/debian/copyright
index ca52e8d..e16e982 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,51 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://ngspice.sourceforge.net
+
+Files: doc/ngspice.texi
+Copyright: 1996 The Regents of the University of California
+License: NONE
+
+Files: examples/*
+Copyright: NONE
+License: NONE
+
+Files: manual/*
+Copyright: 2010, Paolo Nenzi, Holger Vogt
+Files: src/frontend/numparam/*
+Copyright: 2002 Georg Post
+License: LGPL-2+
+
+Files: src/spicelib/devices/adms/psp102/admsva/*
+Copyright: 2007, All Rights Reserved, NXP Semiconductors
+License: None
+
+Files: src/spicelib/devices/adms/admst/*
+Copyright:
+License: None
+
+Files: tests/*
+Copyright: NONE
+License: NONE
+
+
+src/spicelib/devices/adms/admst
+ adms LGPL
+ tclspice LGPL
+ see: /usr/share/common-licenses/LGPL-2.1
+ cider Old BSD see below
+ xspice Public Domain see below
+ spice New BSD see below
+ contrib/spiceprm GPL see below
+ contrib directory see below
+
+Files: debian/*
+Copyright: 2008-2012 Gudjon I. Gudjonsson <gudjon at gudjon.org>
+License: GPL-2
+
This package was debianized by Gudjon I. Gudjonsson <gudjon at gudjon.org> on
Sun, 06 Jul 2008 18:47:46 +0200.
-It was downloaded from http://ngspice.sourceforge.net
+It was downloaded from
Upstream Authors:
Paolo Nenzi <pnenzi at ieee.org>
@@ -80,18 +124,6 @@ Copyright:
Copyright © Wolfgang Muees
and many others...
-License:
- Ngspice is a conglomeration of different softwares with different licenses.
- The components and licenses are the following:
- numparam LGPL
- adms LGPL
- tclspice LGPL
- see: /usr/share/common-licenses/LGPL-2.1
- cider Old BSD see below
- xspice Public Domain see below
- spice New BSD see below
- contrib/spiceprm GPL see below
- contrib directory see below
The Debian packaging is © 2008, Gudjon I. Gudjonsson <gudjon at gudjon.org> and
diff --git a/debian/ngspice-doc.dirs b/debian/ngspice-doc.dirs
index e0b5095..bd3a799 100644
--- a/debian/ngspice-doc.dirs
+++ b/debian/ngspice-doc.dirs
@@ -1,2 +1,2 @@
usr/share/doc/ngspice-doc/html
-usr/share/doc/ngspice-doc/examples
+usr/share/doc/ngspice-doc/examples/xspice1
diff --git a/debian/ngspice-doc.install b/debian/ngspice-doc.install
index 4f86198..003080c 100644
--- a/debian/ngspice-doc.install
+++ b/debian/ngspice-doc.install
@@ -1 +1 @@
-usr/share/doc/ngspice-doc/*
\ No newline at end of file
+usr/share/doc/ngspice-doc/*
diff --git a/debian/rules b/debian/rules
index 73d9916..964ea45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,15 +38,10 @@ config.status-stamp:
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--enable-maintainer-mode \
- --enable-capzerobypass \
- --enable-intnoise \
+ --with-editline=yes \
--enable-xspice \
--enable-cider \
- --disable-xgraph \
- --enable-debug \
- --enable-numparam=yes \
- --enable-dot-global \
- enable_adms=no \
+ --disable-debug \
CFLAGS="$(CFLAGS)")
#LDFLAGS="-Wl,-z,defs")
# Configure tclspice
@@ -57,14 +52,10 @@ config.status-stamp:
--libdir=/usr/lib/tcltk \
--enable-shared=yes \
--enable-maintainer-mode \
- --enable-capzerobypass \
- --enable-intnoise \
+ --with-editline=no \
--enable-xspice \
--enable-cider \
- --disable-xgraph \
- --enable-debug \
- --enable-numparam=yes \
- --enable-dot-global \
+ --disable-debug \
--disable-x \
--with-tcl=/usr/lib/tcl8.4 \
CFLAGS="$(CFLAGS)")
@@ -125,6 +116,10 @@ endif
$(CURDIR)/debian/tmp/usr/share/doc/ngspice-doc/ngspice.ps
# Removing /usr/share/info directory
rm -rf $(CURDIR)/debian/tmp/usr/share/info
+ chmod a+x $(CURDIR)/build/tclspice/examples/tclspice/examples/*/*.tcl
+ mkdir -p build/ngspice/examples/xspice1/
+ cp -a src/xspice/examples/* build/ngspice/examples/xspice1/
+ find build/ngspice/examples/xspice1/ -type f -exec chmod a-x {} \;
# Build architecture-independent files here.
binary-indep: build install
@@ -132,11 +127,10 @@ binary-indep: build install
dh_testroot -i
dh_installdocs -i
dh_install -i --sourcedir=debian/tmp
- #dh_installinfo -i
dh_installman -i
- dh_installexamples -i -pngspice-doc examples/* -Xtclspice
+ dh_installexamples -i -pngspice-doc build/ngspice/examples/* -Xtclspice
dh_installchangelogs ChangeLog -i
- dh_compress -i
+ dh_compress -i --exclude=.tcl --exclude=.cir
dh_fixperms -i
dh_installdeb -i
dh_gencontrol -i
@@ -153,8 +147,7 @@ binary-arch: build install
dh_installexamples -ptclspice examples/tclspice/* -a
dh_install --sourcedir=debian/tmp -a
sed -i "/dependency_libs/ s/'.*'/''/" \
- "$(CURDIR)/debian/tclspice-dev/usr/lib/tcltk/libspice.la"
- #dh_installinfo -a
+ "$(CURDIR)/debian/tclspice/usr/lib/tcltk/libspice.la"
dh_installman -a
dh_link -a
dh_strip -a
diff --git a/debian/tclspice-dev.dirs b/debian/tclspice-dev.dirs
deleted file mode 100644
index 56b7e7b..0000000
--- a/debian/tclspice-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/lib/doc/tclspice-dev
diff --git a/debian/tclspice-dev.install b/debian/tclspice-dev.install
deleted file mode 100644
index b2bf3ae..0000000
--- a/debian/tclspice-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/tcltk/libspice.so usr/lib/tcltk/
-usr/lib/tcltk/libspice.*a usr/lib/tcltk/
diff --git a/debian/tclspice.install b/debian/tclspice.install
index 74cf509..e79b718 100644
--- a/debian/tclspice.install
+++ b/debian/tclspice.install
@@ -1,2 +1,2 @@
-usr/lib/tcltk/libspice*.so.*
+usr/lib/tcltk/libspice.*
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