r47591 - in /packages/qwtplot3d/trunk/debian: README.Debian changelog control libqwtplot3d-qt4-0v5.install libqwtplot3d-qt4-0v5.symbols libqwtplot3d-qt4-dev.install rules
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Mon Dec 11 21:19:00 UTC 2017
Author: gudjon-guest
Date: Mon Dec 11 21:19:00 2017
New Revision: 47591
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47591
Log:
Remove support for Qt4 (Closes: #875167)
Removed:
packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4-0v5.install
packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4-0v5.symbols
packages/qwtplot3d/trunk/debian/libqwtplot3d-qt4-dev.install
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=47591&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/README.Debian (original)
+++ packages/qwtplot3d/trunk/debian/README.Debian Mon Dec 11 21:19:00 2017
@@ -2,15 +2,15 @@
------------------
A postfix has been added to the library names according to the version of Qt:
-* libqwtplot3d-qt4.so* is QwtPlot3D 0.2.6 compiled against Qt4
+* libqwtplot3d-qt5.so* is QwtPlot3D 0.2.6 compiled against Qt5
+libqwtplot3d-qt4 and libqwtplot3d-qt5 were earlier coinstalled. Now qt4 has been
+removed but the namechange will stay.
-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.
+In that way, all these qwtplot3d libraries can coexist but you can only have a single
+development package for each Qt version.
-The include files are placed in the following directories:
-* /usr/include/qwtplot3d-qt3.so* for QwtPlot3D 0.2.6 (Qt4 version)
+The include files are placed in the following directory:
+* /usr/include/qwtplot3d
If you have a precompiled binary file, linked against libqwt then you may need to add
a symbolic link to the corresponding library.
@@ -19,8 +19,7 @@
following steps:
$cp -r /usr/share/doc/libqwtplot3d-doc/examples .
$cd examples
-$qmake-qt4 examples.pro
-$make
+$qmake-qt5 examples.pro
The sources for gl2ps are in the source tree but it is not compiled. Please refer to
http://www.geuz.org/gl2ps for reference.
Modified: packages/qwtplot3d/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/changelog?rev=47591&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/changelog (original)
+++ packages/qwtplot3d/trunk/debian/changelog Mon Dec 11 21:19:00 2017
@@ -1,6 +1,7 @@
qwtplot3d (0.2.7+svn191+gcc7-2) UNRELEASED; urgency=medium
* Add symbols files
+ * Remove support for Qt4 (Closes: #875167)
-- Gudjon I. Gudjonsson <gudjon at gudjon.org> Mon, 11 Dec 2017 21:00:05 +0100
Modified: packages/qwtplot3d/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/control?rev=47591&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/control (original)
+++ packages/qwtplot3d/trunk/debian/control Mon Dec 11 21:19:00 2017
@@ -7,42 +7,14 @@
doxygen,
libglu1-mesa-dev | libglu-dev,
libjs-jquery,
- libqt4-dev,
- libqt4-opengl-dev,
pkg-kde-tools,
zlib1g-dev,
libqt5opengl5-dev
-Standards-Version: 4.0.0
+Standards-Version: 4.1.2
Section: libs
Homepage: http://qwtplot3d.sourceforge.net
Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/qwtplot3d/trunk/
Vcs-Browser: https://anonscm.debian.org/viewvc/debian-science/packages/qwtplot3d/trunk
-
-Package: libqwtplot3d-qt4-dev
-Section: libdevel
-Architecture: any
-Depends: libqt4-dev,
- libqwtplot3d-qt4-0v5 (= ${binary:Version}),
- ${misc:Depends}
-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-0v5
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libqwtplot3d-qt4-0
-Replaces: libqwtplot3d-qt4-0
-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-qt5-dev
Section: libdevel
Modified: packages/qwtplot3d/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/qwtplot3d/trunk/debian/rules?rev=47591&op=diff
==============================================================================
--- packages/qwtplot3d/trunk/debian/rules (original)
+++ packages/qwtplot3d/trunk/debian/rules Mon Dec 11 21:19:00 2017
@@ -2,12 +2,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
-ifneq (,$(findstring qt5, $(shell dh_listpackages)))
- BUILD_qt5 := yes
-else
- BUILD_qt5 :=
-endif
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
@@ -20,32 +14,27 @@
dh $@ --parallel --list-missing --with pkgkde_symbolshelper
override_dh_auto_configure:
- mkdir -p build-qt4 build-qt5
- cp -a doc build-qt4/
- QT_SELECT=qt4 dh_auto_configure --builddirectory=build-qt4 -- ../qwtplot3d.pro
- $(if $(BUILD_qt5), QT_SELECT=qt5 dh_auto_configure --builddirectory=build-qt5 -- ../qwtplot3d.pro,)
+ mkdir -p build-qt5
+ cp -a doc build-qt5/
+ QT_SELECT=qt5 dh_auto_configure --builddirectory=build-qt5 -- ../qwtplot3d.pro
override_dh_auto_build:
- dh_auto_build --builddirectory=build-qt4
- $(if $(BUILD_qt5), dh_auto_build --builddirectory=build-qt5,)
- cd build-qt4/doc && doxygen Doxyfile.doxygen
+ dh_auto_build --builddirectory=build-qt5
+ cd build-qt5/doc && doxygen Doxyfile.doxygen
override_dh_auto_clean:
- rm -rf build-qt?
+ rm -rf build-qt5
override_dh_auto_install:
- mkdir -p debian/tmp/usr/include/qwtplot3d-qt4
- cp -a include/* debian/tmp/usr/include/qwtplot3d-qt4
- dh_auto_install --builddirectory=build-qt4
mkdir -p debian/tmp/usr/include/qwtplot3d
cp -a include/* debian/tmp/usr/include/qwtplot3d
- $(if $(BUILD_qt5), dh_auto_install --builddirectory=build-qt5,)
+ dh_auto_install --builddirectory=build-qt5
+ mkdir -p debian/tmp/usr/include/qwtplot3d
+ cp -a include/* debian/tmp/usr/include/qwtplot3d
find debian/tmp/usr -type f -name '*.md5' -exec rm -vf {} \;
find debian/tmp/usr -type f -name '*.js' -exec rm -vf {} \;
mkdir -p 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
+ cp -a build-qt5/doc/web/doxygen/* debian/tmp/usr/share/doc/libqwtplot3d-doc/html
override_dh_compress-indep:
dh_compress --exclude=.cpp --exclude=.pri --exclude=.xpm --exclude=.ui
More information about the debian-science-commits
mailing list