r35986 - in /packages/qwtplot3d: ./ trunk/ trunk/debian/ trunk/debian/patches/

tille at users.alioth.debian.org tille at users.alioth.debian.org
Tue Nov 17 08:18:11 UTC 2009


Author: tille
Date: Tue Nov 17 08:18:10 2009
New Revision: 35986

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35986
Log:
Inject qwtplot3d because maintainer had problems with injecting

Added:
    packages/qwtplot3d/
    packages/qwtplot3d/trunk/
    packages/qwtplot3d/trunk/debian/
    packages/qwtplot3d/trunk/debian/README.Debian
    packages/qwtplot3d/trunk/debian/README.source
    packages/qwtplot3d/trunk/debian/changelog
    packages/qwtplot3d/trunk/debian/compat
    packages/qwtplot3d/trunk/debian/control
    packages/qwtplot3d/trunk/debian/copyright
    packages/qwtplot3d/trunk/debian/libqwtplot3d-doc.dirs
    packages/qwtplot3d/trunk/debian/libqwtplot3d-doc.install
    packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3-dev.dirs
    packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3-dev.install
    packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3.dirs
    packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3.install
    packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4-dev.dirs
    packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4-dev.install
    packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4.dirs
    packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4.install
    packages/qwtplot3d/trunk/debian/patches/
    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
    packages/qwtplot3d/trunk/debian/rules   (with props)

Added: packages/qwtplot3d/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/README.Debian?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/README.Debian (added)
+++ packages/qwtplot3d/trunk/debian/README.Debian Tue Nov 17 08:18:10 2009
@@ -1,0 +1,29 @@
+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 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 
+a symbolic link to the corresponding library.
+
+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
+$make
+
+The sources for gl2ps are in the source tree but it is not compiled. Please refer to
+http://www.geuz.org/gl2ps for reference.
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Mon, 18 Dec 2006 22:21:51 +0100

Added: packages/qwtplot3d/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/README.source?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/README.source (added)
+++ packages/qwtplot3d/trunk/debian/README.source Tue Nov 17 08:18:10 2009
@@ -1,0 +1,3 @@
+This package uses the quilt patching system and 
+fakeroot debian/rules {un}patch can be used to unpatch/patch it.
+

