r46784 - in /packages/ng-spice-rework/trunk/debian: changelog control rules

[gudjon-guest at users.alioth.debian.org]

Author: gudjon-guest
Date: Thu Jul  3 09:35:30 2014
New Revision: 46784

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46784
Log:
Change to unstable.

Modified:
    packages/ng-spice-rework/trunk/debian/changelog
    packages/ng-spice-rework/trunk/debian/control
    packages/ng-spice-rework/trunk/debian/rules

Modified: packages/ng-spice-rework/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/changelog?rev=46784&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/changelog	(original)
+++ packages/ng-spice-rework/trunk/debian/changelog	Thu Jul  3 09:35:30 2014
@@ -1,4 +1,4 @@
-ngspice (26-1) UNRELEASED; urgency=low
+ngspice (26-1) unstable; urgency=low
 
   * New upstream release (Closes: #706821)
   * Bump standards version to 3.9.5

Modified: packages/ng-spice-rework/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/control?rev=46784&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/control	(original)
+++ packages/ng-spice-rework/trunk/debian/control	Thu Jul  3 09:35:30 2014
@@ -28,7 +28,7 @@
 
 Package: tclspice
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ngspice, blt, tcl8.4, tk8.4
+Depends: ${shlibs:Depends}, ${misc:Depends}, ngspice, blt, tcl8.6, tk8.6
 Replaces: tclspice-dev
 Breaks: tclspice-dev
 Description: NGspice library for Tcl

Modified: packages/ng-spice-rework/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/ng-spice-rework/trunk/debian/rules?rev=46784&op=diff
==============================================================================
--- packages/ng-spice-rework/trunk/debian/rules	(original)
+++ packages/ng-spice-rework/trunk/debian/rules	Thu Jul  3 09:35:30 2014
@@ -4,7 +4,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_BUILD_HARDENING=1
+export CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
+export CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+export CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
+export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -36,6 +40,7 @@
 	cp -f /usr/share/misc/config.guess build/tclspice/config.guess
 	# Configure ngspice
 	(cd build/ngspice;\
+	CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" \
 	./configure $(CROSS) \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
@@ -43,12 +48,10 @@
 		--with-editline=yes \
 		--enable-xspice \
 		--enable-cider \
-		--disable-debug \
-		CFLAGS="$(CFLAGS) -fPIC" \
-		LDFLAGS="$(LDFLAGS)")
-	#LDFLAGS="-Wl,-z,defs")
+		--disable-debug)
 	# Configure tclspice
 	(cd build/tclspice;\
+	CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS) -lBLT -ltcl8.6" \
 	./configure $(CROSS) \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
@@ -60,9 +63,7 @@
 		--enable-cider \
 		--disable-debug \
 		--disable-x \
-		--with-tcl=/usr/lib/tcl8.6 \
-		CFLAGS="$(CFLAGS) -fPIC" \
-		LDFLAGS="$(LDFLAGS) -lBLT -ltcl8.6")
+		--with-tcl=/usr/lib/tcl8.6)
 	touch $@
 
 build: build-arch build-indep