[qwtplot3d] 08/39: Remove qt3 related things from patches

[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 4708ede7620d84209db89da42260313b7e0d4267
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date:   Thu Mar 3 08:55:35 2011 +0000

    Remove qt3 related things from patches
---
 debian/changelog                         |  3 ++-
 debian/patches/01_makefile.patch         | 25 ++++++++++++-------------
 debian/patches/02_examples_include.patch | 11 +++++++++++
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 774a6fe..5aff016 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ qwtplot3d (0.2.7+svn191-5) unstable; urgency=low
   * Add watch file
   * Add misc Depends
   * Add doc-base file
+  * Remove qt3 related things from patches
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Thu, 03 Mar 2011 09:25:03 +0100
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Thu, 03 Mar 2011 09:47:22 +0100
 
 qwtplot3d (0.2.7+svn191-4) unstable; urgency=low
 
diff --git a/debian/patches/01_makefile.patch b/debian/patches/01_makefile.patch
index 590d5d0..cbb5353 100644
--- a/debian/patches/01_makefile.patch
+++ b/debian/patches/01_makefile.patch
@@ -30,29 +30,28 @@ Fixes the makefiles to install according to the Debian FHS
  MAX_DOT_GRAPH_HEIGHT   = 10000
 --- a/examples/common.pro
 +++ b/examples/common.pro
-@@ -3,11 +3,19 @@
+@@ -3,13 +3,17 @@
  UI_DIR = tmp
  MOC_DIR      = tmp
  OBJECTS_DIR  = tmp
 -INCLUDEPATH    += ../../include 
-++VVERSION = $$[QT_VERSION]
-+isEmpty(VVERSION) {
-+    # Qt 3
-+    INCLUDEPATH    += /usr/include/qwtplot3d-qt3
-+    unix:LIBS += -lqwtplot3d-qt3
-+} else {
-+    # Qt 4
-+    INCLUDEPATH    += /usr/include/qwtplot3d-qt4
-+    unix:LIBS += -lqwtplot3d-qt4
-+}
- DEPENDPATH	= $$INCLUDEPATH
+-DEPENDPATH	= $$INCLUDEPATH
  DESTDIR = ../bin
  
 -unix:LIBS += -lqwtplot3d -L../../lib
  linux-g++:QMAKE_CXXFLAGS += -fno-exceptions
  
++unix{
++  unix:LIBS += -lqwtplot3d-qt4
++  INCLUDEPATH    += /usr/include/qwtplot3d-qt4
++}
++
++DEPENDPATH	= $$INCLUDEPATH
++
  win32{
-@@ -28,7 +36,7 @@
+   LIBS += ../../lib/qwtplot3d.lib
+   TEMPLATE  = vcapp
+@@ -28,7 +32,7 @@
  ISQT4 = $$find(MYVERSION, ^[2-9])
  
  !isEmpty( ISQT4 ) {
diff --git a/debian/patches/02_examples_include.patch b/debian/patches/02_examples_include.patch
index 1566846..2bbc029 100644
--- a/debian/patches/02_examples_include.patch
+++ b/debian/patches/02_examples_include.patch
@@ -86,3 +86,14 @@ Change include directory from local to system wide
  
  
  #if QT_VERSION < 0x040000
+--- a/examples/enrichments/src/enrichmentmainwindow.cpp
++++ b/examples/enrichments/src/enrichmentmainwindow.cpp
+@@ -6,7 +6,7 @@
+ 
+ #include "enrichmentmainwindow.h"
+ #include "enrichments.h"
+-#include "../../../include/qwt3d_function.h"
++#include <qwt3d_function.h>
+ 
+ using namespace Qwt3D;
+ 

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