r47211 - in /packages/qwtplot3d/trunk/debian: changelog control rules

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

Author: gudjon-guest
Date: Thu Mar 24 14:03:15 2016
New Revision: 47211

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47211
Log:
* Disable qt5 library on architectures armel and armhf. 
  It doesn't compile on these architectures because of opengl problems.
* Bump standards version to 3.9.7,no changes needed.
* Change VCS field to https
* Change hardening to +all

Modified:
    packages/qwtplot3d/trunk/debian/changelog
    packages/qwtplot3d/trunk/debian/control
    packages/qwtplot3d/trunk/debian/rules

Modified: packages/qwtplot3d/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/changelog?rev=47211&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/changelog	(original)
+++ packages/qwtplot3d/trunk/debian/changelog	Thu Mar 24 14:03:15 2016
@@ -1,3 +1,13 @@
+qwtplot3d (0.2.7+svn191-10) unstable; urgency=medium
+
+  * Disable qt5 library on architectures armel and armhf. 
+    It doesn't compile on these architectures because of opengl problems.
+  * Bump standards version to 3.9.7,no changes needed.
+  * Change VCS field to https
+  * Change hardening to +all
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Thu, 24 Mar 2016 14:01:55 +0100
+
 qwtplot3d (0.2.7+svn191-9) unstable; urgency=medium
 
   * Add Qt5 library

Modified: packages/qwtplot3d/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/control?rev=47211&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/control	(original)
+++ packages/qwtplot3d/trunk/debian/control	Thu Mar 24 14:03:15 2016
@@ -12,11 +12,11 @@
                pkg-kde-tools,
                zlib1g-dev,
                libqt5opengl5-dev
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Section: libs
 Homepage: http://qwtplot3d.sourceforge.net
 Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/qwtplot3d/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/debian-science/packages/qwtplot3d/trunk
+Vcs-Browser: https://anonscm.debian.org/viewvc/debian-science/packages/qwtplot3d/trunk
 
 Package: libqwtplot3d-qt4-dev
 Section: libdevel
@@ -46,7 +46,7 @@
 
 Package: libqwtplot3d-qt5-dev
 Section: libdevel
-Architecture: any
+Architecture: any-amd64 any-i386 arm64 mips mipsel powerpc ppc64el s390x alpha hppa m68k mips64el ppc64 sh4 sparc64 x32
 Depends: libqwtplot3d-qt5-0 (= ${binary:Version}), ${misc:Depends}
 Description: 3D plotting library based on Qt5/OpenGL (development)
  QwtPlot3D is a feature rich Qt/OpenGL-based C++ programming
@@ -56,7 +56,7 @@
  This package contains the QwtPlot3D development files for Qt5.
 
 Package: libqwtplot3d-qt5-0
-Architecture: any
+Architecture: any-amd64 any-i386 arm64 mips mipsel powerpc ppc64el s390x alpha hppa m68k mips64el ppc64 sh4 sparc64 x32
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: 3D plotting library based on Qt5/OpenGL (runtime)
  QwtPlot3D is a feature rich Qt/OpenGL-based C++ programming

Modified: packages/qwtplot3d/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/rules?rev=47211&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/rules	(original)
+++ packages/qwtplot3d/trunk/debian/rules	Thu Mar 24 14:03:15 2016
@@ -3,7 +3,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify
+ifneq (,$(findstring qt5, $(shell dh_listpackages)))
+    BUILD_qt5 := yes
+else
+    BUILD_qt5 :=
+endif
+
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
@@ -17,11 +23,11 @@
 	mkdir -p build-qt4 build-qt5
 	cp -a doc build-qt4/
 	QT_SELECT=qt4 dh_auto_configure --builddirectory=build-qt4 -- ../qwtplot3d.pro
-	QT_SELECT=qt5 dh_auto_configure --builddirectory=build-qt5 -- ../qwtplot3d.pro
+	$(if $(BUILD_qt5), QT_SELECT=qt5 dh_auto_configure --builddirectory=build-qt5 -- ../qwtplot3d.pro,)
 
 override_dh_auto_build:
 	dh_auto_build --builddirectory=build-qt4
-	dh_auto_build --builddirectory=build-qt5
+	$(if $(BUILD_qt5), dh_auto_build --builddirectory=build-qt5,)
 	cd build-qt4/doc && doxygen Doxyfile.doxygen
 
 override_dh_auto_clean:
@@ -33,7 +39,7 @@
 	dh_auto_install --builddirectory=build-qt4
 	mkdir -p debian/tmp/usr/include/qwtplot3d
 	cp -a include/* debian/tmp/usr/include/qwtplot3d
-	dh_auto_install --builddirectory=build-qt5
+	$(if $(BUILD_qt5), dh_auto_install --builddirectory=build-qt5,)
 	find debian/tmp/usr -type f -name '*.md5' -exec rm -vf {} \;
 	find debian/tmp/usr -type f -name '*.js' -exec rm -vf {} \;
 	mkdir -p debian/tmp/usr/share/doc/libqwtplot3d-doc/html