r46821 - in /packages/qwtplot3d/trunk/debian: changelog control libqwtplot3d-qt5-0.install libqwtplot3d-qt5-dev.install patches/01_makefile.patch patches/02_examples_include.patch rules

gudjon-guest at users.alioth.debian.org gudjon-guest at users.alioth.debian.org
Thu Jul 17 08:58:32 UTC 2014 

Author: gudjon-guest
Date: Thu Jul 17 08:58:32 2014
New Revision: 46821

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46821
Log:
* Add qt5 library version
* Add dependency on libqt5opengl5-dev
* Make svn references canonical
* Bump standards version to 3.9.5

Added:
    packages/qwtplot3d/trunk/debian/libqwtplot3d-qt5-0.install
    packages/qwtplot3d/trunk/debian/libqwtplot3d-qt5-dev.install
Modified:
    packages/qwtplot3d/trunk/debian/changelog
    packages/qwtplot3d/trunk/debian/control
    packages/qwtplot3d/trunk/debian/patches/01_makefile.patch
    packages/qwtplot3d/trunk/debian/patches/02_examples_include.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=46821&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/changelog	(original)
+++ packages/qwtplot3d/trunk/debian/changelog	Thu Jul 17 08:58:32 2014
@@ -1,3 +1,12 @@
+qwtplot3d (0.2.7+svn191-8) UNRELEASED; urgency=medium
+
+  * Add qt5 library version
+  * Add dependency on libqt5opengl5-dev
+  * Make svn references canonical
+  * Bump standards version to 3.9.5
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Wed, 16 Jul 2014 21:01:54 +0000
+
 qwtplot3d (0.2.7+svn191-7) unstable; urgency=low
 
   * Remove -lGLU from examples/common.pro, Reverting

Modified: packages/qwtplot3d/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/control?rev=46821&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/control	(original)
+++ packages/qwtplot3d/trunk/debian/control	Thu Jul 17 08:58:32 2014
@@ -4,13 +4,12 @@
 Uploaders: Gudjon I. Gudjonsson <gudjon at gudjon.org>,
  Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 8), doxygen, libqt4-dev, libqt4-opengl-dev, zlib1g-dev,
- libglu1-mesa-dev | libglu-dev
-Standards-Version: 3.9.3
+ libglu1-mesa-dev | libglu-dev, libqt5opengl5-dev
+Standards-Version: 3.9.5
 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
+Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/qwtplot3d/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-science/packages/qwtplot3d/trunk
 
 Package: libqwtplot3d-qt4-dev
 Section: libdevel
@@ -36,6 +35,30 @@
  This package contains the files necessary for running applications that
  use the QwtPlot3D library and Qt4.
 
+Package: libqwtplot3d-qt5-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libqwtplot3d-qt5-0 (= ${binary:Version})
+Description: 3D plotting library based on Qt5/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 Qt5.
+
+Package: libqwtplot3d-qt5-0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libqwtplot3d-qt4
+Replaces: libqwtplot3d-qt4
+Description: 3D plotting library based on Qt5/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 Qt5.
+
 Package: libqwtplot3d-doc
 Section: doc
 Architecture: all

Added: packages/qwtplot3d/trunk/debian/libqwtplot3d-qt5-0.install
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/libqwtplot3d-qt5-0.install?rev=46821&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/libqwtplot3d-qt5-0.install	(added)
+++ packages/qwtplot3d/trunk/debian/libqwtplot3d-qt5-0.install	Thu Jul 17 08:58:32 2014
@@ -0,0 +1 @@
+usr/lib/lib*qt5.so.*

Added: packages/qwtplot3d/trunk/debian/libqwtplot3d-qt5-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/libqwtplot3d-qt5-dev.install?rev=46821&op=file
==============================================================================
--- packages/qwtplot3d/trunk/debian/libqwtplot3d-qt5-dev.install	(added)
+++ packages/qwtplot3d/trunk/debian/libqwtplot3d-qt5-dev.install	Thu Jul 17 08:58:32 2014
@@ -0,0 +1,2 @@
+usr/include/qwtplot3d-qt5
+usr/lib/libqwtplot3d-qt5.so

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=46821&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/01_makefile.patch	(original)
+++ packages/qwtplot3d/trunk/debian/patches/01_makefile.patch	Thu Jul 17 08:58:32 2014
@@ -67,10 +67,10 @@
  #
  
 -TARGET            = qwtplot3d
