[qwtplot3d] 23/39: Fixing building of examples with Qt5.

[Andreas Tille]

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

tille pushed a commit to branch master
in repository qwtplot3d.

commit 3458c94f3ff34effed4f1485dfcc9d4c7ad68f1b
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date:   Thu Jul 9 21:34:27 2015 +0000

    Fixing building of examples with Qt5.
---
 debian/changelog                         | 2 +-
 debian/libqwtplot3d-doc.examples         | 2 +-
 debian/patches/02_examples_include.patch | 9 +++++++--
 debian/rules                             | 7 ++-----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe26183..b706e1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ qwtplot3d (0.2.7+svn191-8) unstable; urgency=medium
   * 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
 
diff --git a/debian/libqwtplot3d-doc.examples b/debian/libqwtplot3d-doc.examples
index 3ea00ce..e39721e 100644
--- a/debian/libqwtplot3d-doc.examples
+++ b/debian/libqwtplot3d-doc.examples
@@ -1 +1 @@
-build/qt4/examples/*
+examples/*
diff --git a/debian/patches/02_examples_include.patch b/debian/patches/02_examples_include.patch
index ff1ae9c..2bc2dc8 100644
--- a/debian/patches/02_examples_include.patch
+++ b/debian/patches/02_examples_include.patch
@@ -99,14 +99,19 @@ Change include directory from local to system wide
  
 --- 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
diff --git a/debian/rules b/debian/rules
index 4c5bdcb..ec18a53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,8 +41,5 @@ override_dh_auto_install:
 	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

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