[libqglviewer] 01/06: Add -qt5 prefix to qt5-libs. (Closes: #817785)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository libqglviewer.

commit c78aed7380bc35f8bda8408f497a63109c7e29b1
Author: Anton Gladky <gladk at debian.org>
Date:   Mon May 9 18:38:39 2016 +0200

    Add -qt5 prefix to qt5-libs. (Closes: #817785)
---
 debian/control                      | 27 +++++++++++++++++++++++----
 debian/libqglviewer-dev-qt4.install |  1 -
 debian/libqglviewer-dev-qt5.install |  2 ++
 debian/libqglviewer-dev.install     |  3 ---
 debian/libqglviewer-headers.install |  1 +
 debian/libqglviewer2-qt5.install    |  1 +
 debian/libqglviewer2.install        |  1 -
 debian/rules                        |  5 ++++-
 8 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 3a8330b..adad5cd 100644
--- a/debian/control
+++ b/debian/control
@@ -15,11 +15,12 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/libqglviewe
 Vcs-Git: git://anonscm.debian.org/gitweb/?p=debian-science/packages/libqglviewer.git
 Homepage: http://www.libqglviewer.com/
 
-Package: libqglviewer-dev
+Package: libqglviewer-dev-qt5
 Architecture: any
 Section: libdevel
 Depends: libgl1-mesa-dev | libgl-dev,
-         libqglviewer2 (= ${binary:Version}),
+         libqglviewer2-qt5 (= ${binary:Version}),
+         libqglviewer-headers,
          qtbase5-dev,
          qtbase5-dev-tools,
          libqt5opengl5-dev,
@@ -46,7 +47,7 @@ Architecture: all
 Section: doc
 Depends: libjs-jquery,
          ${misc:Depends}
-Description: OpenGL 3D viewer library - header files and documentation
+Description: OpenGL 3D viewer library - documentation and examples
  libqglviewer (also known as libQGLViewer) is a free C++ library based on Qt
  that enables the quick creation of OpenGL 3D viewers. It features a powerful
  camera trackball and simple applications simply require an implementation of
@@ -58,7 +59,7 @@ Description: OpenGL 3D viewer library - header files and documentation
  .
  This package contains documentation and examples.
 
-Package: libqglviewer2
+Package: libqglviewer2-qt5
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
@@ -101,6 +102,7 @@ Architecture: any
 Section: libdevel
 Depends: libgl1-mesa-dev | libgl-dev,
          libqglviewer2-qt4 (= ${binary:Version}),
+         libqglviewer-headers,
          libqt4-dev (>= 4:4.8.0~),
          libqt4-opengl-dev (>= 4:4.8.0~),
          libx11-dev,
@@ -121,3 +123,20 @@ Description: OpenGL 3D viewer library based on Qt4 - development files
  .
  This package contains the files needed to develop and compile programs
  using QGLViewer linked with Qt version 4.
+
+Package: libqglviewer-headers
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: OpenGL 3D viewer library - header files
+ libqglviewer (also known as libQGLViewer) is a free C++ library based on Qt
+ that enables the quick creation of OpenGL 3D viewers. It features a powerful
+ camera trackball and simple applications simply require an implementation of
+ the draw() function. It is a tool of choice for OpenGL beginners and
+ assignements. It provides screenshot saving, mouse manipulated frames, stereo
+ display, interpolated keyFrames, object selection, and much more. It is fully
+ customizable and easy to extend to create complex applications, with a
+ possible Qt GUI.
+ .
+ This package contains headers.
+
diff --git a/debian/libqglviewer-dev-qt4.install b/debian/libqglviewer-dev-qt4.install
index 315343c..f466919 100644
--- a/debian/libqglviewer-dev-qt4.install
+++ b/debian/libqglviewer-dev-qt4.install
@@ -1,3 +1,2 @@
-usr/include
 usr/lib/*/libQGLViewer-qt4.prl
 usr/lib/*/libQGLViewer-qt4.so
diff --git a/debian/libqglviewer-dev-qt5.install b/debian/libqglviewer-dev-qt5.install
new file mode 100644
index 0000000..2a993ac
--- /dev/null
+++ b/debian/libqglviewer-dev-qt5.install
@@ -0,0 +1,2 @@
+usr/lib/*/libQGLViewer-qt5.prl
+usr/lib/*/libQGLViewer-qt5.so
diff --git a/debian/libqglviewer-dev.install b/debian/libqglviewer-dev.install
deleted file mode 100644
index d8fa24f..0000000
--- a/debian/libqglviewer-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include
-usr/lib/*/libQGLViewer.prl
-usr/lib/*/libQGLViewer.so
diff --git a/debian/libqglviewer-headers.install b/debian/libqglviewer-headers.install
new file mode 100644
index 0000000..e43b95c
--- /dev/null
+++ b/debian/libqglviewer-headers.install
@@ -0,0 +1 @@
+usr/include
diff --git a/debian/libqglviewer2-qt5.install b/debian/libqglviewer2-qt5.install
new file mode 100644
index 0000000..4b9804c
--- /dev/null
+++ b/debian/libqglviewer2-qt5.install
@@ -0,0 +1 @@
+usr/lib/*/libQGLViewer-qt5.so.*
diff --git a/debian/libqglviewer2.install b/debian/libqglviewer2.install
deleted file mode 100644
index 37bb388..0000000
--- a/debian/libqglviewer2.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libQGLViewer.so.*
diff --git a/debian/rules b/debian/rules
index bd277bb..1ed7bcd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ override_dh_auto_configure:
 	QT_SELECT=qt4 dh_auto_configure
 	cd QGLViewer ; $(MAKE) ; mv libQGLViewer-qt4* ../debian/qt4/ ; rm -rf .obj .moc *.prl Makefile ui_ImageInterface.h ui_VRenderInterface.h
 	rm debian/*.log
-	sed -i -- 's/TARGET = QGLViewer-qt4/TARGET = QGLViewer/g' QGLViewer/QGLViewer.pro
+	sed -i -- 's/TARGET = QGLViewer-qt4/TARGET = QGLViewer-qt5/g' QGLViewer/QGLViewer.pro
 	QT_SELECT=qt5 dh_auto_configure -- LIB_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_install:
@@ -24,3 +24,6 @@ override_dh_auto_install:
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf $(CURDIR)/debian/qt4
+	rm -rf $(CURDIR)/debian/qt5
+
+override_dh_auto_build:

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