r44809 - in /packages/ng-spice-rework/trunk/debian: changelog control copyright ngspice-doc.dirs ngspice-doc.install rules tclspice-dev.dirs tclspice-dev.install tclspice.install

gudjon-guest at users.alioth.debian.org gudjon-guest at users.alioth.debian.org
Wed May 16 05:22:45 UTC 2012


Author: gudjon-guest
Date: Wed May 16 05:22:42 2012
New Revision: 44809

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44809
Log:
* 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

Removed:
    packages/ng-spice-rework/trunk/debian/tclspice-dev.dirs
    packages/ng-spice-rework/trunk/debian/tclspice-dev.install
Modified:
    packages/ng-spice-rework/trunk/debian/changelog
    packages/ng-spice-rework/trunk/debian/control
    packages/ng-spice-rework/trunk/debian/copyright
    packages/ng-spice-rework/trunk/debian/ngspice-doc.dirs
    packages/ng-spice-rework/trunk/debian/ngspice-doc.install
    packages/ng-spice-rework/trunk/debian/rules
    packages/ng-spice-rework/trunk/debian/tclspice.install

Modified: packages/ng-spice-rework/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/changelog?rev=44809&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/changelog (original)
+++ packages/ng-spice-rework/trunk/debian/changelog Wed May 16 05:22:42 2012
@@ -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 @@
   * Remove patch 02_fix_spelling.patch. Fixed in upstream
   * Refreshed patch 01_fix_manpages
   * Create patch 02_fix_tcl_examples
+  * 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>  Mon, 23 Apr 2012 12:25:16 +0200
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Wed, 16 May 2012 05:48:17 +0200
 
 ngspice (23-1) unstable; urgency=low
 

Modified: packages/ng-spice-rework/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/control?rev=44809&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/control (original)
+++ packages/ng-spice-rework/trunk/debian/control Wed May 16 05:22:42 2012
@@ -5,7 +5,7 @@
 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
@@ -25,16 +25,6 @@
  .
  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

Modified: packages/ng-spice-rework/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/copyright?rev=44809&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/copyright (original)
+++ packages/ng-spice-rework/trunk/debian/copyright Wed May 16 05:22:42 2012
@@ -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 © 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

Modified: packages/ng-spice-rework/trunk/debian/ngspice-doc.dirs
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/ngspice-doc.dirs?rev=44809&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/ngspice-doc.dirs (original)
+++ packages/ng-spice-rework/trunk/debian/ngspice-doc.dirs Wed May 16 05:22:42 2012
@@ -1,2 +1,2 @@
 usr/share/doc/ngspice-doc/html
-usr/share/doc/ngspice-doc/examples
+usr/share/doc/ngspice-doc/examples/xspice1

Modified: packages/ng-spice-rework/trunk/debian/ngspice-doc.install
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/ngspice-doc.install?rev=44809&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/ngspice-doc.install (original)
+++ packages/ng-spice-rework/trunk/debian/ngspice-doc.install Wed May 16 05:22:42 2012
@@ -1,1 +1,1 @@
-usr/share/doc/ngspice-doc/*
+usr/share/doc/ngspice-doc/*

Modified: packages/ng-spice-rework/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/rules?rev=44809&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/rules (original)
+++ packages/ng-spice-rework/trunk/debian/rules Wed May 16 05:22:42 2012
@@ -38,15 +38,10 @@
 		--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 @@
 		--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 @@
 		$(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 @@
 	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 @@
 	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

Modified: packages/ng-spice-rework/trunk/debian/tclspice.install
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/tclspice.install?rev=44809&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/tclspice.install (original)
+++ packages/ng-spice-rework/trunk/debian/tclspice.install Wed May 16 05:22:42 2012
@@ -1,2 +1,2 @@
-usr/lib/tcltk/libspice*.so.*
+usr/lib/tcltk/libspice.*
 usr/lib/tcltk/ngspice/*




More information about the debian-science-commits mailing list