-+TARGET            = qwtplot3d-qt4
++TARGET            = qwtplot3d-qt$$QT_VERSION
 +# Install directives
 +INSTALLBASE	  = /usr
-+headers.path      = $$INSTALLBASE/include/qwtplot3d-qt4
++headers.path      = $$INSTALLBASE/include/qwtplot3d-qt$$QT_VERSION
 +headers.files     = $$HEADERS
 +target.path       = $$INSTALLBASE/lib
 +INSTALLS          = doc headers target

Modified: 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=46821&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch	(original)
+++ packages/qwtplot3d/trunk/debian/patches/02_examples_include.patch	Thu Jul 17 08:58:32 2014
@@ -97,3 +97,31 @@
  
  using namespace Qwt3D;
  
+--- a/examples/common.pro
++++ b/examples/common.pro
+@@ -8,8 +8,8 @@
+ linux-g++:QMAKE_CXXFLAGS += -fno-exceptions
+ 
+ unix{
+-  unix:LIBS += -lqwtplot3d-qt4
+-  INCLUDEPATH    += /usr/include/qwtplot3d-qt4
++  unix:LIBS += -lqwtplot3d-qt$$QT_MAJOR_VERSION
++  INCLUDEPATH    += /usr/include/qwtplot3d-qt$$QT_MAJOR_VERSION
+ }
+ 
+ DEPENDPATH	= $$INCLUDEPATH
+--- a/qwtplot3d.pro
++++ b/qwtplot3d.pro
+@@ -1,10 +1,10 @@
+ # pro file for building the makefile for qwtplot3d
+ #
+ 
+-TARGET            = qwtplot3d-qt$$QT_VERSION
++TARGET            = qwtplot3d-qt$$QT_MAJOR_VERSION
+ # Install directives
+ INSTALLBASE	  = /usr
+-headers.path      = $$INSTALLBASE/include/qwtplot3d-qt$$QT_VERSION
++headers.path      = $$INSTALLBASE/include/qwtplot3d-qt$$QT_MAJOR_VERSION
+ headers.files     = $$HEADERS
+ target.path       = $$INSTALLBASE/lib
+ INSTALLS          = doc headers target

Modified: packages/qwtplot3d/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/rules?rev=46821&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/rules	(original)
+++ packages/qwtplot3d/trunk/debian/rules	Thu Jul 17 08:58:32 2014
@@ -6,6 +6,7 @@
 # shared library versions, option 1
 version=0.2.7
 major=0
+QTS=4 5
 
 CFLAGS = -Wall -g
 
@@ -18,9 +19,13 @@
 build: build-arch build-indep
 build-arch:
 	dh_testdir
-	mkdir -p build/qt4
-	cp -Rl `ls . |grep -v build|grep -v debian` build/qt4
-	cd build/qt4 && qmake-qt4 qwtplot3d.pro && $(MAKE)
+	set -e; for qtvers in ${QTS};\
+	do\
+		mkdir -p build/qt$$qtvers; \
+		cp -Rl `ls . |grep -v build|grep -v debian` build/qt$$qtvers; \
+		cd build/qt$$qtvers && qmake -qt=$$qtvers qwtplot3d.pro && $(MAKE); \
+		cd $(CURDIR)/; \
+	done
 
 build-indep:
 	dh_testdir
@@ -39,10 +44,13 @@
 	dh_testroot
 	dh_prep
 	dh_installdirs
-
-	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
+	set -e; for qtvers in ${QTS};\
+	do\
+		mkdir -p $(CURDIR)/debian/tmp/usr/include/qwtplot3d-qt$$qtvers; \
+		cp -a include/* debian/tmp/usr/include/qwtplot3d-qt$$qtvers; \
+		cd build/qt$$qtvers && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install; \
+		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

More information about the debian-science-commits mailing list