--- libqglviewer-2.3.4.orig/debian/libqglviewer-dev.dirs +++ libqglviewer-2.3.4/debian/libqglviewer-dev.dirs @@ -0,0 +1,3 @@ +usr/share/doc +usr/include +usr/lib --- libqglviewer-2.3.4.orig/debian/libqglviewer-qt3-2.dirs +++ libqglviewer-2.3.4/debian/libqglviewer-qt3-2.dirs @@ -0,0 +1 @@ +usr/lib --- libqglviewer-2.3.4.orig/debian/libqglviewer-dev-common.docs +++ libqglviewer-2.3.4/debian/libqglviewer-dev-common.docs @@ -0,0 +1,4 @@ +debian/README.Multiflavour +GPL_EXCEPTION +README +doc/ --- libqglviewer-2.3.4.orig/debian/libqglviewer-dev-common.README.Debian +++ libqglviewer-2.3.4/debian/libqglviewer-dev-common.README.Debian @@ -0,0 +1,12 @@ +libqglviewer for Debian +-------------------------- + +This package contains QGLViewer made by Gilles.Debune available at: +http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/index.html + +You should know, that there was another package with the same name made by +a group of people from Tuebingen Univeristy[1]. + +[1] http://www.gris.uni-tuebingen.de/projects/qglviewer/ + + -- Artur R. Czechowski , Sun, 08 Jul 2007 00:32:15 +0200 --- libqglviewer-2.3.4.orig/debian/libqglviewer-qt3-dev.dirs +++ libqglviewer-2.3.4/debian/libqglviewer-qt3-dev.dirs @@ -0,0 +1 @@ +usr/lib --- libqglviewer-2.3.4.orig/debian/README.Multiflavour +++ libqglviewer-2.3.4/debian/README.Multiflavour @@ -0,0 +1,77 @@ +Multiflavour QGLViewer. +======================= + +Disclaimer: if technical details bore you and you just want to know how +to modify your software to be compatible with latest release of QGLViewer +Debian package please read the section What to do? + +General information. +==================== +This file is intented for developers. If don't need to compile any software +using libqglviewer library you can safely stop reading it. + +Since 2.2.6-3-4 libqglviewer in Debian is available in two flavours: + - linked with Qt3 library; + - linked with Qt4 library. + +Development packages are, respectively: + - libqglviewer-qt3-dev; + - libqglviewer-qt4-dev. + +However you shall not bother about it, for your information: runtime +packages with shared libraries are: libqglviewer-qt3-2 and libqglviewer-qt4-2. + +Documentation and header files are common for both flavours, they are put +into libqglviewer-dev-common package. + +So, to compile your software with libqglviewer you shall choose proper flavour +and install proper development package. Headers will be installed automatically +through dependency. + +Header files are available in /usr/include/QGLViewer directory, compatible +with upstream. + +The only one change you need to introduce is to choose proper library for +linking your software: + - for Qt3: libqglviewer-qt3.so and libqglviewer-qt3.a; + - for Qt4: libqglviewer-qt4.so and libqglviewer-qt4.a. +All files are located in /usr/lib directory. So, for dynamic linking you +shall replace -lqglviewer with -lqglviewer-qt3 (for example). + +Transition. +=========== + * old libqglviewer2 is a dummy package depending on libqglviewer-qt3-2 + * libqglviewer-qt3-2 conflicts with older libqglviewer2 + * libqglviewer-dev is an almost dummy package; it provides symlinks + for backward compatibility and it depends on libqglviewer-qt3-dev + * both libqglviewer-dev and libqglviewer2 is a special offer available for + a limited time only - please update your package ASAP :) + * if you have and old software linked with qglviewer from before mutliflavour + you can safely left it as is, proper symlinks are provided; your software + shall compile and run smoothly with no changes; however please read following + section: What to do? + * please note that everything mentioned till now is true only for squeeze; + so, if you are an unstable user you shall adjust your software before + releasing squeeze as stable; in other case you can attune it at your + convenience; as long as you are using squeeze there is no hurry + +Last but not least: I tried to do this multiflavour transition as unobtrusive +as possible. If you spot any problem not mentioned here, feel free to submit +a bug using Debian Bug Tracking System: http://bugs.debian.org/ + +What to do? +=========== +First: you shall recompile your software using relatively fresh release +of QGLViewer Debian package. At the moment version 2.3.4-1 (or later) is O.K. +After that you shall be able to remove libqglviewer2 package. This step does +not require any change in your software as long as you use transition package +libqglviewer-dev. If you spot any problem please let me know via BTS. + +Second: please remove both libqglviewer2 and libqglviewer-dev, make sure +you have installed libqglviewer-qt3-dev package, adjust library names. it shall +For dynamic linking replace -lqglviewer with -lqglviewer-qt3. +For static linking replace libqglviewer.a with libqglviewer-qt3.a. +That's all. + +Of course you can join both mentioned steps, and get rid off all transition +packages at once. --- libqglviewer-2.3.4.orig/debian/rules +++ libqglviewer-2.3.4/debian/rules @@ -0,0 +1,178 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +include /usr/share/dpatch/dpatch.make + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +export MULTIARCHLIB = $(DEB_HOST_MULTIARCH) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +version:=$(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^Version: //' -e 's/-.*$$//') +ver2:=$(shell echo $(version) | cut -d. -f-2) +major:=$(shell echo $(version) | cut -d. -f1) + +build: build-stamp +build-stamp: patch-stamp + dh_testdir + cp -a QGLViewer qglviewer-qt3 + cp -a QGLViewer qglviewer-qt4 + cd qglviewer-qt3 && qmake-qt3 + cd qglviewer-qt4 && qmake-qt4 + cd qglviewer-qt3 && $(MAKE) && $(MAKE) staticlib + cd qglviewer-qt4 && $(MAKE) && $(MAKE) staticlib + # designer's plugins + cp -a designerPlugin designerPlugin-qt3 + cp -a designerPlugin designerPlugin-qt4 + cd designerPlugin-qt3 && qmake-qt3 LIB_DIR=../qglviewer-qt3 QTDIR=/usr/lib/qt3 + cd designerPlugin-qt4 && qmake-qt4 LIB_DIR=../qglviewer-qt4 + cd designerPlugin-qt3 && $(MAKE) + cd designerPlugin-qt4 && $(MAKE) + # + touch build-stamp + +clean: clean1 unpatch +clean1: + dh_testdir + dh_testroot + rm -f build-stamp + rm -rf qglviewer-qt3 qglviewer-qt4 designerPlugin-qt3 designerPlugin-qt4 + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + cd qglviewer-qt3 && $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp + cd designerPlugin-qt3 && $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp + + mkdir -p debian/libqglviewer-qt3-2/usr/lib debian/libqglviewer-qt3-dev/usr/lib/qt3/plugins/designer + + cp -d debian/tmp/usr/lib/*.so.* debian/libqglviewer-qt3-2/usr/lib + cp -d qglviewer-qt3/libqglviewer-qt3.a debian/libqglviewer-qt3-dev/usr/lib + cp -d debian/tmp/usr/lib/*.so debian/libqglviewer-qt3-dev/usr/lib + cp -d debian/tmp/usr/lib/*.prl debian/libqglviewer-qt3-dev/usr/lib + cp -d debian/tmp/usr/lib/qt3/plugins/designer/libqglviewerplugin.so debian/libqglviewer-qt3-dev/usr/lib/qt3/plugins/designer + + rm -rf debian/tmp + mkdir debian/tmp + + cd qglviewer-qt4 && $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp + cd designerPlugin-qt4 && $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp + + mkdir -p debian/libqglviewer-qt4-2/usr/lib/$(MULTIARCHLIB) debian/libqglviewer-qt4-dev/usr/lib/$(MULTIARCHLIB)/qt4/plugins/designer + + cp -d debian/tmp/usr/lib/*.so.* debian/libqglviewer-qt4-2/usr/lib/$(MULTIARCHLIB) + cp -d qglviewer-qt4/libqglviewer-qt4.a debian/libqglviewer-qt4-dev/usr/lib/$(MULTIARCHLIB) + cp -d debian/tmp/usr/lib/*.so debian/libqglviewer-qt4-dev/usr/lib/$(MULTIARCHLIB) + cp -d debian/tmp/usr/lib/*.prl debian/libqglviewer-qt4-dev/usr/lib/$(MULTIARCHLIB) + cp -d debian/tmp/usr/lib/$(MULTIARCHLIB)/qt4/plugins/designer/libqglviewerplugin.so debian/libqglviewer-qt4-dev/usr/lib/$(MULTIARCHLIB)/qt4/plugins/designer + + cp -dr debian/tmp/usr/include/QGLViewer debian/libqglviewer-dev-common/usr/include + + # Transition stuff + ## libqglviewer-qt3 + ln -sf libqglviewer-qt3.so.$(version) debian/libqglviewer-qt3-2/usr/lib/libqglviewer.so.$(version) + ln -sf libqglviewer-qt3.so.$(version) debian/libqglviewer-qt3-2/usr/lib/libqglviewer.so.$(ver2) + ln -sf libqglviewer-qt3.so.$(version) debian/libqglviewer-qt3-2/usr/lib/libqglviewer.so.$(major) + + ## libqglviewer-dev + mkdir -p debian/libqglviewer-dev/usr/share/doc debian/libqglviewer-dev/usr/lib debian/libqglviewer-dev/usr/include + ln -sf libqglviewer-qt3-dev debian/libqglviewer-dev/usr/share/doc/libqglviewer-dev + ln -sf libqglviewer-qt3.a debian/libqglviewer-qt3-dev/usr/lib/libqglviewer.a + ln -sf libqglviewer-qt3.prl debian/libqglviewer-qt3-dev/usr/lib/libqglviewer.prl + #ln -sf qglviewer-qt3 debian/libqglviewer-dev/usr/include/QGLViewer + ln -sf libqglviewer-qt3.so.$(version) debian/libqglviewer-qt3-dev/usr/lib/libqglviewer.so + + ## libqglviewer2 + mkdir -p debian/libqglviewer2/usr/share/doc + ln -sf libqglviewer-qt3-2 debian/libqglviewer2/usr/share/doc/libqglviewer2 + # End of Transition stuff + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + # Transition stuff - after transition remove -a option + # from following two lines + dh_installchangelogs -plibqglviewer-dev-common CHANGELOG doc/changeLog.html + dh_installdocs -plibqglviewer-dev-common + dh_installexamples -i + dh_install -i + #rm -f debian/libqglviewer-dev/usr/share/doc/libqglviewer-dev/doc/hierarchy.html +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo +# dh_installman -i +# dh_link -i +# dh_strip -i + dh_compress -i -Xlibqglviewer-dev-common/examples + dh_fixperms -i +# dh_perl +# dh_python + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + # Transition stuff - after transition remove -a option + # from following two lines + dh_installchangelogs -a CHANGELOG doc/changeLog.html + dh_installdocs -a + dh_installexamples -a + dh_install -a + #rm -f debian/libqglviewer-dev/usr/share/doc/libqglviewer-dev/doc/hierarchy.html +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman -a + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a +# dh_perl +# dh_python + dh_makeshlibs -V -a + dh_installdeb -a + dh_shlibdeps -ldebian/libqglviewer2-qt3/usr/lib:debian/libqglviewer2-qt4/usr/lib -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- libqglviewer-2.3.4.orig/debian/libqglviewer-qt4-dev.dirs +++ libqglviewer-2.3.4/debian/libqglviewer-qt4-dev.dirs @@ -0,0 +1 @@ +usr/lib --- libqglviewer-2.3.4.orig/debian/watch +++ libqglviewer-2.3.4/debian/watch @@ -0,0 +1,6 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# Site Directory Pattern Version Script +version=2 +http://www.libqglviewer.com/src/libQGLViewer-([0-9].*)\.tar\.gz debian uupdate --- libqglviewer-2.3.4.orig/debian/libqglviewer-qt3-dev.README.Debian +++ libqglviewer-2.3.4/debian/libqglviewer-qt3-dev.README.Debian @@ -0,0 +1,12 @@ +libqglviewer for Debian +-------------------------- + +This package contains QGLViewer made by Gilles.Debune available at: +http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/index.html + +You should know, that there was another package with the same name made by +a group of people from Tuebingen Univeristy[1]. + +[1] http://www.gris.uni-tuebingen.de/projects/qglviewer/ + + -- Artur R. Czechowski , Sun, 08 Jul 2007 00:32:15 +0200 --- libqglviewer-2.3.4.orig/debian/changelog +++ libqglviewer-2.3.4/debian/changelog @@ -0,0 +1,189 @@ +libqglviewer (2.3.4-4ubuntu2) precise; urgency=low + + * Add 04glu-include.dpatch to fix FTBFS with Qt 4.8. + * Add 05glu-link.dpatch to make libqglviewer-qt4 link against libGLU. + * Add Pre-Depends: ${misc:Pre-Depends} to libqglviewer-qt4-2. + * Mark libqglviewer-qt4-2 as Multi-Arch: same. + + -- Felix Geyer Wed, 08 Feb 2012 15:40:41 +0100 + +libqglviewer (2.3.4-4ubuntu1) oneiric; urgency=low + + * debian/rules: Use Qt4 multiarch lib path. Fixes FTBFS. (LP: #831198) + + -- Daniel T Chen Tue, 20 Sep 2011 11:42:18 -0400 + +libqglviewer (2.3.4-4) unstable; urgency=high + + * reupload with high urgency + + -- Artur R. Czechowski Wed, 08 Dec 2010 20:42:00 +0000 + +libqglviewer (2.3.4-3) unstable; urgency=low + + * only typo fixes, urgency high + * fixed typo in description of libqglviewer-qt4-dev (Closes: #584182) + * fixed typo in description of libqglviewer-dev (Closes: #605885) + + -- Artur R. Czechowski Wed, 08 Dec 2010 19:11:33 +0000 + +libqglviewer (2.3.4-2) unstable; urgency=low + + * dummy packages libqglviewer-dev and libqglviewer2 have a Priority: extra + now + * remove symlinks /usr/include/qglviewer-qt[34] pointing + to /usr/include/QGLViewer, no package shall use them + * README.Multiflavour is updated + * fixes for following problems spotted by Joahim Reichel: + + to avoid dangling transition symlinks when upstream version is changed + version is taken from dpkg-parsechangelog now instead of hardcoded string + + new patch: 03only-headers-in-include-dir.dpatch - do not install files + other than headers in include directory + + make sure that Qt4 is used to compile examples, if not - error message + is thrown + * Adding Depends: ${misc:Depends} to quiet the lintian + + -- Artur R. Czechowski Sat, 02 Jan 2010 19:39:31 +0000 + +libqglviewer (2.3.4-1) unstable; urgency=low + + * new upstream release + * update debhelper compat version to 7, updated dependecy + + remove superfluous debian/*.install files. + + replace dh_clean -k with dh_prep + * update standard version to 3.8.3 (no changes required) + * examples are now compilable using libqglviewer-qt4-dev, + new patch: 99compile-examples.dpatch (Closes: #534495) + * plugin for qt-designer, both for Qt3 and Qt4 version + (updated 01qt3-qt4.dpatch), available in -dev packages + + -- Artur R. Czechowski Mon, 02 Nov 2009 21:38:20 +0000 + +libqglviewer (2.3.1-4) experimental; urgency=low + + * some improvements about mutliflavour transition stuff + * multiflavour and transition details are described in + README.Multiflavour + * dev packages contains only .so and .a files + * new package: libqglviewer-dev-common introduced, contains headers + and documentation + * due to above includes are in sane location again, however it does + not fully fixes the bug it's all what can be done at the moment, + (Closes: #522659) + * /usr/include/qglviewer-qt3 and /usr/include/qglviewer-qt4 are symlinks + pointing to /usr/include/QGLViewer for a short time + * added GPL_EXCEPTION for non-compatible licences, see the file + for details + * example sources are added, available in + /usr/share/doc/libqglviewer-dev-common/examples + + -- Artur R. Czechowski Sun, 11 Oct 2009 21:03:01 +0000 + +libqglviewer (2.3.1-3) unstable; urgency=low + + * upload to unstable + + -- Artur R. Czechowski Mon, 16 Mar 2009 22:14:47 +0000 + +libqglviewer (2.3.1-2) experimental; urgency=low + + * This release is focused for transition from qt3-only version + to qt3 and qt4 flavours available as unobtrusive as possible. + + libqglviewer-dev: add symlinks: + - /usr/lib/libqglviewer.a -> /usr/lib/libqglviewer-qt3.a + - /usr/lib/libqglviewer.prl -> /usr/lib/libqglviewer-qt3.prl + - /usr/include/QGLViewer -> /usr/include/qglviewer-qt3 + - /usr/lib/libqglviewer.so -> /usr/lib/libqglviewer-qt3.so.2.3.1 + + debian/rules: updated symlinks for dynamic libraries versions + + new dummy package libqglviewer2 depending on libqglviewer-qt3-2 + for smoother transition for satysfying versioned dependency + + libqglviewer-qt3-2 conflicts with versions of libqglviewer2 before + transition and no more replaces libqglviewer2. + + updated transition notes in debian/NEWS + * fixed typo in debian/changelog + * debian/copyright: correct typo in licence filename (GPL2 -> GPL-2) + + -- Artur R. Czechowski Thu, 26 Feb 2009 13:08:22 +0100 + +libqglviewer (2.3.1-1) experimental; urgency=low + + * New upstream release + + compiles with gcc-snapshot 20090224-1 (Closes: #505057) + * regenerate all patches in debian/patches + * updated patches: + + 01qt3-qt4: upstream switched to Qt4, but we still want Qt3 flavour + + 02staticlib-install: contrary to upstream intentions we want to provide + static libraries + * removed patches: + + 03fix-compilation-with-gcc-4.3: applied upstream + * debian/rules: + + there is no Makefile.Release generated for Qt4 flavour, run + $(MAKE) staticlib + instead of + $(MAKE) -f Makefile.Release staticlib + + removed superfluous dependency in clean1 target to fix FTBFS on some + architectures, thanks to Thiemo Seufer (Closes: #495115) + * New homepage for project: + + set Homepage in debian/control + + updated debian/watch + + updated debian/copyright + * debian/copyright: refers to GPL2 instead of GPL to make lintian happy + * Update package to Standards-Version 3.8.0 + + change in debian/control + + copy README.source from dpatch + + -- Artur R. Czechowski Wed, 25 Feb 2009 23:44:25 +0100 + +libqglviewer (2.2.6-3-4) experimental; urgency=low + + * libqglviewer in two flavours: linked with qt3 and qt4 (Closes: #471893, + #477387) + * See NEWS.Debian for other details about transition + * Updated description + * DM-Upload-Allowed: yes + + -- Artur R. Czechowski Sun, 29 Jun 2008 21:30:10 +0200 + +libqglviewer (2.2.6-3-3) unstable; urgency=low + + * Really install libqglviewer.a for static linking (Closes: #471711) + + -- Artur R. Czechowski Thu, 20 Mar 2008 17:10:19 +0100 + +libqglviewer (2.2.6-3-2) unstable; urgency=low + + * Using dpatch to manage patches, adding dpatch to Build-depends. + * Move old changes to dpatch: + - 01lower-case-name + - 02staticlib-install + * New patches: + - 03fix-compilation-with-gcc-4.3 (Closes: #456065) + * Fixed dependencies in libqglviewer-dev to allow to use non-standard + GL libraries, depends on libgl1-mesa-dev | libgl-dev instead of + xlibmesa-gl-dev (Closes: #470958) + * debian/rules: remove libqglviewer.prl in clean rule too + * Add proper line to debian/copyright to cool off the lintian + * Fixed section on doc-base file + * Update Standards-Version to 3.7.3, no changes required + + -- Artur R. Czechowski Sun, 16 Mar 2008 11:27:28 +0100 + +libqglviewer (2.2.6-3-1) unstable; urgency=low + + * New upstream release + + -- Artur R. Czechowski Sun, 14 Oct 2007 21:22:51 +0200 + +libqglviewer (2.2.2-3-2) unstable; urgency=low + + * make distclean instead make clean in debian/rules clean to avoid FTBFS + when build twice in a row (Closes: #442651) + + -- Artur R. Czechowski Sun, 16 Sep 2007 21:25:40 +0200 + +libqglviewer (2.2.2-3-1) unstable; urgency=low + + * Initial Debian release (Closes: #208073) + + -- Artur R. Czechowski Thu, 26 Jul 2007 23:45:42 +0200 + --- libqglviewer-2.3.4.orig/debian/libqglviewer-qt4-2.dirs +++ libqglviewer-2.3.4/debian/libqglviewer-qt4-2.dirs @@ -0,0 +1 @@ +usr/lib --- libqglviewer-2.3.4.orig/debian/libqglviewer-qt4-2.docs +++ libqglviewer-2.3.4/debian/libqglviewer-qt4-2.docs @@ -0,0 +1,3 @@ +debian/README.Multiflavour +GPL_EXCEPTION +README --- libqglviewer-2.3.4.orig/debian/libqglviewer-dev-common.examples +++ libqglviewer-2.3.4/debian/libqglviewer-dev-common.examples @@ -0,0 +1 @@ +examples/* --- libqglviewer-2.3.4.orig/debian/libqglviewer-qt4-2.README.Debian +++ libqglviewer-2.3.4/debian/libqglviewer-qt4-2.README.Debian @@ -0,0 +1,12 @@ +libqglviewer for Debian +-------------------------- + +This package contains QGLViewer made by Gilles.Debune available at: +http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/index.html + +You should know, that there was another package with the same name made by +a group of people from Tuebingen Univeristy[1]. + +[1] http://www.gris.uni-tuebingen.de/projects/qglviewer/ + + -- Artur R. Czechowski , Sun, 08 Jul 2007 00:32:15 +0200 --- libqglviewer-2.3.4.orig/debian/libqglviewer-qt4-dev.README.Debian +++ libqglviewer-2.3.4/debian/libqglviewer-qt4-dev.README.Debian @@ -0,0 +1,12 @@ +libqglviewer for Debian +-------------------------- + +This package contains QGLViewer made by Gilles.Debune available at: +http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/index.html + +You should know, that there was another package with the same name made by +a group of people from Tuebingen Univeristy[1]. + +[1] http://www.gris.uni-tuebingen.de/projects/qglviewer/ + + -- Artur R. Czechowski , Sun, 08 Jul 2007 00:32:15 +0200 --- libqglviewer-2.3.4.orig/debian/libqglviewer-dev-common.dirs +++ libqglviewer-2.3.4/debian/libqglviewer-dev-common.dirs @@ -0,0 +1 @@ +usr/include --- libqglviewer-2.3.4.orig/debian/control +++ libqglviewer-2.3.4/debian/control @@ -0,0 +1,124 @@ +Source: libqglviewer +Section: libs +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Artur R. Czechowski +DM-Upload-Allowed: yes +Homepage: http://www.libqglviewer.com/ +Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 7), libqt3-mt-dev, libqt4-dev, libqt4-opengl-dev, dpatch + +Package: libqglviewer-dev-common +Section: libdevel +Architecture: all +Depends: ${misc:Depends} +Recommends: libqglviewer-qt4-dev | libqglviewer-qt3-dev +Conflicts: libqglviewer-dev (<< 2.3.1-4~) +Description: an OpenGL 3D viewer library based on Qt3 - 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 the header files needed to develop programs using + QGLViewer and documentation with examples. + +Package: libqglviewer-qt3-dev +Section: libdevel +Architecture: any +Depends: libqglviewer-qt3-2 (= ${binary:Version}), libqglviewer-dev-common (= ${source:Version}), ${shlibs:Depends}, libqt3-mt-dev, libx11-dev, libxext-dev, libxmu-dev, libgl1-mesa-dev | libgl-dev, ${misc:Depends} +Description: an OpenGL 3D viewer library based on Qt3 - 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 library files needed to develop and compile programs + using QGLViewer linked with Qt version 3. + +Package: libqglviewer-qt3-2 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: libqglviewer2 (<< 2.3.1) +Provides: libqglviewer2 +Description: an OpenGL 3D viewer library based on Qt3 - 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 3. + + +Package: libqglviewer-qt4-dev +Section: libdevel +Architecture: any +Depends: libqglviewer-qt4-2 (= ${binary:Version}), libqglviewer-dev-common (= ${source:Version}), ${shlibs:Depends}, libqt4-dev, libx11-dev, libxext-dev, libxmu-dev, libgl1-mesa-dev | libgl-dev, libqt4-opengl-dev, ${misc:Depends} +Description: an 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 library files needed to develop and compile programs + using QGLViewer linked with Qt version 4. + +Package: libqglviewer-qt4-2 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: an 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 +Section: libdevel +Architecture: all +Depends: libqglviewer-qt3-dev, ${misc:Depends} +Priority: extra +Description: Dummy package to install libqglviewer-qt3-dev + The QGLViewer is available in two flavours: linked with Qt3 and Qt4. This + package is intended for allowing smooth transition to libqglviewer-qt3-dev. + . + You can remove this package when your software is buildable with + libqglviewer-qt3-dev. + +Package: libqglviewer2 +Section: oldlibs +Priority: extra +Architecture: all +Depends: libqglviewer-qt3-2 (>= ${source:Version}), ${misc:Depends} +Description: Dummy package to install libqglviewer-qt3-2 + The QGLViewer is available in two flavours: linked with Qt3 and Qt4. This + package is intended for allowing smooth transition to libqglviewer-qt3-2. + . + You can safely remove this package if no other package depends on it. --- libqglviewer-2.3.4.orig/debian/libqglviewer-qt3-dev.docs +++ libqglviewer-2.3.4/debian/libqglviewer-qt3-dev.docs @@ -0,0 +1,3 @@ +debian/README.Multiflavour +GPL_EXCEPTION +README --- libqglviewer-2.3.4.orig/debian/copyright +++ libqglviewer-2.3.4/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Artur R. Czechowski on +Sat, 19 Feb 2005 00:57:26 +0100. + +It was downloaded from +http://www.libqglviewer.com/ + +Copyright 2002-2003-2004-2005-2006-2007-2008-2009 Gilles Debunne + +Copyright: + +Upstream Author: Gilles Debunne + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. --- libqglviewer-2.3.4.orig/debian/libqglviewer-dev-common.install +++ libqglviewer-2.3.4/debian/libqglviewer-dev-common.install @@ -0,0 +1 @@ +usr/include/* --- libqglviewer-2.3.4.orig/debian/libqglviewer-dev-common.doc-base +++ libqglviewer-2.3.4/debian/libqglviewer-dev-common.doc-base @@ -0,0 +1,9 @@ +Document: libqglviewer-dev-common +Title: Debian libqglviewer Manual +Author: Gilles Debunne +Abstract: This manual describes what libqglviewer is and how it can be used. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libqglviewer-dev-common/doc/index.html +Files: /usr/share/doc/libqglviewer-dev-common/doc/*.html --- libqglviewer-2.3.4.orig/debian/compat +++ libqglviewer-2.3.4/debian/compat @@ -0,0 +1 @@ +7 --- libqglviewer-2.3.4.orig/debian/NEWS +++ libqglviewer-2.3.4/debian/NEWS @@ -0,0 +1,28 @@ +libqglviewer (2.3.1-4) experimental; urgency=low + + * Details about transition and multiflavour compilation are available + in README.Multiflavour file. + + -- Artur R. Czechowski Sun, 11 Oct 2009 21:05:27 +0000 + +libqglviewer (2.3.1-2) experimental; urgency=low + + * If you never compiled any software with libqglviewer you can safely ignore + content of this note. + * Since 2.2.6-3-4 libqglviewer is available in two flavours: + + linked with Qt3: packages: libqglviewer-qt3-2 and libqglviewer-qt3-dev + + linked with Qt4: packages: libqglviewer-qt4-2 and libqglviewer-qt4-dev + * libqglviewer2 is a dummy package depending on libqglviewer-qt3-2 + for satysfying versioned dependency on the package + * libqglviewer-qt3-2 Conflicts with older libqglviewer2 + * libqglviewer-dev is a dummy package depending on libqglviewer-qt3-dev, + please note, that important paths has changed - you need to update include + path, shared library name and static library name (if used) + * I tried to do this multi-flavour compilation as unobtrusive for normal + users as possible - it should be unnoticeable for them. If not - please + submit a bug. But if you are a developer you need to made changes to your + software. In case of problems please contact me directly. + * Both libqglviewer-dev and libqglviewer2 is a special offer available for + a limited time only - please update your package ASAP :) + + -- Artur R. Czechowski Thu, 26 Feb 2009 13:08:22 +0100 --- libqglviewer-2.3.4.orig/debian/libqglviewer-qt4-dev.docs +++ libqglviewer-2.3.4/debian/libqglviewer-qt4-dev.docs @@ -0,0 +1,3 @@ +debian/README.Multiflavour +GPL_EXCEPTION +README --- libqglviewer-2.3.4.orig/debian/libqglviewer-qt3-2.README.Debian +++ libqglviewer-2.3.4/debian/libqglviewer-qt3-2.README.Debian @@ -0,0 +1,12 @@ +libqglviewer for Debian +-------------------------- + +This package contains QGLViewer made by Gilles.Debune available at: +http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/index.html + +You should know, that there was another package with the same name made by +a group of people from Tuebingen Univeristy[1]. + +[1] http://www.gris.uni-tuebingen.de/projects/qglviewer/ + + -- Artur R. Czechowski , Sun, 08 Jul 2007 00:32:15 +0200 --- libqglviewer-2.3.4.orig/debian/libqglviewer-qt3-2.docs +++ libqglviewer-2.3.4/debian/libqglviewer-qt3-2.docs @@ -0,0 +1,3 @@ +debian/README.Multiflavour +GPL_EXCEPTION +README --- libqglviewer-2.3.4.orig/debian/README.source +++ libqglviewer-2.3.4/debian/README.source @@ -0,0 +1,38 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get the fully patched source after unpacking the source package, cd +to the root level of the source package and run: + + debian/rules patch + +Removing a patch is as simple as removing its entry from the +debian/patches/00list file, and please also remove the patch file +itself. + +Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" +where you should replace XX with a new number and patchname with a +descriptive shortname of the patch. You can then simply edit all the +files your patch wants to edit, and then simply "exit 0" from the shell +to actually create the patch file. + +To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" +and replace XX_patchname with the actual filename from debian/patches +you want to use. + +To clean up afterwards again, "debian/rules unpatch" will do the +work for you - or you can of course choose to call +"fakeroot debian/rules clean" all together. + + +--- + +this documentation is part of dpatch package, and may be used by +packages using dpatch to comply with policy on README.source. This +documentation is meant to be useful to users who are not proficient in +dpatch in doing work with dpatch-based packages. Please send any +improvements to the BTS of dpatch package. + +original text by Gerfried Fuchs, edited by Junichi Uekawa +10 Aug 2008. --- libqglviewer-2.3.4.orig/debian/libqglviewer2.dirs +++ libqglviewer-2.3.4/debian/libqglviewer2.dirs @@ -0,0 +1 @@ +usr/share/doc --- libqglviewer-2.3.4.orig/debian/patches/05glu-link.dpatch +++ libqglviewer-2.3.4/debian/patches/05glu-link.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05glu-link.dpatch by Felix Geyer +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ + +diff -Nur libqglviewer-2.3.4.org/QGLViewer/QGLViewer.pro libqglviewer-2.3.4/QGLViewer/QGLViewer.pro +--- libqglviewer-2.3.4.org/QGLViewer/QGLViewer.pro ++++ libqglviewer-2.3.4/QGLViewer/QGLViewer.pro +@@ -131,6 +131,8 @@ + QMAKE_LIBS_OPENGL *= -lglut + } + ++ QMAKE_LIBS_OPENGL *= -lGLU ++ + MOC_DIR = .moc + OBJECTS_DIR = .obj + --- libqglviewer-2.3.4.orig/debian/patches/04glu-include.dpatch +++ libqglviewer-2.3.4/debian/patches/04glu-include.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04glu-include.dpatch by Felix Geyer +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ + +diff -Nur libqglviewer-2.3.4.org/QGLViewer/camera.cpp libqglviewer-2.3.4/QGLViewer/camera.cpp +--- libqglviewer-2.3.4.org/QGLViewer/camera.cpp ++++ libqglviewer-2.3.4/QGLViewer/camera.cpp +@@ -24,6 +24,8 @@ + #include "camera.h" + #include "qglviewer.h" + ++#include ++ + using namespace std; + using namespace qglviewer; + +diff -Nur libqglviewer-2.3.4.org/QGLViewer/qglviewer.cpp libqglviewer-2.3.4/QGLViewer/qglviewer.cpp +--- libqglviewer-2.3.4.org/QGLViewer/qglviewer.cpp ++++ libqglviewer-2.3.4/QGLViewer/qglviewer.cpp +@@ -58,6 +58,8 @@ + # define value data + #endif + ++#include ++ + using namespace std; + using namespace qglviewer; + --- libqglviewer-2.3.4.orig/debian/patches/00list +++ libqglviewer-2.3.4/debian/patches/00list @@ -0,0 +1,6 @@ +01qt3-qt4 +02staticlib-install +03only-headers-in-include-dir +04glu-include +05glu-link +99compile-examples --- libqglviewer-2.3.4.orig/debian/patches/99compile-examples.dpatch +++ libqglviewer-2.3.4/debian/patches/99compile-examples.dpatch @@ -0,0 +1,1111 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 99compile-examples.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad libqglviewer-2.3.4~/examples/animation/animation.pro libqglviewer-2.3.4/examples/animation/animation.pro +--- libqglviewer-2.3.4~/examples/animation/animation.pro 2009-08-31 23:05:39.000000000 +0200 ++++ libqglviewer-2.3.4/examples/animation/animation.pro 2010-01-02 19:59:45.404172932 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # The animate() function illustrated by a water particle simulation. + + # When animation is activated (the Return key toggles animation), the animate() and +@@ -56,7 +59,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -102,7 +105,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/callback/callback.pro libqglviewer-2.3.4/examples/callback/callback.pro +--- libqglviewer-2.3.4~/examples/callback/callback.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/callback/callback.pro 2010-01-02 20:00:36.222158100 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Using the Qt signal-slot mechanism to connect a QGLViewer to your scene. + + # This very simple application uses the Qt signal-slot callback mechanism to link the QGLViewer and +@@ -53,7 +56,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -99,7 +102,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/cameraLight/cameraLight.pro libqglviewer-2.3.4/examples/cameraLight/cameraLight.pro +--- libqglviewer-2.3.4~/examples/cameraLight/cameraLight.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/cameraLight/cameraLight.pro 2010-01-02 20:00:44.470161641 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # This example shows how to position a GL_LIGHT on the camera. + + # A spot light position and direction are set so that they always match the +@@ -55,7 +58,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -101,7 +104,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/clippingPlane/clippingPlane.pro libqglviewer-2.3.4/examples/clippingPlane/clippingPlane.pro +--- libqglviewer-2.3.4~/examples/clippingPlane/clippingPlane.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/clippingPlane/clippingPlane.pro 2010-01-02 20:00:39.600467904 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # A clipping plane is manipulated using a ManipulatedFrame + + # The standard OpenGL GL_CLIP_PLANE feature is used to add an additionnal clipping +@@ -58,7 +61,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -104,7 +107,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/constrainedCamera/constrainedCamera.pro libqglviewer-2.3.4/examples/constrainedCamera/constrainedCamera.pro +--- libqglviewer-2.3.4~/examples/constrainedCamera/constrainedCamera.pro 2009-08-31 23:05:39.000000000 +0200 ++++ libqglviewer-2.3.4/examples/constrainedCamera/constrainedCamera.pro 2010-01-02 20:00:11.750160467 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Constraints applied on the Camera Frame to limit its translation and/or rotation. + + # Try the different possible constraints using the T (translate) and R (rotate) keys. G and D change +@@ -55,7 +58,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -101,7 +104,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/constrainedFrame/constrainedFrame.pro libqglviewer-2.3.4/examples/constrainedFrame/constrainedFrame.pro +--- libqglviewer-2.3.4~/examples/constrainedFrame/constrainedFrame.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/constrainedFrame/constrainedFrame.pro 2010-01-02 20:00:59.214160472 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Constraints can limit the translation and/or rotation of a (Manipulated)Frame. + + # Try the different possible constraints using the T (translate) and R (rotate) keys. G and D change +@@ -55,7 +58,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -101,7 +104,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/contribs/3dsViewer/3dsViewer.pro libqglviewer-2.3.4/examples/contribs/3dsViewer/3dsViewer.pro +--- libqglviewer-2.3.4~/examples/contribs/3dsViewer/3dsViewer.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/3dsViewer/3dsViewer.pro 2010-01-02 20:01:55.626482512 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # The LGPL lib3ds library is used to load and display a 3ds scene. + + # You need to install the lib3ds library (version 1.2) in order to compile this file. +@@ -84,7 +87,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -130,7 +133,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/contribs/agora/AI/AI.pro libqglviewer-2.3.4/examples/contribs/agora/AI/AI.pro +--- libqglviewer-2.3.4~/examples/contribs/agora/AI/AI.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/agora/AI/AI.pro 2010-01-02 20:01:43.170161553 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + TEMPLATE = app + TARGET = agoraAI + +@@ -49,7 +52,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -95,7 +98,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/contribs/agora/Viewer/Viewer.pro libqglviewer-2.3.4/examples/contribs/agora/Viewer/Viewer.pro +--- libqglviewer-2.3.4~/examples/contribs/agora/Viewer/Viewer.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/agora/Viewer/Viewer.pro 2010-01-02 20:01:44.958161335 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Implementation of the game of Agora. + + # Agora is a strategy game for two players. The rules are available in the help menu. The +@@ -62,7 +65,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -108,7 +111,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/contribs/agora/agora.pro libqglviewer-2.3.4/examples/contribs/agora/agora.pro +--- libqglviewer-2.3.4~/examples/contribs/agora/agora.pro 2009-08-31 23:05:29.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/agora/agora.pro 2010-01-02 20:01:41.158158361 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Implementation of the game of Agora. + + # Agora is a strategy game for two players. The code is rather complex and +diff -urNad libqglviewer-2.3.4~/examples/contribs/anaglyph/anaglyph.pro libqglviewer-2.3.4/examples/contribs/anaglyph/anaglyph.pro +--- libqglviewer-2.3.4~/examples/contribs/anaglyph/anaglyph.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/anaglyph/anaglyph.pro 2010-01-02 20:01:39.132270554 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Displays a scene in pseudo-stereo using anaglyph. + + # The anaglyph stereo mode displays simultaneously two colored views of the scene. You need to wear +@@ -58,7 +61,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -104,7 +107,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/contribs/backgroundImage/backgroundImage.pro libqglviewer-2.3.4/examples/contribs/backgroundImage/backgroundImage.pro +--- libqglviewer-2.3.4~/examples/contribs/backgroundImage/backgroundImage.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/backgroundImage/backgroundImage.pro 2010-01-02 20:01:32.158162763 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Displays a background image in the viewer. + + # This example is derived from the textureViewer example. It displays a +@@ -59,7 +62,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -105,7 +108,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/contribs/blobWar/AI/AI.pro libqglviewer-2.3.4/examples/contribs/blobWar/AI/AI.pro +--- libqglviewer-2.3.4~/examples/contribs/blobWar/AI/AI.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/blobWar/AI/AI.pro 2010-01-02 20:01:48.634181194 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + TEMPLATE = app + TARGET = blobWarAI + +@@ -49,7 +52,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -95,7 +98,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/contribs/blobWar/Viewer/Viewer.pro libqglviewer-2.3.4/examples/contribs/blobWar/Viewer/Viewer.pro +--- libqglviewer-2.3.4~/examples/contribs/blobWar/Viewer/Viewer.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/blobWar/Viewer/Viewer.pro 2010-01-02 20:01:50.362160620 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Implementation of the game of BlobWar. + + # BlobWar is a strategy game for two players. The rules are available in the help menu. The +@@ -68,7 +71,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -114,7 +117,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/contribs/blobWar/blobWar.pro libqglviewer-2.3.4/examples/contribs/blobWar/blobWar.pro +--- libqglviewer-2.3.4~/examples/contribs/blobWar/blobWar.pro 2009-08-31 23:05:30.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/blobWar/blobWar.pro 2010-01-02 20:01:46.819487885 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Implementation of the game of BlobWar. + + # BlobWar is a strategy game for two players. The rules are available in the help menu. The +diff -urNad libqglviewer-2.3.4~/examples/contribs/contribs.pro libqglviewer-2.3.4/examples/contribs/contribs.pro +--- libqglviewer-2.3.4~/examples/contribs/contribs.pro 2009-08-31 23:05:28.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/contribs.pro 2010-01-02 20:01:18.150163174 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + TEMPLATE = subdirs + SUBDIRS = agora \ + anaglyph \ +diff -urNad libqglviewer-2.3.4~/examples/contribs/cornerAxis/cornerAxis.pro libqglviewer-2.3.4/examples/contribs/cornerAxis/cornerAxis.pro +--- libqglviewer-2.3.4~/examples/contribs/cornerAxis/cornerAxis.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/cornerAxis/cornerAxis.pro 2010-01-02 20:01:33.982160814 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Displays a world axis in the lower-left corner of the window. + + # A world axis representation is drawn in the lower left corner, so that one always sees how the scene is oriented. +@@ -57,7 +60,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -103,7 +106,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/contribs/dvonn/dvonn.pro libqglviewer-2.3.4/examples/contribs/dvonn/dvonn.pro +--- libqglviewer-2.3.4~/examples/contribs/dvonn/dvonn.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/dvonn/dvonn.pro 2010-01-02 20:01:02.126615470 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Implementation of the game of Dvonn. + + # Dvonn is a very good strategy game for two players. See the Help menu for complete rules. +@@ -67,7 +70,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -113,7 +116,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/contribs/eventRecorder/eventRecorder.pro libqglviewer-2.3.4/examples/contribs/eventRecorder/eventRecorder.pro +--- libqglviewer-2.3.4~/examples/contribs/eventRecorder/eventRecorder.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/eventRecorder/eventRecorder.pro 2010-01-02 20:01:28.478164184 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Records a scenario that can be replayed and converted into a movie. + + # An EventRecorder is associated to a QGLViewer. When the +@@ -64,7 +67,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -110,7 +113,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/contribs/quarto/quarto.pro libqglviewer-2.3.4/examples/contribs/quarto/quarto.pro +--- libqglviewer-2.3.4~/examples/contribs/quarto/quarto.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/quarto/quarto.pro 2010-01-02 20:01:21.114172959 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # A simulation of the game of Quarto. + + # See the rules.txt file for explanations. +@@ -61,7 +64,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -107,7 +110,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/contribs/terrain/terrain.pro libqglviewer-2.3.4/examples/contribs/terrain/terrain.pro +--- libqglviewer-2.3.4~/examples/contribs/terrain/terrain.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/terrain/terrain.pro 2010-01-02 20:01:30.238157280 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # A random fractal terrain with trees, animated water, sky and shadows. + + # This example was created by Serigne Sow and Joerg Liebelt. It features a textured quadtrees +@@ -57,7 +60,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -103,7 +106,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/contribs/textureViewer/textureViewer.pro libqglviewer-2.3.4/examples/contribs/textureViewer/textureViewer.pro +--- libqglviewer-2.3.4~/examples/contribs/textureViewer/textureViewer.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/textureViewer/textureViewer.pro 2010-01-02 20:01:26.534381022 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Loads an image file and texture maps a polygon with it. + + # Pedagogical example that shows how to apply a texture on a 3D object. +@@ -59,7 +62,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -105,7 +108,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/contribs/thumbnail/thumbnail.pro libqglviewer-2.3.4/examples/contribs/thumbnail/thumbnail.pro +--- libqglviewer-2.3.4~/examples/contribs/thumbnail/thumbnail.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/contribs/thumbnail/thumbnail.pro 2010-01-02 20:01:35.816521776 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Displays an alternative 3D view in a corner thumbnail. + + # This example shows how a thumbnail can be inserted in a corner of the viewer to display an +@@ -58,7 +61,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -104,7 +107,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/drawLight/drawLight.pro libqglviewer-2.3.4/examples/drawLight/drawLight.pro +--- libqglviewer-2.3.4~/examples/drawLight/drawLight.pro 2009-08-31 23:05:39.000000000 +0200 ++++ libqglviewer-2.3.4/examples/drawLight/drawLight.pro 2010-01-02 20:00:08.010159965 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # The drawLight() function is a light debugging tool. + + # drawLight() takes as an argument the GL index of the lamp : GL_LIGHT0, GL_LIGHT1... and displays a +@@ -52,7 +55,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -98,7 +101,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/examples.pro libqglviewer-2.3.4/examples/examples.pro +--- libqglviewer-2.3.4~/examples/examples.pro 2009-08-31 23:05:28.000000000 +0200 ++++ libqglviewer-2.3.4/examples/examples.pro 2010-01-02 20:00:15.170774491 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + TEMPLATE = subdirs + SUBDIRS = animation \ + callback \ +diff -urNad libqglviewer-2.3.4~/examples/fastDraw/fastDraw.pro libqglviewer-2.3.4/examples/fastDraw/fastDraw.pro +--- libqglviewer-2.3.4~/examples/fastDraw/fastDraw.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/fastDraw/fastDraw.pro 2010-01-02 20:01:57.978161388 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # The fastDraw() function enables interactivity even with large scenes. + + # This example demonstrates the use of the fastDraw() function, which +@@ -54,7 +57,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -100,7 +103,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/frameTransform/frameTransform.pro libqglviewer-2.3.4/examples/frameTransform/frameTransform.pro +--- libqglviewer-2.3.4~/examples/frameTransform/frameTransform.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/frameTransform/frameTransform.pro 2010-01-02 20:02:00.194162319 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Coordinate transformation between different Frames. + + # This example illustrates the camera and world coordinate systems relationship. The position of the +@@ -69,7 +72,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -115,7 +118,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/frustumCulling/frustumCulling.pro libqglviewer-2.3.4/examples/frustumCulling/frustumCulling.pro +--- libqglviewer-2.3.4~/examples/frustumCulling/frustumCulling.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/frustumCulling/frustumCulling.pro 2010-01-02 20:00:51.578160709 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Frustum culling using getFrustumPlanesCoefficients. + + # A hierarchical octree structure is clipped against a camera's frustum clipping planes, obtained +@@ -56,7 +59,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -102,7 +105,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/interface/interface.pro libqglviewer-2.3.4/examples/interface/interface.pro +--- libqglviewer-2.3.4~/examples/interface/interface.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/interface/interface.pro 2010-01-02 20:00:53.986161135 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Adding a graphical user interface around a QGLViewer. + + # Qt's designer has been used to create a very simple interface example, described by a +@@ -78,7 +81,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -124,7 +127,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/keyFrames/keyFrames.pro libqglviewer-2.3.4/examples/keyFrames/keyFrames.pro +--- libqglviewer-2.3.4~/examples/keyFrames/keyFrames.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/keyFrames/keyFrames.pro 2010-01-02 20:02:02.262162990 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # The KeyFrameInterpolator test example. + + # KeyFrameInterpolator smoothly interpolate their attached Frame over time on a path defined by +@@ -62,7 +65,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -108,7 +111,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/keyboardAndMouse/keyboardAndMouse.pro libqglviewer-2.3.4/examples/keyboardAndMouse/keyboardAndMouse.pro +--- libqglviewer-2.3.4~/examples/keyboardAndMouse/keyboardAndMouse.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/keyboardAndMouse/keyboardAndMouse.pro 2010-01-02 20:00:28.682159934 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Shows how to customize your keyboard and mouse bindings. + + # Use setShortcut() to change standard action bindings (axis, grid or fps +@@ -62,7 +65,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -108,7 +111,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/luxo/luxo.pro libqglviewer-2.3.4/examples/luxo/luxo.pro +--- libqglviewer-2.3.4~/examples/luxo/luxo.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/luxo/luxo.pro 2010-01-02 20:00:23.486157752 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # A more complex example that combines ManipulatedFrames, selection and constraints. + + # This example illustrates different functions of the viewer. It displays a famous luxo lamp +@@ -60,7 +63,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -106,7 +109,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/manipulatedFrame/manipulatedFrame.pro libqglviewer-2.3.4/examples/manipulatedFrame/manipulatedFrame.pro +--- libqglviewer-2.3.4~/examples/manipulatedFrame/manipulatedFrame.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/manipulatedFrame/manipulatedFrame.pro 2010-01-02 20:02:06.270182934 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # A ManipulatedFrame can be moved with the mouse in the scene. + + # A ManipulatedFrame converts mouse gestures into Frame displacements. Adding two lines of code will +@@ -56,7 +59,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -102,7 +105,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/mouseGrabber/mouseGrabber.pro libqglviewer-2.3.4/examples/mouseGrabber/mouseGrabber.pro +--- libqglviewer-2.3.4~/examples/mouseGrabber/mouseGrabber.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/mouseGrabber/mouseGrabber.pro 2010-01-02 20:02:04.410159248 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # MouseGrabbers enable complex mouse interaction. + + # A MouseGrabber is an abstract class which defines objects that are sensitive to the +@@ -66,7 +69,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -112,7 +115,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/multiSelect/multiSelect.pro libqglviewer-2.3.4/examples/multiSelect/multiSelect.pro +--- libqglviewer-2.3.4~/examples/multiSelect/multiSelect.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/multiSelect/multiSelect.pro 2010-01-02 20:00:31.010159452 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Customized select() function that enables the selection of several objects. + + # Object selection is preformed using the left mouse button. Press Shift to add objects to +@@ -60,7 +63,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -106,7 +109,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/multiView/multiView.pro libqglviewer-2.3.4/examples/multiView/multiView.pro +--- libqglviewer-2.3.4~/examples/multiView/multiView.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/multiView/multiView.pro 2010-01-02 20:00:56.070162510 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # A multi-view application, with constrained camera displacements. + + # Four viewers are created, each displaying the same scene. The camera displacements are constrained +@@ -55,7 +58,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -101,7 +104,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/overpainting/overpainting.pro libqglviewer-2.3.4/examples/overpainting/overpainting.pro +--- libqglviewer-2.3.4~/examples/overpainting/overpainting.pro 2009-08-31 23:05:39.000000000 +0200 ++++ libqglviewer-2.3.4/examples/overpainting/overpainting.pro 2010-01-02 20:00:19.682162650 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Mixing OpenGL (3D) and QPainter (2D) drawing in the same viewer. + + # A semi-transparent eounded square is painted in 2D using a QPainter on top of a classical 3D OpenGL rendering. +@@ -54,7 +57,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -100,7 +103,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/screenCoordSystem/screenCoordSystem.pro libqglviewer-2.3.4/examples/screenCoordSystem/screenCoordSystem.pro +--- libqglviewer-2.3.4~/examples/screenCoordSystem/screenCoordSystem.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/screenCoordSystem/screenCoordSystem.pro 2010-01-02 20:00:25.302160077 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # A saucers control viewer that illustrates the screen coordinate system feature. + + # Use startScreenCoordinatesSystem() and stopScreenCoordinatesSystem() to +@@ -58,7 +61,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -104,7 +107,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/select/select.pro libqglviewer-2.3.4/examples/select/select.pro +--- libqglviewer-2.3.4~/examples/select/select.pro 2009-08-31 23:05:39.000000000 +0200 ++++ libqglviewer-2.3.4/examples/select/select.pro 2010-01-02 20:00:17.434903420 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Selection of scene objects using select() and an GL_SELECT render mode. + + # Use the select() callback function to implement your object selection function. This +@@ -57,7 +60,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -103,7 +106,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/simpleViewer/simpleViewer.pro libqglviewer-2.3.4/examples/simpleViewer/simpleViewer.pro +--- libqglviewer-2.3.4~/examples/simpleViewer/simpleViewer.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/simpleViewer/simpleViewer.pro 2010-01-02 20:00:21.570162862 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # The simplest application example: 20 lines of code and yet all the power ! + + # A Viewer class is derived from QGLViewer and its draw() function is overloaded to +@@ -57,7 +60,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -103,7 +106,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/standardCamera/standardCamera.pro libqglviewer-2.3.4/examples/standardCamera/standardCamera.pro +--- libqglviewer-2.3.4~/examples/standardCamera/standardCamera.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/standardCamera/standardCamera.pro 2010-01-02 20:00:42.074160268 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # A 'standard' Camera with fixed near and far planes. + + # A new StandardCamera class is derived from Camera. +@@ -57,7 +60,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -103,7 +106,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } +diff -urNad libqglviewer-2.3.4~/examples/stereoViewer/stereoViewer.pro libqglviewer-2.3.4/examples/stereoViewer/stereoViewer.pro +--- libqglviewer-2.3.4~/examples/stereoViewer/stereoViewer.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/examples/stereoViewer/stereoViewer.pro 2010-01-02 20:00:47.150573961 +0100 +@@ -1,3 +1,6 @@ ++!contains( QT_VERSION, "^4.*" ) { ++ error(Examples are compilable only with Qt4 - please use qmake-qt4) ++} + # Simply press S to toggle stereo display (if supported). + + # This is a simple stereo application inspired from simpleViewer. +@@ -53,7 +56,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer-qt4.so + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -99,7 +102,7 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } --- libqglviewer-2.3.4.orig/debian/patches/01qt3-qt4.dpatch +++ libqglviewer-2.3.4/debian/patches/01qt3-qt4.dpatch @@ -0,0 +1,65 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01lower-case-name.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad libqglviewer-2.3.4~/QGLViewer/QGLViewer.pro libqglviewer-2.3.4/QGLViewer/QGLViewer.pro +--- libqglviewer-2.3.4~/QGLViewer/QGLViewer.pro 2009-08-31 23:05:27.000000000 +0200 ++++ libqglviewer-2.3.4/QGLViewer/QGLViewer.pro 2009-11-02 21:30:23.874806632 +0100 +@@ -9,7 +9,6 @@ + # USE_GLUT = yes + + TEMPLATE = lib +-TARGET = QGLViewer + VERSION = 2.3.4 + CONFIG -= debug debug_and_release + CONFIG *= release qt opengl warn_on shared thread create_prl rtti +@@ -49,6 +48,12 @@ + QT *= xml opengl + } + ++contains( QT_VERSION, "^4.*" ) { ++ TARGET = qglviewer-qt4 ++} else { ++ TARGET = qglviewer-qt3 ++} ++ + !isEmpty( QGLVIEWER_STATIC ) { + CONFIG *= staticlib + } +diff -urNad libqglviewer-2.3.4~/designerPlugin/designerPlugin.pro libqglviewer-2.3.4/designerPlugin/designerPlugin.pro +--- libqglviewer-2.3.4~/designerPlugin/designerPlugin.pro 2009-08-31 23:05:40.000000000 +0200 ++++ libqglviewer-2.3.4/designerPlugin/designerPlugin.pro 2009-11-02 21:30:43.510806132 +0100 +@@ -13,7 +13,7 @@ + } + } else { + isEmpty( PREFIX ) { +- PREFIX=$(QTDIR)/plugins ++ PREFIX=$${QTDIR}/plugins + } else { + error(Custom libQGLViewer designer plugin installation path is not supported with Qt3.) + } +@@ -74,7 +74,7 @@ + } + + # LIB_NAME +- LIB_NAME = libQGLViewer*.so* ++ LIB_NAME = libqglviewer*.so* + macx|darwin-g++ { + LIB_NAME = libQGLViewer*.$${QMAKE_EXTENSION_SHLIB} + } +@@ -120,7 +120,11 @@ + INCLUDEPATH *= $${INCLUDE_DIR} + DEPENDPATH *= $${INCLUDE_DIR} + isEmpty( QGLVIEWER_STATIC ) { +- LIBS *= -L$${LIB_DIR} -lQGLViewer ++ contains( QT_VERSION, "^4.*" ) { ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt4 ++ } else { ++ LIBS *= -L$${LIB_DIR} -lqglviewer-qt3 ++ } + } else { + LIBS *= $${LIB_DIR}/$${LIB_NAME} + } --- libqglviewer-2.3.4.orig/debian/patches/02staticlib-install.dpatch +++ libqglviewer-2.3.4/debian/patches/02staticlib-install.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02staticlib-install.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad libqglviewer-2.3.1~/QGLViewer/QGLViewer.pro libqglviewer-2.3.1/QGLViewer/QGLViewer.pro +--- libqglviewer-2.3.1~/QGLViewer/QGLViewer.pro 2009-02-25 21:30:00.964184905 +0100 ++++ libqglviewer-2.3.1/QGLViewer/QGLViewer.pro 2009-02-25 21:31:45.072184603 +0100 +@@ -173,9 +173,9 @@ + docRefManual.files = ../doc/refManual/* + + # install static library +- #staticlib.extra = make -f Makefile.Release staticlib +- #staticlib.path = $${LIB_DIR} +- #staticlib.files = lib$${TARGET}.a ++ staticlib.extra = make staticlib ++ staticlib.path = $${LIB_DIR} ++ staticlib.files = lib$${TARGET}.a + + # install library + target.path = $${LIB_DIR} --- libqglviewer-2.3.4.orig/debian/patches/03only-headers-in-include-dir.dpatch +++ libqglviewer-2.3.4/debian/patches/03only-headers-in-include-dir.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03only-header-in-include-dir.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad libqglviewer-2.3.4~/QGLViewer/QGLViewer.pro libqglviewer-2.3.4/QGLViewer/QGLViewer.pro +--- libqglviewer-2.3.4~/QGLViewer/QGLViewer.pro 2009-12-28 19:13:05.068763078 +0100 ++++ libqglviewer-2.3.4/QGLViewer/QGLViewer.pro 2009-12-28 19:14:13.546792442 +0100 +@@ -151,7 +151,7 @@ + + # install header + include.path = $${INCLUDE_DIR}/QGLViewer +- include.files = $${HEADERS} qglviewer.cw qglviewer_*.qm ++ include.files = $${HEADERS} + + # install documentation html + documentation.path = $${DOC_DIR}/QGLViewer