Added: packages/qwtplot3d/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/changelog?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/changelog (added)
+++ packages/qwtplot3d/trunk/debian/changelog Tue Nov 17 08:18:10 2009
@@ -1,0 +1,40 @@
+qwtplot3d (0.2.7+svn191-3) unstable; urgency=low
+
+  * Create patch 03_fix_ftbs to fix FTBS with gcc-4.4 (Closes: 504912)
+  * Bump standards version to 3.8.3, no changes needed
+  * Add README.source
+  * Add Vcs fields for debian-science
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sat, 14 Nov 2009 15:15:19 +0100
+
+qwtplot3d (0.2.7+svn191-2) unstable; urgency=low
+
+  * Added dependency on libqt4-opengl-dev. (Closes: #482252)
+  * Bump standards version to 3.7.3. No changes needed.
+  * Add a homepage field to control file.
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Tue, 27 May 2008 10:24:26 +0200
+
+qwtplot3d (0.2.7+svn191-1) unstable; urgency=low
+
+  * An SVN version. Includes patches necessary for PyQwt3d.
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Thu, 23 Aug 2007 12:36:37 +0200
+
+qwtplot3d (0.2.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Changed the rules file. The original tgz file can be used directly now.
+  * Repatched the new release.
+  * Changed line endings with dos2unix in original tarball.
+  * Examples are not gzipped anymore.
+  * Changed maintainers email.
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Wed, 27 Jun 2007 10:19:39 +0200
+
+qwtplot3d (0.2.6+svn170-1) unstable; urgency=low
+
+  * Initial release (Closes: #408538)
+
+ -- Gudjon I. Gudjonsson <gudjon at mc2.chalmers.se>  Fri, 26 Jan 2007 13:37:18 +0100
+

Added: packages/qwtplot3d/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/compat?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/compat (added)
+++ packages/qwtplot3d/trunk/debian/compat Tue Nov 17 08:18:10 2009
@@ -1,0 +1,1 @@
+5

Added: packages/qwtplot3d/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/control?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/control (added)
+++ packages/qwtplot3d/trunk/debian/control Tue Nov 17 08:18:10 2009
@@ -1,0 +1,69 @@
+Source: qwtplot3d
+Priority: optional
+Maintainer: Gudjon I. Gudjonsson <gudjon at gudjon.org>
+Build-Depends: debhelper (>= 5), dpatch, doxygen, libqt3-mt-dev, libqt4-dev,
+ libqt4-opengl-dev
+Standards-Version: 3.8.3
+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 (= ${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
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+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
+Depends: libqwtplot3d-qt4 (= ${binary:Version}), libqt4-dev
+Description: 3D plotting library based on Qt4/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 Qt4.
+
+Package: libqwtplot3d-qt4
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: 3D plotting library based on Qt4/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 Qt4.
+
+Package: libqwtplot3d-doc
+Section: doc
+Architecture: all
+Recommends: w3m | www-browser
+Description: 3D plotting library based on Qt/OpenGL (documentation)
+ QwtPlot3D is a feature rich Qt/OpenGL-based C++ programming
+ library, providing essentially a bunch of 3D-widgets for 
+ programmers.
+ .
+ This package contains the html documentation and example
+ programs.

Added: packages/qwtplot3d/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/copyright?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/copyright (added)
+++ packages/qwtplot3d/trunk/debian/copyright Tue Nov 17 08:18:10 2009
@@ -1,0 +1,87 @@
+This package was debianized by Gudjon I. Gudjonsson <gudjon at gudjon.org> on
+Fri, 26 Jan 2007 13:37:18 +0100.
+
+It was downloaded from http://qwtplot3d.sourceforge.net/
+
+Upstream Author: Michael Bieber <krischnamurti at users.sourceforge.net>
+
+Copyright: (C) 2003-2005 Michael Bieber <krischnamurti at users.sourceforge.net>
+
+Copyright for GL2PS, an OpenGL to PostScript printing library:
+   (C) 1999-2003 Christophe Geuzaine <geuz at geuz.org>
+   Michael Sweet <mike at easysw.com>
+   Marc Ume <marc.ume at digitalgraphics.be>
+   Jean-Francois Remacle <remacle at scorec.rpi.edu>
+   Bart Kaptein <B.L.Kaptein at lumc.nl>
+   Quy Nguyen-Dai<quy at vnilux.com>
+   Sam Buss <sbuss at ucsd.edu>
+   Shane Hill <Shane.Hill at dsto.defence.gov.au>
+   Romain Boman <r_boman at yahoo.fr>
+   Rouben Rostamian <rostamian at umbc.edu>
+   Diego Santa Cruz <Diego.SantaCruz at epfl.ch>
+   Shahzad Muzaffar <Shahzad.Muzaffar at cern.ch>
+   Lassi Tuura <lassi.tuura at cern.ch>
+   Guy Barrand <barrand at lal.in2p3.fr>
+   Prabhu Ramachandran <prabhu at aero.iitm.ernet.in>
+   Micha Bieber <bieber at traits.de>
+
+GL2PS licenses:
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of either:
+ *
+ * a) the GNU Library General Public License as published by the Free
+ * Software Foundation, either version 2 of the License, or (at your
+ * option) any later version; or
+ *
+ * b) the GL2PS License as published by Christophe Geuzaine, either
+ * version 2 of the License, or (at your option) any later version.
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+                           GL2PS LICENSE
+                      Version 2, November 2003
+
+              Copyright (C) 2003, Christophe Geuzaine
+
+Permission to use, copy, and distribute this software and its
+documentation for any purpose with or without fee is hereby granted,
+provided that the copyright notice appear in all copies and that both
+that copyright notice and this permission notice appear in supporting
+documentation.
+
+Permission to modify and distribute modified versions of this software
+is granted, provided that:
+
+1) the modifications are licensed under the same terms as this
+software;
+
+2) you make available the source code of any modifications that you
+distribute, either on the same media as you distribute any executable
+or other form of this software, or via a mechanism generally accepted
+in the software development community for the electronic transfer of
+data.
+
+This software is provided "as is" without express or implied warranty.
+
+QwtPlot3D license:
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the author be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+The Debian packaging is (C) 2007, Gudjon I. Gudjonsson <gudjon at gudjon.org>
+and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Added: packages/qwtplot3d/trunk/debian/libqwtplot3d-doc.dirs
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/libqwtplot3d-doc.dirs?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/libqwtplot3d-doc.dirs (added)
+++ packages/qwtplot3d/trunk/debian/libqwtplot3d-doc.dirs Tue Nov 17 08:18:10 2009
@@ -1,0 +1,2 @@
+usr/share/doc/libqwtplot3d-doc/examples
+usr/share/doc/libqwtplot3d-doc/html

Added: packages/qwtplot3d/trunk/debian/libqwtplot3d-doc.install
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/libqwtplot3d-doc.install?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/libqwtplot3d-doc.install (added)
+++ packages/qwtplot3d/trunk/debian/libqwtplot3d-doc.install Tue Nov 17 08:18:10 2009
@@ -1,0 +1,2 @@
+usr/share/doc/libqwtplot3d-doc/examples
+usr/share/doc/libqwtplot3d-doc/html

Added: packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3-dev.dirs
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3-dev.dirs?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3-dev.dirs (added)
+++ packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3-dev.dirs Tue Nov 17 08:18:10 2009
@@ -1,0 +1,2 @@
+usr/include/qwtplot3d-qt3
+usr/lib

Added: packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3-dev.install?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3-dev.install (added)
+++ packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3-dev.install Tue Nov 17 08:18:10 2009
@@ -1,0 +1,2 @@
+usr/include/qwtplot3d-qt3
+usr/lib/libqwtplot3d-qt3.so

Added: packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3.dirs
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3.dirs?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3.dirs (added)
+++ packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3.dirs Tue Nov 17 08:18:10 2009
@@ -1,0 +1,1 @@
+usr/lib

Added: packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3.install
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3.install?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3.install (added)
+++ packages/qwtplot3d/trunk/debian/libqwtplot3d-qt3.install Tue Nov 17 08:18:10 2009
@@ -1,0 +1,1 @@
+usr/lib/lib*qt3.so.*

Added: packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4-dev.dirs
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4-dev.dirs?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4-dev.dirs (added)
+++ packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4-dev.dirs Tue Nov 17 08:18:10 2009
@@ -1,0 +1,2 @@
+usr/include/qwtplot3d-qt4
+usr/lib

Added: packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4-dev.install?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4-dev.install (added)
+++ packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4-dev.install Tue Nov 17 08:18:10 2009
@@ -1,0 +1,2 @@
+usr/include/qwtplot3d-qt4
+usr/lib/libqwtplot3d-qt4.so

Added: packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4.dirs
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4.dirs?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4.dirs (added)
+++ packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4.dirs Tue Nov 17 08:18:10 2009
@@ -1,0 +1,1 @@
+usr/lib

Added: packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4.install?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4.install (added)
+++ packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4.install Tue Nov 17 08:18:10 2009
@@ -1,0 +1,1 @@
+usr/lib/lib*qt4.so.*

Added: packages/qwtplot3d/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/patches/00list?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/00list (added)
+++ packages/qwtplot3d/trunk/debian/patches/00list Tue Nov 17 08:18:10 2009
@@ -1,0 +1,3 @@
+01_makefile
+02_examples_include
+03_fix_ftbs

Added: packages/qwtplot3d/trunk/debian/patches/01_makefile.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/patches/01_makefile.dpatch?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/01_makefile.dpatch (added)
+++ packages/qwtplot3d/trunk/debian/patches/01_makefile.dpatch Tue Nov 17 08:18:10 2009
@@ -1,0 +1,120 @@
+#! /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
+@@ -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,6 @@
+ GRAPHICAL_HIERARCHY    = YES
+ DIRECTORY_GRAPH        = YES
+ DOT_IMAGE_FORMAT       = png
+-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
+@@ -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{
+@@ -25,7 +33,7 @@
+ ISQT4 = $$find(MYVERSION, ^[2-9])
+ 
+ !isEmpty( ISQT4 ) {
+-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 @@
+ # 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
++}
+ TEMPLATE          = lib
+ CONFIG           += qt warn_on opengl thread zlib debug
+ MOC_DIR           = tmp
+@@ -92,4 +99,28 @@
+   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

Added: packages/qwtplot3d/trunk/debian/patches/02_examples_include.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/patches/02_examples_include.dpatch?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/02_examples_include.dpatch (added)
+++ packages/qwtplot3d/trunk/debian/patches/02_examples_include.dpatch Tue Nov 17 08:18:10 2009
@@ -1,0 +1,103 @@
+#! /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

Added: packages/qwtplot3d/trunk/debian/patches/03_fix_ftbs.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/patches/03_fix_ftbs.dpatch?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/03_fix_ftbs.dpatch (added)
+++ packages/qwtplot3d/trunk/debian/patches/03_fix_ftbs.dpatch Tue Nov 17 08:18:10 2009
@@ -1,0 +1,15 @@
+#! /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"
+ 

Added: packages/qwtplot3d/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/rules?rev=35986&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/rules (added)
+++ packages/qwtplot3d/trunk/debian/rules Tue Nov 17 08:18:10 2009
@@ -1,0 +1,80 @@
+#!/usr/bin/make -f
+
+include /usr/share/dpatch/dpatch.make
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# shared library versions, option 1
+version=0.2.7
+major=0
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+build: build-stamp
+build-stamp: patch
+	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)
+
+	# Build the documentation
+	cd build/qt4/doc && doxygen Doxyfile.doxygen
+
+	touch $@
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	rm -rf build
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	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/share/doc/libqwtplot3d-doc
+	cp -a build/qt4/examples debian/tmp/usr/share/doc/libqwtplot3d-doc
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+	dh_install --sourcedir=debian/tmp
+	dh_link
+	dh_strip
+	dh_compress --exclude=.cpp --exclude=.h --exclude=.pro --exclude=.ui
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

Propchange: packages/qwtplot3d/trunk/debian/rules
------------------------------------------------------------------------------
    svn:executable = *




More information about the debian-science-commits mailing list