tags 604356 + patch tags 604356 + pending thanks Dear maintainer,
I've prepared an NMU for libqglviewer (versioned as 2.3.4-4.2) and uploaded it to DELAYED/1. Regards. Ana
reverted: --- libqglviewer-2.3.4/debian/libqglviewer-qt3-dev.dirs +++ libqglviewer-2.3.4.orig/debian/libqglviewer-qt3-dev.dirs @@ -1 +0,0 @@ -usr/lib reverted: --- libqglviewer-2.3.4/debian/libqglviewer-qt3-2.README.Debian +++ libqglviewer-2.3.4.orig/debian/libqglviewer-qt3-2.README.Debian @@ -1,12 +0,0 @@ -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 <[email protected]>, Sun, 08 Jul 2007 00:32:15 +0200 diff -u libqglviewer-2.3.4/debian/changelog libqglviewer-2.3.4/debian/changelog --- libqglviewer-2.3.4/debian/changelog +++ libqglviewer-2.3.4/debian/changelog @@ -1,3 +1,11 @@ +libqglviewer (2.3.4-4.2) unstable; urgency=low + + * Non-maintainer upload. + * Remove Qt3 support: (Closes: #604356) + - update debian/control and debian/rules accordingly. + + -- Ana Beatriz Guerrero Lopez <[email protected]> Fri, 15 Jun 2012 17:32:22 +0200 + libqglviewer (2.3.4-4.1) unstable; urgency=low * Non-maintainer upload. (Closes: #662702) reverted: --- libqglviewer-2.3.4/debian/libqglviewer-qt3-2.dirs +++ libqglviewer-2.3.4.orig/debian/libqglviewer-qt3-2.dirs @@ -1 +0,0 @@ -usr/lib reverted: --- libqglviewer-2.3.4/debian/libqglviewer2.dirs +++ libqglviewer-2.3.4.orig/debian/libqglviewer2.dirs @@ -1 +0,0 @@ -usr/share/doc diff -u libqglviewer-2.3.4/debian/rules libqglviewer-2.3.4/debian/rules --- libqglviewer-2.3.4/debian/rules +++ libqglviewer-2.3.4/debian/rules @@ -31,29 +31,22 @@ 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: +clean1: dh_testdir dh_testroot rm -f build-stamp - rm -rf qglviewer-qt3 qglviewer-qt4 designerPlugin-qt3 designerPlugin-qt4 - dh_clean + rm -rf qglviewer-qt4 designerPlugin-qt4 + dh_clean install: build dh_testdir @@ -61,17 +54,6 @@ 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 @@ -88,25 +70,6 @@ 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 reverted: --- libqglviewer-2.3.4/debian/libqglviewer-dev.dirs +++ libqglviewer-2.3.4.orig/debian/libqglviewer-dev.dirs @@ -1,3 +0,0 @@ -usr/share/doc -usr/include -usr/lib diff -u libqglviewer-2.3.4/debian/control libqglviewer-2.3.4/debian/control --- libqglviewer-2.3.4/debian/control +++ libqglviewer-2.3.4/debian/control @@ -5,13 +5,13 @@ DM-Upload-Allowed: yes Homepage: http://www.libqglviewer.com/ Standards-Version: 3.8.3 -Build-Depends: debhelper (>= 8.1.3~), libqt3-mt-dev, libqt4-dev (>= 4:4.8.0~), libqt4-opengl-dev (>= 4:4.8.0~), dpatch +Build-Depends: debhelper (>= 8.1.3~), libqt4-dev (>= 4:4.8.0~), libqt4-opengl-dev (>= 4:4.8.0~), dpatch Package: libqglviewer-dev-common Section: libdevel Architecture: all Depends: ${misc:Depends} -Recommends: libqglviewer-qt4-dev | libqglviewer-qt3-dev +Recommends: libqglviewer-qt4-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 @@ -26,41 +26,41 @@ 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-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 @@ -102,22 +102,22 @@ -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. +# 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. reverted: --- libqglviewer-2.3.4/debian/libqglviewer-qt3-dev.docs +++ libqglviewer-2.3.4.orig/debian/libqglviewer-qt3-dev.docs @@ -1,3 +0,0 @@ -debian/README.Multiflavour -GPL_EXCEPTION -README reverted: --- libqglviewer-2.3.4/debian/libqglviewer-qt3-dev.README.Debian +++ libqglviewer-2.3.4.orig/debian/libqglviewer-qt3-dev.README.Debian @@ -1,12 +0,0 @@ -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 <[email protected]>, Sun, 08 Jul 2007 00:32:15 +0200 reverted: --- libqglviewer-2.3.4/debian/libqglviewer-qt3-2.docs +++ libqglviewer-2.3.4.orig/debian/libqglviewer-qt3-2.docs @@ -1,3 +0,0 @@ -debian/README.Multiflavour -GPL_EXCEPTION -README
