[libqglviewer] 01/02: Add -qt4 packages.

Thu Jun 25 22:05:38 UTC 2015

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

gladk pushed a commit to branch master
in repository libqglviewer.

commit 7ad92fc75cfdc89856bdd14827f033cf1dcba906
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Jun 25 23:46:00 2015 +0200

    Add -qt4 packages.
---
 debian/control                      | 60 ++++++++++++++++++++++++++++++++-----
 debian/libqglviewer-dev-qt4.install |  3 ++
 debian/libqglviewer-dev.install     |  4 +--
 debian/libqglviewer2-qt4.install    |  1 +
 debian/libqglviewer2.install        |  2 +-
 debian/libqglviewer2.maintscript    |  1 -
 debian/rules                        | 15 ++++++++--
 7 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/debian/control b/debian/control
index 748e943..37c5737 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,9 @@ Build-Depends:
  debhelper (>= 9),
  qtbase5-dev,
  qtbase5-dev-tools,
- libqt5opengl5-dev
+ libqt5opengl5-dev,
+ libqt4-dev (>= 4:4.8.0~),
+ libqt4-opengl-dev (>= 4:4.8.0~)
 Vcs-Git: git://anonscm.debian.org/gitweb/?p=debian-science/packages/libqglviewer.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/libqglviewer.git
 XS-Testsuite: autopkgtest
@@ -30,13 +32,7 @@ Depends:
  libqt5opengl5-dev,
  ${misc:Depends},
  ${shlibs:Depends}
-Recommends:
- libqglviewer-doc
-Replaces:
- libqglviewer-dev-common (<< 2.3.17~)
-Breaks:
- libqglviewer-dev-common (<< 2.3.17~)
-Description: OpenGL 3D viewer library based on Qt4 - development files
+Description: OpenGL 3D viewer library based on Qt5 - development 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
@@ -86,4 +82,52 @@ Description: OpenGL 3D viewer library based on Qt - runtime library
  possible Qt GUI.
  .
  This package contains the shared library needed to run programs using
+ QGLViewer. This package contains QGLViewer linked with Qt version 5.
+
+Package: libqglviewer2-qt4
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: OpenGL 3D viewer library based on Qt - runtime library
+ 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 the shared library needed to run programs using
  QGLViewer. This package contains QGLViewer linked with Qt version 4.
+
+Package: libqglviewer-dev-qt4
+Section: libdevel
+Architecture: any
+Conflicts: libqglviewer-dev
+Depends:
+ libgl1-mesa-dev | libgl-dev,
+ libqglviewer2-qt4 (= ${binary:Version}),
+ libqt4-dev (>= 4:4.8.0~),
+ libqt4-opengl-dev (>= 4:4.8.0~),
+ libx11-dev,
+ libxext-dev,
+ libxmu-dev,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: OpenGL 3D viewer library based on Qt4 - development 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 the files needed to develop and compile programs
+ using QGLViewer linked with Qt version 4.
diff --git a/debian/libqglviewer-dev-qt4.install b/debian/libqglviewer-dev-qt4.install
new file mode 100644
index 0000000..315343c
--- /dev/null
+++ b/debian/libqglviewer-dev-qt4.install
@@ -0,0 +1,3 @@
+usr/include
+usr/lib/*/libQGLViewer-qt4.prl
+usr/lib/*/libQGLViewer-qt4.so
diff --git a/debian/libqglviewer-dev.install b/debian/libqglviewer-dev.install
index 1b6435e..d8fa24f 100644
--- a/debian/libqglviewer-dev.install
+++ b/debian/libqglviewer-dev.install
@@ -1,3 +1,3 @@
 usr/include
-usr/lib/*/*.prl
-usr/lib/*/*.so
+usr/lib/*/libQGLViewer.prl
+usr/lib/*/libQGLViewer.so
diff --git a/debian/libqglviewer2-qt4.install b/debian/libqglviewer2-qt4.install
new file mode 100644
index 0000000..95147ff
--- /dev/null
+++ b/debian/libqglviewer2-qt4.install
@@ -0,0 +1 @@
+usr/lib/*/libQGLViewer-qt4.so.*
diff --git a/debian/libqglviewer2.install b/debian/libqglviewer2.install
index 3de3b10..37bb388 100644
--- a/debian/libqglviewer2.install
+++ b/debian/libqglviewer2.install
@@ -1 +1 @@
-usr/lib/*/*.so.*
+usr/lib/*/libQGLViewer.so.*
diff --git a/debian/libqglviewer2.maintscript b/debian/libqglviewer2.maintscript
deleted file mode 100644
index 12cf26a..0000000
--- a/debian/libqglviewer2.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-symlink_to_dir /usr/share/doc/libqglviewer2 libqglviewer-qt3-2 2.5.3+dfsg-2.1~
diff --git a/debian/rules b/debian/rules
index d28316e..bd277bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,16 @@
 #!/usr/bin/make -f
 
-export QT_SELECT=qt5
-
 %:
 	dh $@ --parallel --sourcedirectory=$(CURDIR)/QGLViewer
 
 override_dh_auto_configure:
-	dh_auto_configure -- LIB_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+	mkdir -p $(CURDIR)/debian/qt4/
+	sed -i -- 's/TARGET = QGLViewer/TARGET = QGLViewer-qt4/g' QGLViewer/QGLViewer.pro
+	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
+	QT_SELECT=qt5 dh_auto_configure -- LIB_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_install:
 	find . -name '*.vcproj' -print0 | xargs -0 rm -f
@@ -15,3 +19,8 @@ override_dh_auto_install:
 			 -type f -and -name '*.html' -and -not -empty -print0 \
 			 | xargs -r -0 -n 1 sed -i '/script t/,/script>/d'
 	dh_auto_install
+	mv debian/qt4/* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf $(CURDIR)/debian/qt4

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

