r38149 - in /packages/qwtplot3d/trunk/debian: changelog patches/01_makefile.patch patches/02_examples_include.patch

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

Author: gudjon-guest
Date: Thu Mar  3 08:55:35 2011
New Revision: 38149

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38149
Log:
Remove qt3 related things from patches

Modified:
    packages/qwtplot3d/trunk/debian/changelog
    packages/qwtplot3d/trunk/debian/patches/01_makefile.patch
    packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch

Modified: packages/qwtplot3d/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/changelog?rev=38149&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/changelog (original)
+++ packages/qwtplot3d/trunk/debian/changelog Thu Mar  3 08:55:35 2011
@@ -10,8 +10,9 @@
   * 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
 

Modified: packages/qwtplot3d/trunk/debian/patches/01_makefile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/patches/01_makefile.patch?rev=38149&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/01_makefile.patch (original)
+++ packages/qwtplot3d/trunk/debian/patches/01_makefile.patch Thu Mar  3 08:55:35 2011
@@ -30,29 +30,28 @@
  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 ) {

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=38149&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch (original)
+++ packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch Thu Mar  3 08:55:35 2011
@@ -86,3 +86,14 @@
  
  
  #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;
+