r47037 - in /packages/qwtplot3d/trunk/debian: changelog control patches/01_makefile.patch rules

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

Author: gudjon-guest
Date: Thu May 21 11:30:44 2015
New Revision: 47037

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47037
Log:
* Bump standards version to 3.9.6
* Replace jquery.js with a symbolic link 
* Fix example makefiles to work with Qt5

Modified:
    packages/qwtplot3d/trunk/debian/changelog
    packages/qwtplot3d/trunk/debian/control
    packages/qwtplot3d/trunk/debian/patches/01_makefile.patch
    packages/qwtplot3d/trunk/debian/rules

Modified: packages/qwtplot3d/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/changelog?rev=47037&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/changelog	(original)
+++ packages/qwtplot3d/trunk/debian/changelog	Thu May 21 11:30:44 2015
@@ -3,10 +3,12 @@
   * 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
 

Modified: packages/qwtplot3d/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/control?rev=47037&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/control	(original)
+++ packages/qwtplot3d/trunk/debian/control	Thu May 21 11:30:44 2015
@@ -4,7 +4,7 @@
 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

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=47037&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/01_makefile.patch	(original)
+++ packages/qwtplot3d/trunk/debian/patches/01_makefile.patch	Thu May 21 11:30:44 2015
@@ -30,13 +30,14 @@
  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 @@
  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 @@
 -}
 \ 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

Modified: packages/qwtplot3d/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/rules?rev=47037&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/rules	(original)
+++ packages/qwtplot3d/trunk/debian/rules	Thu May 21 11:30:44 2015
@@ -58,7 +58,9 @@
 		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