[qwtplot3d] 06/39: * 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
Andreas Tille
tille at debian.org
Mon Dec 25 10:30:02 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository qwtplot3d.
commit 670c3673d293c0a35f498a57a18bb781804fb72f
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date: Sat Feb 26 09:32:46 2011 +0000
* 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
---
debian/README.Debian | 5 +-
debian/README.source | 3 -
debian/changelog | 11 +++
debian/control | 30 +-----
debian/libqwtplot3d-qt3-0.install | 1 -
debian/libqwtplot3d-qt3-dev.install | 2 -
debian/patches/00list | 3 -
.../{01_makefile.dpatch => 01_makefile.patch} | 75 +++++----------
debian/patches/02_examples_include.dpatch | 103 ---------------------
debian/patches/02_examples_include.patch | 87 +++++++++++++++++
debian/patches/03_fix_ftbs.dpatch | 15 ---
debian/patches/03_fix_ftbs.patch | 7 ++
debian/patches/series | 3 +
debian/rules | 15 +--
debian/source/format | 1 +
15 files changed, 139 insertions(+), 222 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 992588c..bfd38b9 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -2,15 +2,14 @@ qwtplot3d for Debian
------------------
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 @@ To compile the examples you need to copy them to a local directory and do the
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
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index ab1512e..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-This package uses the quilt patching system and
-fakeroot debian/rules {un}patch can be used to unpatch/patch it.
-
diff --git a/debian/changelog b/debian/changelog
index e1192fc..e1a638f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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}
diff --git a/debian/control b/debian/control
index 6c661f0..0dbaf40 100644
--- a/debian/control
+++ b/debian/control
@@ -3,40 +3,14 @@ Priority: optional
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
Architecture: any
diff --git a/debian/libqwtplot3d-qt3-0.install b/debian/libqwtplot3d-qt3-0.install
deleted file mode 100644
index de0db7c..0000000
--- a/debian/libqwtplot3d-qt3-0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/lib*qt3.so.*
diff --git a/debian/libqwtplot3d-qt3-dev.install b/debian/libqwtplot3d-qt3-dev.install
deleted file mode 100644
index adf04fa..0000000
--- a/debian/libqwtplot3d-qt3-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include/qwtplot3d-qt3
-usr/lib/libqwtplot3d-qt3.so
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 4a70833..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_makefile
-02_examples_include
-03_fix_ftbs
diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.patch
similarity index 52%
rename from debian/patches/01_makefile.dpatch
rename to debian/patches/01_makefile.patch
index 63d7b52..590d5d0 100644
--- a/debian/patches/01_makefile.dpatch
+++ b/debian/patches/01_makefile.patch
@@ -1,13 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_makefile.dpatch by Gudjon I. Gudjonsson <gudjon at gudjon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes the makefiles to install according to the Debian FHS
-
- at DPATCH@
-diff -urNad qwtplot3d-0.2.7~/doc/Doxyfile.doxygen qwtplot3d-0.2.7/doc/Doxyfile.doxygen
---- qwtplot3d-0.2.7~/doc/Doxyfile.doxygen 2007-06-26 14:17:59.000000000 +0200
-+++ qwtplot3d-0.2.7/doc/Doxyfile.doxygen 2007-06-26 14:34:58.000000000 +0200
+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
@@ -26,23 +19,23 @@ diff -urNad qwtplot3d-0.2.7~/doc/Doxyfile.doxygen qwtplot3d-0.2.7/doc/Doxyfile.d
INCLUDE_FILE_PATTERNS = *.h
PREDEFINED = QWT3D_NOT_FOR_DOXYGEN \
QT_VERSION=0x040000
-@@ -212,7 +212,6 @@
+@@ -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
-diff -urNad qwtplot3d-0.2.7~/examples/common.pro qwtplot3d-0.2.7/examples/common.pro
---- qwtplot3d-0.2.7~/examples/common.pro 2007-06-26 14:17:59.000000000 +0200
-+++ qwtplot3d-0.2.7/examples/common.pro 2007-06-26 14:35:59.000000000 +0200
+--- 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]
+++VVERSION = $$[QT_VERSION]
+isEmpty(VVERSION) {
+ # Qt 3
+ INCLUDEPATH += /usr/include/qwtplot3d-qt3
@@ -59,62 +52,36 @@ diff -urNad qwtplot3d-0.2.7~/examples/common.pro qwtplot3d-0.2.7/examples/common
linux-g++:QMAKE_CXXFLAGS += -fno-exceptions
win32{
-@@ -25,7 +33,7 @@
+@@ -28,7 +36,7 @@
ISQT4 = $$find(MYVERSION, ^[2-9])
!isEmpty( ISQT4 ) {
-RESOURCES = ../images.qrc
-+#RESOURCES = images.qrc
++#RESOURCES = ../images.qrc
QT += opengl
}
-diff -urNad qwtplot3d-0.2.7~/qwtplot3d.pro qwtplot3d-0.2.7/qwtplot3d.pro
---- qwtplot3d-0.2.7~/qwtplot3d.pro 2007-06-26 14:17:59.000000000 +0200
-+++ qwtplot3d-0.2.7/qwtplot3d.pro 2007-06-26 14:34:58.000000000 +0200
-@@ -1,7 +1,14 @@
+--- a/qwtplot3d.pro
++++ b/qwtplot3d.pro
+@@ -1,7 +1,13 @@
# pro file for building the makefile for qwtplot3d
#
-TARGET = qwtplot3d
-+VVERSION = $$[QT_VERSION]
-+isEmpty(VVERSION) {
-+ # Qt 3
-+ TARGET = qwtplot3d-qt3
-+} else {
-+ # Qt 4
-+ TARGET = qwtplot3d-qt4
-+}
++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 +99,28 @@
+@@ -92,4 +98,4 @@
DEFINES += GL2PS_HAVE_ZLIB
win32:LIBS += zlib.lib
unix:LIBS += -lz
-}
\ No newline at end of file
+}
-+
-+# Install directives
-+INSTALLBASE = /usr
-+
-+doc.path = $$INSTALLBASE/share/doc/libqwtplot3d-doc/html
-+doc.files = doc/web/doxygen/*
-+
-+VVERSION = $$[QT_VERSION]
-+isEmpty(VVERSION) {
-+ # Qt 3
-+
-+ headers.path = $$INSTALLBASE/include/qwtplot3d-qt3
-+
-+} else {
-+ # Qt 4
-+
-+ headers.path = $$INSTALLBASE/include/qwtplot3d-qt4
-+
-+}
-+headers.files = $$HEADERS
-+
-+target.path = $$INSTALLBASE/lib
-+
-+INSTALLS = doc headers target
diff --git a/debian/patches/02_examples_include.dpatch b/debian/patches/02_examples_include.dpatch
deleted file mode 100644
index 1a81038..0000000
--- a/debian/patches/02_examples_include.dpatch
+++ /dev/null
@@ -1,103 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_examples_include.dpatch by Gudjon I. Gudjonsson <gudjon at gudjon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes the includes of the examples to /usr/include/qwtplot3d-qt{3,4}
-
- at DPATCH@
-diff -urNad qwtplot3d-0.2.7~/examples/axes/src/axesmainwindow.cpp qwtplot3d-0.2.7/examples/axes/src/axesmainwindow.cpp
---- qwtplot3d-0.2.7~/examples/axes/src/axesmainwindow.cpp 2007-06-26 13:27:37.000000000 +0200
-+++ qwtplot3d-0.2.7/examples/axes/src/axesmainwindow.cpp 2007-06-26 14:11:28.000000000 +0200
-@@ -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;
-diff -urNad qwtplot3d-0.2.7~/examples/enrichments/src/enrichmentmainwindow.cpp qwtplot3d-0.2.7/examples/enrichments/src/enrichmentmainwindow.cpp
---- qwtplot3d-0.2.7~/examples/enrichments/src/enrichmentmainwindow.cpp 2007-06-26 13:27:37.000000000 +0200
-+++ qwtplot3d-0.2.7/examples/enrichments/src/enrichmentmainwindow.cpp 2007-06-26 14:11:28.000000000 +0200
-@@ -6,7 +6,7 @@
-
- #include "enrichmentmainwindow.h"
- #include "enrichments.h"
--#include "../../../include/qwt3d_function.h"
-+#include <qwt3d_function.h>
-
- using namespace Qwt3D;
-
-diff -urNad qwtplot3d-0.2.7~/examples/mesh2/src/colormapreader.h qwtplot3d-0.2.7/examples/mesh2/src/colormapreader.h
---- qwtplot3d-0.2.7~/examples/mesh2/src/colormapreader.h 2007-06-26 13:27:37.000000000 +0200
-+++ qwtplot3d-0.2.7/examples/mesh2/src/colormapreader.h 2007-06-26 14:11:28.000000000 +0200
-@@ -5,7 +5,7 @@
- #include <qframe.h>
- #include <qpixmap.h>
-
--#include "../../../include/qwt3d_types.h"
-+#include <qwt3d_types.h>
-
- #if QT_VERSION < 0x040000
-
-diff -urNad qwtplot3d-0.2.7~/examples/mesh2/src/functions.h qwtplot3d-0.2.7/examples/mesh2/src/functions.h
---- qwtplot3d-0.2.7~/examples/mesh2/src/functions.h 2007-06-26 13:27:37.000000000 +0200
-+++ qwtplot3d-0.2.7/examples/mesh2/src/functions.h 2007-06-26 14:11:28.000000000 +0200
-@@ -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;
-
-diff -urNad qwtplot3d-0.2.7~/examples/mesh2/src/lightingdlg.h qwtplot3d-0.2.7/examples/mesh2/src/lightingdlg.h
---- qwtplot3d-0.2.7~/examples/mesh2/src/lightingdlg.h 2007-06-26 13:27:37.000000000 +0200
-+++ qwtplot3d-0.2.7/examples/mesh2/src/lightingdlg.h 2007-06-26 14:11:28.000000000 +0200
-@@ -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"
-diff -urNad qwtplot3d-0.2.7~/examples/mesh2/src/mesh2mainwindow.cpp qwtplot3d-0.2.7/examples/mesh2/src/mesh2mainwindow.cpp
---- qwtplot3d-0.2.7~/examples/mesh2/src/mesh2mainwindow.cpp 2007-06-26 13:27:37.000000000 +0200
-+++ qwtplot3d-0.2.7/examples/mesh2/src/mesh2mainwindow.cpp 2007-06-26 14:11:28.000000000 +0200
-@@ -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;
-diff -urNad qwtplot3d-0.2.7~/examples/mesh2/src/mesh2mainwindow.h qwtplot3d-0.2.7/examples/mesh2/src/mesh2mainwindow.h
---- qwtplot3d-0.2.7~/examples/mesh2/src/mesh2mainwindow.h 2007-06-26 13:27:37.000000000 +0200
-+++ qwtplot3d-0.2.7/examples/mesh2/src/mesh2mainwindow.h 2007-06-26 14:11:28.000000000 +0200
-@@ -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
diff --git a/debian/patches/02_examples_include.patch b/debian/patches/02_examples_include.patch
new file mode 100644
index 0000000..8ffbc55
--- /dev/null
+++ b/debian/patches/02_examples_include.patch
@@ -0,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
diff --git a/debian/patches/03_fix_ftbs.dpatch b/debian/patches/03_fix_ftbs.dpatch
deleted file mode 100644
index 667df96..0000000
--- a/debian/patches/03_fix_ftbs.dpatch
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_fix_ftbs.dpatch by <gudjon at gudjon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad qwtplot3d-0.2.7+svn191~/src/qwt3d_function.cpp qwtplot3d-0.2.7+svn191/src/qwt3d_function.cpp
---- qwtplot3d-0.2.7+svn191~/src/qwt3d_function.cpp 2007-08-23 12:20:56.000000000 +0200
-+++ qwtplot3d-0.2.7+svn191/src/qwt3d_function.cpp 2009-11-14 14:04:57.000000000 +0100
-@@ -1,3 +1,4 @@
-+#include <cstdio>
- #include "qwt3d_surfaceplot.h"
- #include "qwt3d_function.h"
-
diff --git a/debian/patches/03_fix_ftbs.patch b/debian/patches/03_fix_ftbs.patch
new file mode 100644
index 0000000..5f05660
--- /dev/null
+++ b/debian/patches/03_fix_ftbs.patch
@@ -0,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"
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d616c46
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_makefile.patch
+02_examples_include.patch
+03_fix_ftbs.patch
diff --git a/debian/rules b/debian/rules
index 7166e7f..09b4543 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
-
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -18,14 +16,9 @@ else
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
cd build/qt4 && qmake-qt4 qwtplot3d.pro && $(MAKE)
@@ -35,7 +28,7 @@ build-stamp: patch
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -48,8 +41,10 @@ install: build
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
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qwtplot3d.git
More information about the debian-science-commits
mailing list