[ngspice] 53/61: Change to unstable.

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository ngspice.

commit 0e91915af2455b91d5633239b2e5d01849a8dfc9
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date:   Thu Jul 3 09:35:30 2014 +0000

    Change to unstable.
---
 debian/changelog |  2 +-
 debian/control   |  2 +-
 debian/rules     | 17 +++++++++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fc38fbb..37fdbfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index d077b7a..452dd3c 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Description: Spice circuit simulator
 
 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
diff --git a/debian/rules b/debian/rules
index 8d30b6d..92d3567 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ config.status-stamp:
 	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 @@ config.status-stamp:
 		--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 @@ config.status-stamp:
 		--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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ngspice.git