r44727 - in /packages/ng-spice-rework/trunk/debian: changelog control ngspice.dirs ngspice.install patches/ rules tclspice.dirs tclspice.install

Sun Apr 22 21:10:01 UTC 2012

Author: gudjon-guest
Date: Sun Apr 22 21:10:01 2012
New Revision: 44727

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

Removed:
    packages/ng-spice-rework/trunk/debian/patches/
Modified:
    packages/ng-spice-rework/trunk/debian/changelog
    packages/ng-spice-rework/trunk/debian/control
    packages/ng-spice-rework/trunk/debian/ngspice.dirs
    packages/ng-spice-rework/trunk/debian/ngspice.install
    packages/ng-spice-rework/trunk/debian/rules
    packages/ng-spice-rework/trunk/debian/tclspice.dirs
    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=44727&op=diff
==============================================================================

--- packages/ng-spice-rework/trunk/debian/changelog (original)
+++ packages/ng-spice-rework/trunk/debian/changelog Sun Apr 22 21:10:01 2012
@@ -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

Modified: packages/ng-spice-rework/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/control?rev=44727&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/control (original)
+++ packages/ng-spice-rework/trunk/debian/control Sun Apr 22 21:10:01 2012
@@ -38,7 +38,7 @@
 
 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

Modified: packages/ng-spice-rework/trunk/debian/ngspice.dirs
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/ngspice.dirs?rev=44727&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/ngspice.dirs (original)
+++ packages/ng-spice-rework/trunk/debian/ngspice.dirs Sun Apr 22 21:10:01 2012
@@ -1,5 +1,5 @@
 usr/bin
-usr/lib/spice
+usr/lib/ngspice
 #usr/share/info
 usr/share/man
 usr/share/ngspice

Modified: packages/ng-spice-rework/trunk/debian/ngspice.install
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/ngspice.install?rev=44727&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/ngspice.install (original)
+++ packages/ng-spice-rework/trunk/debian/ngspice.install Sun Apr 22 21:10:01 2012
@@ -1,5 +1,5 @@
 usr/bin/*
-usr/lib/spice/*
+usr/lib/ngspice/*
 #usr/share/info/*
 usr/share/man/*
 usr/share/ngspice/*

Modified: packages/ng-spice-rework/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/rules?rev=44727&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/rules (original)
+++ packages/ng-spice-rework/trunk/debian/rules Sun Apr 22 21:10:01 2012
@@ -104,12 +104,14 @@
 	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:

Modified: packages/ng-spice-rework/trunk/debian/tclspice.dirs
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/tclspice.dirs?rev=44727&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/tclspice.dirs (original)
+++ packages/ng-spice-rework/trunk/debian/tclspice.dirs Sun Apr 22 21:10:01 2012
@@ -1,2 +1,2 @@
-usr/lib/tcltk/spice
+usr/lib/tcltk/ngspice
 usr/share/doc/tclspice/examples

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=44727&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/tclspice.install (original)
+++ packages/ng-spice-rework/trunk/debian/tclspice.install Sun Apr 22 21:10:01 2012
@@ -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/*


