r37426 - in /packages/qwtplot3d/trunk/debian: ./ patches/ source/
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Sat Feb 26 09:32:47 UTC 2011
Author: gudjon-guest
Date: Sat Feb 26 09:32:46 2011
New Revision: 37426
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=37426
Log:
* Remove qt3 support (Closes: #604380)
* Bump standards version to 3.9.1
* Remove README.source
* Switch to dpkg-source 3.0 (quilt) format
* Rewrite patches in quilt format
* Add dependency on zlib1g-dev
Added:
packages/qwtplot3d/trunk/debian/patches/01_makefile.patch
packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch
packages/qwtplot3d/trunk/debian/patches/03_fix_ftbs.patch
packages/qwtplot3d/trunk/debian/patches/series
packages/qwtplot3d/trunk/debian/source/
packages/qwtplot3d/trunk/debian/source/format
Removed:
packages/qwtplot3d/trunk/debian/README.source
packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3-0.install
packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3-dev.install
packages/qwtplot3d/trunk/debian/patches/00list
packages/qwtplot3d/trunk/debian/patches/01_makefile.dpatch
packages/qwtplot3d/trunk/debian/patches/02_examples_include.dpatch
packages/qwtplot3d/trunk/debian/patches/03_fix_ftbs.dpatch
Modified:
packages/qwtplot3d/trunk/debian/README.Debian
packages/qwtplot3d/trunk/debian/changelog
packages/qwtplot3d/trunk/debian/control
packages/qwtplot3d/trunk/debian/rules
Modified: packages/qwtplot3d/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/README.Debian?rev=37426&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/README.Debian (original)
+++ packages/qwtplot3d/trunk/debian/README.Debian Sat Feb 26 09:32:46 2011
@@ -2,15 +2,14 @@
------------------
A postfix has been added to the library names according to the version of Qt:
-* libqwtplot3d-qt3.so* is QwtPlot3D 0.2.6 compiled against Qt3
* libqwtplot3d-qt4.so* is QwtPlot3D 0.2.6 compiled against Qt4
In that way, all these qwt libraries can coexist but you can only have a single
development package for each Qt version or in other words. You need to choose
between libqwt-qt3-dev (Qwt5) and libqwt-dev (Qwt4).
+The Qt3 support has now been dropped in Debian.
The include files are placed in the following directories:
-* /usr/include/qwtplot3d-qt3.so* for QwtPlot3D 0.2.6 (Qt3 version)
* /usr/include/qwtplot3d-qt3.so* for QwtPlot3D 0.2.6 (Qt4 version)
If you have a precompiled binary file, linked against libqwt then you may need to add
@@ -20,7 +19,7 @@
following steps:
$cp -r /usr/share/doc/libqwtplot3d-doc/examples .
$cd examples
-$qmake-qt(3 or 4) examples.pro
+$qmake-qt4 examples.pro
$make
The sources for gl2ps are in the source tree but it is not compiled. Please refer to
Modified: packages/qwtplot3d/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/changelog?rev=37426&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/changelog (original)
+++ packages/qwtplot3d/trunk/debian/changelog Sat Feb 26 09:32:46 2011
@@ -1,3 +1,14 @@
+qwtplot3d (0.2.7+svn191-5) UNRELEASED; urgency=low
+
+ * Remove qt3 support (Closes: #604380)
+ * Bump standards version to 3.9.1
+ * Remove README.source
+ * Switch to dpkg-source 3.0 (quilt) format
+ * Rewrite patches in quilt format
+ * Add dependency on zlib1g-dev
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Sat, 26 Feb 2011 10:32:16 +0100
+
qwtplot3d (0.2.7+svn191-4) unstable; urgency=low
* Add conflicts and replaces on the old packages libqwtplot3d-qt{3,4}
Modified: packages/qwtplot3d/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/control?rev=37426&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/control (original)
+++ packages/qwtplot3d/trunk/debian/control Sat Feb 26 09:32:46 2011
@@ -3,39 +3,13 @@
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Gudjon I. Gudjonsson <gudjon at gudjon.org>,
Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7), dpatch, doxygen, libqt3-mt-dev, libqt4-dev,
- libqt4-opengl-dev
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7), doxygen, libqt4-dev, libqt4-opengl-dev, zlib1g-dev
+Standards-Version: 3.9.1
Section: libs
Homepage: http://qwtplot3d.sourceforge.net
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/qwtplot3d/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/qwtplot3d/trunk
DM-Upload-Allowed: yes
-
-Package: libqwtplot3d-qt3-dev
-Section: libdevel
-Architecture: any
-Depends: libqwtplot3d-qt3-0 (= ${binary:Version}), libqt3-mt-dev
-Description: 3D plotting library based on Qt3/OpenGL (development)
- QwtPlot3D is a feature rich Qt/OpenGL-based C++ programming
- library, providing essentially a bunch of 3D-widgets for
- programmers.
- .
- This package contains the QwtPlot3D development files for Qt3.
-
-Package: libqwtplot3d-qt3-0
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libqwtplot3d-qt3
-Replaces: libqwtplot3d-qt3
-Description: 3D plotting library based on Qt3/OpenGL (runtime)
- QwtPlot3D is a feature rich Qt/OpenGL-based C++ programming
- library, providing essentially a bunch of 3D-widgets for
- programmers.
- .
- This package contains the files necessary for running applications that
- use the QwtPlot3D library and Qt3.
Package: libqwtplot3d-qt4-dev
Section: libdevel
Added: 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=37426&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/01_makefile.patch (added)
+++ packages/qwtplot3d/trunk/debian/patches/01_makefile.patch Sat Feb 26 09:32:46 2011
@@ -1,0 +1,87 @@
+Fixes the makefiles to install according to the Debian FHS
+--- a/doc/Doxyfile.doxygen
++++ b/doc/Doxyfile.doxygen
+@@ -116,7 +116,7 @@
+ HTML_ALIGN_MEMBERS = YES
+ GENERATE_HTMLHELP = NO
+ CHM_FILE = qwtplot3d.chm
+-HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe"
++#HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe"
+ GENERATE_CHI = NO
+ BINARY_TOC = YES
+ TOC_EXPAND = YES
+@@ -181,7 +181,7 @@
+ MACRO_EXPANSION = NO
+ EXPAND_ONLY_PREDEF = NO
+ SEARCH_INCLUDES = YES
+-INCLUDE_PATH = V:/cvs/qwtplot3d/include/
++INCLUDE_PATH = ../include/
+ INCLUDE_FILE_PATTERNS = *.h
+ PREDEFINED = QWT3D_NOT_FOR_DOXYGEN \
+ QT_VERSION=0x040000
+@@ -212,7 +212,7 @@
+ GRAPHICAL_HIERARCHY = YES
+ DIRECTORY_GRAPH = YES
+ DOT_IMAGE_FORMAT = png
+-DOT_PATH = V:/graphviz/Graphviz/bin/
++#DOT_PATH = V:/graphviz/Graphviz/bin/
+ DOTFILE_DIRS =
+ MAX_DOT_GRAPH_WIDTH = 974
+ MAX_DOT_GRAPH_HEIGHT = 10000
+--- a/examples/common.pro
++++ b/examples/common.pro
+@@ -3,11 +3,19 @@
+ 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
+ DESTDIR = ../bin
+
+-unix:LIBS += -lqwtplot3d -L../../lib
+ linux-g++:QMAKE_CXXFLAGS += -fno-exceptions
+
+ win32{
+@@ -28,7 +36,7 @@
+ ISQT4 = $$find(MYVERSION, ^[2-9])
+
+ !isEmpty( ISQT4 ) {
+-RESOURCES = ../images.qrc
++#RESOURCES = ../images.qrc
+ QT += opengl
+ }
+
+--- a/qwtplot3d.pro
++++ b/qwtplot3d.pro
+@@ -1,7 +1,13 @@
+ # pro file for building the makefile for qwtplot3d
+ #
+
+-TARGET = qwtplot3d
++TARGET = qwtplot3d-qt4
++# Install directives
++INSTALLBASE = /usr
++headers.path = $$INSTALLBASE/include/qwtplot3d-qt4
++headers.files = $$HEADERS
++target.path = $$INSTALLBASE/lib
++INSTALLS = doc headers target
+ TEMPLATE = lib
+ CONFIG += qt warn_on opengl thread zlib debug
+ MOC_DIR = tmp
+@@ -92,4 +98,4 @@
+ DEFINES += GL2PS_HAVE_ZLIB
+ win32:LIBS += zlib.lib
+ unix:LIBS += -lz
+-}
+\ No newline at end of file
++}
Added: 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=37426&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch (added)
+++ packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch Sat Feb 26 09:32:46 2011
@@ -1,0 +1,87 @@
+--- a/examples/axes/src/axesmainwindow.cpp
++++ b/examples/axes/src/axesmainwindow.cpp
+@@ -9,7 +9,7 @@
+
+ #include "axes.h"
+ #include "axesmainwindow.h"
+-#include "../../../include/qwt3d_function.h"
++#include <qwt3d_function.h>
+
+ using namespace std;
+ using namespace Qwt3D;
+--- a/examples/mesh2/src/colormapreader.h
++++ b/examples/mesh2/src/colormapreader.h
+@@ -5,7 +5,7 @@
+ #include <qframe.h>
+ #include <qpixmap.h>
+
+-#include "../../../include/qwt3d_types.h"
++#include <qwt3d_types.h>
+
+ #if QT_VERSION < 0x040000
+
+--- a/examples/mesh2/src/functions.h
++++ b/examples/mesh2/src/functions.h
+@@ -2,8 +2,8 @@
+ #define __EXAMPLE_H__
+
+ #include <math.h>
+-#include "../../../include/qwt3d_parametricsurface.h"
+-#include "../../../include/qwt3d_function.h"
++#include <qwt3d_parametricsurface.h>
++#include <qwt3d_function.h>
+
+ using namespace Qwt3D;
+
+--- a/examples/mesh2/src/lightingdlg.h
++++ b/examples/mesh2/src/lightingdlg.h
+@@ -3,10 +3,10 @@
+
+ #include <math.h>
+ #include <qapplication.h>
+-#include "../../../include/qwt3d_parametricsurface.h"
+-#include "../../../include/qwt3d_surfaceplot.h"
+-#include "../../../include/qwt3d_enrichment.h"
+-#include "../../../include/qwt3d_color.h"
++#include <qwt3d_parametricsurface.h>
++#include <qwt3d_surfaceplot.h>
++#include <qwt3d_enrichment.h>
++#include <qwt3d_color.h>
+
+ #if QT_VERSION < 0x040000
+ #include "lightingdlgbase.h"
+--- a/examples/mesh2/src/mesh2mainwindow.cpp
++++ b/examples/mesh2/src/mesh2mainwindow.cpp
+@@ -16,7 +16,7 @@
+ #include <qtoolbar.h>
+ #include <qimage.h>
+ #include <qpixmap.h>
+-#include <qfiledialog.h>
++#include <qfiledialog.h>
+ #include <qstatusbar.h>
+ #include <qfileinfo.h>
+ #include <qslider.h>
+@@ -33,9 +33,9 @@
+ #include "colormapreader.h"
+ #include "lightingdlg.h"
+ #include "femreader.h"
+-#include "../../../include/qwt3d_io.h"
+-#include "../../../include/qwt3d_io_gl2ps.h"
+-#include "../../../include/qwt3d_io_reader.h"
++#include <qwt3d_io.h>
++#include <qwt3d_io_gl2ps.h>
++#include <qwt3d_io_reader.h>
+
+ using namespace Qwt3D;
+ using namespace std;
+--- a/examples/mesh2/src/mesh2mainwindow.h
++++ b/examples/mesh2/src/mesh2mainwindow.h
+@@ -1,7 +1,7 @@
+ #ifndef mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code
+ #define mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code
+
+-#include "../../../include/qwt3d_surfaceplot.h"
++#include <qwt3d_surfaceplot.h>
+
+
+ #if QT_VERSION < 0x040000
Added: packages/qwtplot3d/trunk/debian/patches/03_fix_ftbs.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/patches/03_fix_ftbs.patch?rev=37426&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/03_fix_ftbs.patch (added)
+++ packages/qwtplot3d/trunk/debian/patches/03_fix_ftbs.patch Sat Feb 26 09:32:46 2011
@@ -1,0 +1,7 @@
+--- a/src/qwt3d_function.cpp
++++ b/src/qwt3d_function.cpp
+@@ -1,3 +1,4 @@
++#include <cstdio>
+ #include "qwt3d_surfaceplot.h"
+ #include "qwt3d_function.h"
+
Added: packages/qwtplot3d/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/patches/series?rev=37426&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/series (added)
+++ packages/qwtplot3d/trunk/debian/patches/series Sat Feb 26 09:32:46 2011
@@ -1,0 +1,3 @@
+01_makefile.patch
+02_examples_include.patch
+03_fix_ftbs.patch
Modified: packages/qwtplot3d/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/rules?rev=37426&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/rules (original)
+++ packages/qwtplot3d/trunk/debian/rules Sat Feb 26 09:32:46 2011
@@ -1,6 +1,4 @@
#!/usr/bin/make -f
-
-include /usr/share/dpatch/dpatch.make
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -18,13 +16,8 @@
endif
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
-
- mkdir -p build/qt3
- cp -Rl `ls . |grep -v build|grep -v debian` build/qt3
- cd build/qt3 && qmake-qt3 qwtplot3d.pro && $(MAKE)
-
mkdir -p build/qt4
cp -Rl `ls . |grep -v build|grep -v debian` build/qt4
@@ -35,7 +28,7 @@
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -48,8 +41,10 @@
dh_prep
dh_installdirs
- cd build/qt3 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
cd build/qt4 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
+ mkdir -p debian/tmp/usr/include/qwtplot3d-qt4
+ cp -a include/* debian/tmp/usr/include/qwtplot3d-qt4
+ mkdir -p debian/tmp/usr/share/doc/libqwtplot3d-doc/html
# Build architecture-independent files here.
binary-indep: build install
Added: packages/qwtplot3d/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/source/format?rev=37426&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/source/format (added)
+++ packages/qwtplot3d/trunk/debian/source/format Sat Feb 26 09:32:46 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the debian-science-commits
mailing list