r44797 - 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: Tue May 15 20:18:13 2012
New Revision: 44797

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44797
Log:
* Remove -lGLU from examples/common.pro, Reverting
  last change.
* Add -lGLU to qwtplot3d.pro (Closes: #672873)

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=44797&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/changelog (original)
+++ packages/qwtplot3d/trunk/debian/changelog Tue May 15 20:18:13 2012
@@ -1,3 +1,11 @@
+qwtplot3d (0.2.7+svn191-7) unstable; urgency=low
+
+  * Remove -lGLU from examples/common.pro, Reverting
+    last change.
+  * Add -lGLU to qwtplot3d.pro (Closes: #672873)
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Tue, 15 May 2012 21:54:47 +0200
+
 qwtplot3d (0.2.7+svn191-6) unstable; urgency=low
 
   * Fix ftbs (Closes: #672023, #665750)

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=44797&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/01_makefile.patch (original)
+++ packages/qwtplot3d/trunk/debian/patches/01_makefile.patch Tue May 15 20:18:13 2012
@@ -77,7 +77,14 @@
  TEMPLATE          = lib
  CONFIG           += qt warn_on opengl thread zlib debug
  MOC_DIR           = tmp
-@@ -92,4 +98,4 @@
+@@ -87,9 +93,11 @@
+ SOURCES+=src/qwt3d_io_gl2ps.cpp \
+          3rdparty/gl2ps/gl2ps.c
+ 
++unix:LIBS  += -lGLU
++
+ # zlib support for gl2ps
+ zlib {
    DEFINES += GL2PS_HAVE_ZLIB
    win32:LIBS += zlib.lib
  	unix:LIBS  += -lz

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=44797&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch (original)
+++ packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch Tue May 15 20:18:13 2012
@@ -97,14 +97,3 @@
  
  using namespace Qwt3D;
  
---- a/examples/common.pro
-+++ b/examples/common.pro
-@@ -8,7 +8,7 @@
- linux-g++:QMAKE_CXXFLAGS += -fno-exceptions
- 
- unix{
--  unix:LIBS += -lqwtplot3d-qt4
-+  unix:LIBS += -lqwtplot3d-qt4 -lGLU
-   INCLUDEPATH    += /usr/include/qwtplot3d-qt4
- }
-