[qwtplot3d] 15/39: * Remove -lGLU from examples/common.pro, Reverting last change. * Add -lGLU to qwtplot3d.pro (Closes: #672873)

[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 5fd24d0e2aca62fc9cbfdc361681a0548330f698
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date:   Tue May 15 20:18:13 2012 +0000

    * Remove -lGLU from examples/common.pro, Reverting
      last change.
    * Add -lGLU to qwtplot3d.pro (Closes: #672873)
---
 debian/changelog                         |  8 ++++++++
 debian/patches/01_makefile.patch         |  9 ++++++++-
 debian/patches/02_examples_include.patch | 11 -----------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 215bc77..575fa65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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)
diff --git a/debian/patches/01_makefile.patch b/debian/patches/01_makefile.patch
index cbb5353..4e9f052 100644
--- a/debian/patches/01_makefile.patch
+++ b/debian/patches/01_makefile.patch
@@ -77,7 +77,14 @@ Fixes the makefiles to install according to the Debian FHS
  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
diff --git a/debian/patches/02_examples_include.patch b/debian/patches/02_examples_include.patch
index 5c0531c..2bbc029 100644
--- a/debian/patches/02_examples_include.patch
+++ b/debian/patches/02_examples_include.patch
@@ -97,14 +97,3 @@ Change include directory from local to system wide
  
  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
- }
- 

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