r47077 - in /packages/qwtplot3d/trunk/debian: changelog libqwtplot3d-doc.examples patches/02_examples_include.patch rules

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

Author: gudjon-guest
Date: Thu Jul  9 21:34:27 2015
New Revision: 47077

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47077
Log:
Fixing building of examples with Qt5.

Modified:
    packages/qwtplot3d/trunk/debian/changelog
    packages/qwtplot3d/trunk/debian/libqwtplot3d-doc.examples
    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=47077&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/changelog	(original)
+++ packages/qwtplot3d/trunk/debian/changelog	Thu Jul  9 21:34:27 2015
@@ -12,7 +12,7 @@
   * Update build system
   * Add pkg-kde-tools to build system
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sun, 28 Jun 2015 21:54:50 +0200
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Thu, 09 Jul 2015 23:21:39 +0200
 
 qwtplot3d (0.2.7+svn191-7) unstable; urgency=low
 

Modified: packages/qwtplot3d/trunk/debian/libqwtplot3d-doc.examples
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/libqwtplot3d-doc.examples?rev=47077&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/libqwtplot3d-doc.examples	(original)
+++ packages/qwtplot3d/trunk/debian/libqwtplot3d-doc.examples	Thu Jul  9 21:34:27 2015
@@ -1 +1 @@
-build/qt4/examples/*
+examples/*

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=47077&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch	(original)
+++ packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch	Thu Jul  9 21:34:27 2015
@@ -99,14 +99,19 @@
  
 --- a/examples/common.pro
 +++ b/examples/common.pro
-@@ -8,8 +8,8 @@
+@@ -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
-+  INCLUDEPATH    += /usr/include/qwtplot3d-qt$$QT_MAJOR_VERSION
++  greaterThan(QT_MAJOR_VERSION, 4) {
++    INCLUDEPATH    += /usr/include/qwtplot3d
++  }
++  else {
++    INCLUDEPATH    += /usr/include/qwtplot3d-qt4
++  }
  }
  
  DEPENDPATH	= $$INCLUDEPATH

Modified: packages/qwtplot3d/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/rules?rev=47077&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/rules	(original)
+++ packages/qwtplot3d/trunk/debian/rules	Thu Jul  9 21:34:27 2015
@@ -41,8 +41,5 @@
 	cd build-qt4/doc/web/doxygen/ && ln -s /usr/share/javascript/jquery/jquery.js .
 	cp -a build-qt4/doc/web/doxygen/* debian/tmp/usr/share/doc/libqwtplot3d-doc/html
 
-override_dh_compress:
-	dh_compress --exclude=.cpp --exclude=.pri --exclude=.xpm
-
-
-#	dh_compress -i --exclude=.cpp --exclude=.h --exclude=.pro --exclude=.ui
+override_dh_compress-indep:
+	dh_compress --exclude=.cpp --exclude=.pri --exclude=.xpm --exclude=.ui