r47116 - in /packages/qwtplot3d/trunk/debian: changelog control libqwtplot3d-qt5-0.install libqwtplot3d-qt5-0.symbols libqwtplot3d-qt5-dev.install patches/02_examples_include.patch rules

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

Author: gudjon-guest
Date: Wed Sep  2 06:22:31 2015
New Revision: 47116

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47116
Log:
Removed Qt5 library. Will be added after gcc5 transition.

Removed:
    packages/qwtplot3d/trunk/debian/libqwtplot3d-qt5-0.install
    packages/qwtplot3d/trunk/debian/libqwtplot3d-qt5-0.symbols
    packages/qwtplot3d/trunk/debian/libqwtplot3d-qt5-dev.install
Modified:
    packages/qwtplot3d/trunk/debian/changelog
    packages/qwtplot3d/trunk/debian/control
    packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch
    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=47116&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/changelog	(original)
+++ packages/qwtplot3d/trunk/debian/changelog	Wed Sep  2 06:22:31 2015
@@ -1,18 +1,15 @@
 qwtplot3d (0.2.7+svn191-8) unstable; urgency=medium
 
-  * Add qt5 library version
-  * Add dependency on libqt5opengl5-dev
   * Make svn references canonical
   * Bump standards version to 3.9.6
   * Change debhelper dependency to 9
   * Add hardening flags
   * Add symbols control file
-  * Fix example makefiles to work with Qt5
   * Update build system
   * Add pkg-kde-tools to build system
   * Change qt4 package name to libqwtplot3d-qt4-0v5 (Closes:  #791264)
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Tue, 01 Sep 2015 18:49:04 +0100
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Wed, 02 Sep 2015 07:04:48 +0100
 
 qwtplot3d (0.2.7+svn191-7) unstable; urgency=low
 

Modified: packages/qwtplot3d/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/control?rev=47116&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/control	(original)
+++ packages/qwtplot3d/trunk/debian/control	Wed Sep  2 06:22:31 2015
@@ -9,7 +9,6 @@
                libjs-jquery,
                libqt4-dev,
                libqt4-opengl-dev,
-               libqt5opengl5-dev,
                pkg-kde-tools,
                zlib1g-dev
 Standards-Version: 3.9.6
@@ -44,28 +43,6 @@
  This package contains the files necessary for running applications that
  use the QwtPlot3D library and Qt4.
 
-Package: libqwtplot3d-qt5-dev
-Section: libdevel
-Architecture: any
-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
- library, providing essentially a bunch of 3D-widgets for
- programmers.
- .
- This package contains the QwtPlot3D development files for Qt5.
-
-Package: libqwtplot3d-qt5-0
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: 3D plotting library based on Qt5/OpenGL (runtime)
- QwtPlot3D is a feature rich Qt/OpenGL-based C++ programming
- library, providing essentially a bunch of 3D-widgets for
- programmers.
- .
- This package contains the files necessary for running applications that
- use the QwtPlot3D library and Qt5.
-
 Package: libqwtplot3d-doc
 Section: doc
 Architecture: all

Modified: packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch?rev=47116&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch	(original)
+++ packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch	Wed Sep  2 06:22:31 2015
@@ -97,24 +97,6 @@
  
  using namespace Qwt3D;
  
---- a/examples/common.pro
-+++ b/examples/common.pro
-@@ -9,8 +9,13 @@
- linux-g++:QMAKE_CXXFLAGS += -fno-exceptions
- 
- unix{
--  unix:LIBS += -lqwtplot3d-qt4
--  INCLUDEPATH    += /usr/include/qwtplot3d-qt4
-+  unix:LIBS += -lqwtplot3d-qt$$QT_MAJOR_VERSION
-+  greaterThan(QT_MAJOR_VERSION, 4) {
-+    INCLUDEPATH    += /usr/include/qwtplot3d
-+  }
-+  else {
-+    INCLUDEPATH    += /usr/include/qwtplot3d-qt4
-+  }
- }
- 
- DEPENDPATH	= $$INCLUDEPATH
 --- a/qwtplot3d.pro
 +++ b/qwtplot3d.pro
 @@ -1,10 +1,10 @@

Modified: packages/qwtplot3d/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/rules?rev=47116&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/rules	(original)
+++ packages/qwtplot3d/trunk/debian/rules	Wed Sep  2 06:22:31 2015
@@ -14,14 +14,12 @@
 	dh $@ --parallel --list-missing --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	mkdir -p build-qt4 build-qt5
+	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
 
 override_dh_auto_build:
 	dh_auto_build --builddirectory=build-qt4
-	dh_auto_build --builddirectory=build-qt5
 	cd build-qt4/doc && doxygen Doxyfile.doxygen
 
 override_dh_auto_clean:
@@ -33,7 +31,6 @@
 	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
 	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