[qwtplot3d] 19/39: * Bump standards version to 3.9.6 * Replace jquery.js with a symbolic link * Fix example makefiles to work 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 7774d64ab1576f5953ac60a903e516b90af01808
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date:   Thu May 21 11:30:44 2015 +0000

    * Bump standards version to 3.9.6
    * Replace jquery.js with a symbolic link
    * Fix example makefiles to work with Qt5
---
 debian/changelog                 |  4 +++-
 debian/control                   |  2 +-
 debian/patches/01_makefile.patch | 28 ++++++++++++++++++++++++++--
 debian/rules                     |  4 +++-
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 11e87cd..0531bf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,12 @@ qwtplot3d (0.2.7+svn191-8) unstable; urgency=medium
   * Add qt5 library version
   * Add dependency on libqt5opengl5-dev
   * Make svn references canonical
-  * Bump standards version to 3.9.5
+  * Bump standards version to 3.9.6
   * Change debhelper dependency to 9
   * Add hardening flags
   * Add symbols control file
+  * Replace jquery.js with a symbolic link 
+  * Fix example makefiles to work with Qt5
 
  -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Wed, 16 Jul 2014 21:01:54 +0000
 
diff --git a/debian/control b/debian/control
index c52480d..61d4c26 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.
 Uploaders: Gudjon I. Gudjonsson <gudjon at gudjon.org>,
  Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 9), doxygen, libqt4-dev, libqt4-opengl-dev, zlib1g-dev,
- libglu1-mesa-dev | libglu-dev, libqt5opengl5-dev
+ libglu1-mesa-dev | libglu-dev, libqt5opengl5-dev, libjs-jquery
 Standards-Version: 3.9.5
 Section: libs
 Homepage: http://qwtplot3d.sourceforge.net
diff --git a/debian/patches/01_makefile.patch b/debian/patches/01_makefile.patch
index d63583a..66f30b2 100644
--- a/debian/patches/01_makefile.patch
+++ b/debian/patches/01_makefile.patch
@@ -30,13 +30,14 @@ Fixes the makefiles to install according to the Debian FHS
  MAX_DOT_GRAPH_HEIGHT   = 10000
 --- a/examples/common.pro
 +++ b/examples/common.pro
-@@ -3,13 +3,17 @@
+@@ -3,13 +3,18 @@
  UI_DIR = tmp
  MOC_DIR      = tmp
  OBJECTS_DIR  = tmp
 -INCLUDEPATH    += ../../include 
 -DEPENDPATH	= $$INCLUDEPATH
  DESTDIR = ../bin
++QT += widgets
  
 -unix:LIBS += -lqwtplot3d -L../../lib
  linux-g++:QMAKE_CXXFLAGS += -fno-exceptions
@@ -51,7 +52,7 @@ Fixes the makefiles to install according to the Debian FHS
  win32{
    LIBS += ../../lib/qwtplot3d.lib
    TEMPLATE  = vcapp
-@@ -28,7 +32,7 @@
+@@ -28,7 +33,7 @@
  ISQT4 = $$find(MYVERSION, ^[2-9])
  
  !isEmpty( ISQT4 ) {
@@ -91,3 +92,26 @@ Fixes the makefiles to install according to the Debian FHS
 -}
 \ No newline at end of file
 +}
+--- a/examples/mesh2/src/designerworkaround.h
++++ b/examples/mesh2/src/designerworkaround.h
+@@ -1,13 +1,13 @@
+ #ifndef designerworkaround_h__2005_07_10_10_46_begin_guarded_code
+ #define designerworkaround_h__2005_07_10_10_46_begin_guarded_code
+ 
+-#include <QtGui/QMenu>
+-#include <QtGui/QToolBar>
+-#include <QtGui/QAction>
+-#include <QtGui/QActionGroup>
+-#include <QtGui/QMainWindow>
+-#include <QtGui/QComboBox>
+-#include <QtGui/QMenuBar>
++#include <QMenu>
++#include <QToolBar>
++#include <QAction>
++#include <QActionGroup>
++#include <QMainWindow>
++#include <QComboBox>
++#include <QMenuBar>
+ 
+ 
+ class DesignerWorkaround
diff --git a/debian/rules b/debian/rules
index 992e0a5..a8cc083 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,9 @@ install: build
 		cd $(CURDIR)/; \
 	done
 	mkdir -p debian/tmp/usr/share/doc/libqwtplot3d-doc/html
-	cp build/qt4/doc/web/doxygen/* debian/tmp/usr/share/doc/libqwtplot3d-doc/html
+	rm -f build/qt4/doc/web/doxygen/jquery.js
+	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
 
 binary: binary-indep binary-arch
 binary-indep: build install

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