[vtk6] 01/05: Put Qt-files into a separate package. (Closes: #750193)

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository vtk6.

commit 458b38a1fe7fd842979e8147852355a993141694
Author: Anton Gladky <gladk at debian.org>
Date:   Tue May 19 23:06:19 2015 +0200

    Put Qt-files into a separate package. (Closes: #750193)
---
 debian/control                          | 43 ++++++++++++++++++++++++++++-----
 debian/libvtk6-qt-dev.install           |  5 ++++
 debian/libvtk6-qt-dev.lintian-overrides |  4 +++
 debian/libvtk6.2-qt.install             |  1 +
 debian/rules                            |  5 ++++
 5 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 1797040..02b2c98 100644
--- a/debian/control
+++ b/debian/control
@@ -105,9 +105,6 @@ Depends: libavcodec-dev,
          libpng-dev,
          libpq-dev,
          libpython-dev,
-         libqt4-dev,
-         libqt4-opengl-dev,
-         libqtwebkit-dev,
          libswscale-dev,
          libtheora-dev,
          libtiff-dev,
@@ -127,7 +124,7 @@ Depends: libavcodec-dev,
          vtk6 (= ${binary:Version}),
          x11proto-core-dev,
          zlib1g-dev,
-         ${misc:Depends}
+         ${misc:Depends}, ${shlibs:Depends}
 Suggests: vtk6-doc,
           vtk6-examples
 Conflicts: libvtk-dev,
@@ -145,13 +142,33 @@ Description: VTK header files
  This package provides the VTK header files required to compile
  C++ programs that use VTK to do 3D visualisation.
 
+Package: libvtk6-qt-dev
+Architecture: any
+Section: libdevel
+Depends: libvtk6-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
+         qtbase5-dev [!armel !armhf],
+         qttools5-private-dev [!armel !armhf],
+         libqt4-dev,
+         libqtwebkit-dev,
+         libqt4-opengl-dev,
+         libqt5opengl5-dev [!armel !armhf],
+         libqt5webkit5-dev [!armel !armhf],
+         libqtwebkit-dev [armel armhf]
+Replaces: libvtk6-dev (<<6.2.0+dfsg1-2)
+Breaks: libvtk6-dev (<<6.2.0+dfsg1-2)
+Description: VTK header files, containing Qt files
+ The Visualization Toolkit (VTK) is an open-source software system
+ for 3D computer graphics, image processing, and visualization.
+ .
+ This package provides the VTK header files required to compile
+ C++ programs that use VTK to do 3D visualisation. Qt files
+
 Package: libvtk6.2
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Suggests: libvtk6-dev,
-          mpi-default-bin,
+Suggests: mpi-default-bin,
           vtk6-doc,
           vtk6-examples
 Conflicts: libvtk6 (>> 6.0.0-7)
@@ -169,6 +186,20 @@ Description: VTK libraries
  This package provides the shared libraries needed to run C++ programs
  that use VTK.
 
+Package: libvtk6.2-qt
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Replaces: libvtk6.2 (<<6.2.0+dfsg1-2)
+Breaks: libvtk6.2 (<<6.2.0+dfsg1-2)
+Description: VTK libraries, Qt files
+ The Visualization Toolkit (VTK) is an open-source software system
+ for 3D computer graphics, image processing, and visualization.
+ .
+ This package provides the shared libraries needed to run C++ programs
+ that use VTK. Qt files
+
 Package: python-vtk6
 Architecture: any
 Section: python
diff --git a/debian/libvtk6-qt-dev.install b/debian/libvtk6-qt-dev.install
new file mode 100644
index 0000000..eb7262b
--- /dev/null
+++ b/debian/libvtk6-qt-dev.install
@@ -0,0 +1,5 @@
+usr/lib/*/python2.7/site-packages/vtk/*Qt*
+usr/lib/*/python2.7/site-packages/vtk/*Qt*
+usr/lib/cmake/vtk-6.2/Modules/*Qt*
+usr/lib/cmake/vtk-6.2/Modules/*Qt*
+usr/include/vtk-6.2/*Qt*
diff --git a/debian/libvtk6-qt-dev.lintian-overrides b/debian/libvtk6-qt-dev.lintian-overrides
new file mode 100644
index 0000000..26c94e4
--- /dev/null
+++ b/debian/libvtk6-qt-dev.lintian-overrides
@@ -0,0 +1,4 @@
+libvtk6-qt-dev: shlib-without-versioned-soname
+libvtk6-qt-dev: package-name-doesnt-match-sonames
+libvtk6-qt-dev: hardening-no-relro
+
diff --git a/debian/libvtk6.2-qt.install b/debian/libvtk6.2-qt.install
new file mode 100644
index 0000000..4c7a2dd
--- /dev/null
+++ b/debian/libvtk6.2-qt.install
@@ -0,0 +1 @@
+usr/lib/*/*Qt*.so.*
diff --git a/debian/rules b/debian/rules
index a877443..c36d893 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,3 +83,8 @@ override_dh_auto_install:
 	find $(CURDIR)/debian/tmp/ -name "*.pyc" | xargs rm -f
 	find $(CURDIR)/debian/tmp/ -name "*.pyo" | xargs rm -f
 	sed -i -e "9 a\ append libPath /${DEB_HOST_MULTIARCH}" $(CURDIR)/debian/tmp/usr/lib/tcltk/vtk-6.2/pkgIndex.tcl
+
+override_dh_install-arch:
+	dh_install -a
+	find $(CURDIR)/debian/libvtk6-dev/ -name "*Qt*" -exec rm {} \;
+	find $(CURDIR)/debian/libvtk6.2/ -name "*Qt*" -exec rm {} \;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk6.git