[libterralib] 04/05: Prep -6 for qwt transition

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/4.3.0+dfsg.2-6
in repository libterralib.

commit 8ffcc85a593d11e7eae816785d130838f6e77b5c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Mar 8 12:46:01 2016 +0000

    Prep -6 for qwt transition
---
 debian/changelog | 3 +--
 debian/control   | 3 ++-
 debian/rules     | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae18500..5f55fb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,7 @@
-libterralib (4.3.0+dfsg.2-6) UNRELEASED; urgency=medium
+libterralib (4.3.0+dfsg.2-6) unstable; urgency=medium
 
   * Build with libqwt-qt5-dev, don't mix qt4. Closes: #814857.
   * Fix Typo in debian/rules includes;  thanks to Dmitry Shachnev
-  * Enable qwt, TerraView libs
 
  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 07 Mar 2016 00:51:24 +0000
 
diff --git a/debian/control b/debian/control
index 45a92cf..b28b17e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,8 @@ Build-Depends: debhelper (>= 9),
                libshp-dev,
    	       libdxflib-dev (>= 3.12.2),
                libmysqlclient-dev,
-               libpq-dev
+               libpq-dev,
+               firebird-dev
 Standards-Version: 3.9.7
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/libterralib.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/libterralib.git
diff --git a/debian/rules b/debian/rules
index 33f17ff..02f7fbe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,9 +28,10 @@ override_dh_auto_build:
 	for d in terralib te_functions te_utils image_processing PostgreSQL MySQL shapelib stat te_dxf te_shapelib   ; do \
 		( cd build/qt4/$$d  && qmake QMAKE_CXXFLAGS=$(CXXFLAGS) $$d.pro     && $(MAKE) ) ; \
 		done
-	for d in qwt ; do \
-		( cd build/qt/$$d  && qmake QMAKE_CXXFLAGS=$(CXXFLAGS) $$d.pro     && $(MAKE) ) ; \
-		done
+	# Disable qwt, terraView work until after libqwt-qt5-dev transition
+	#for d in qwt ; do \
+	#	( cd build/qt/$$d  && qmake QMAKE_CXXFLAGS=$(CXXFLAGS) $$d.pro     && $(MAKE) ) ; \
+	#	done
 	for d in terralib te_functions te_utils terralibpdi shapelib te_shapelib te_mysql te_postgresql te_dxf stat ; do \
 		ar rcs Release/lib$$d.a Release/linux-g++/obj/$$d/*.o ;\
 		done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git