diff -pruN 1.5.0-3/debian/changelog 1.5.0-4/debian/changelog --- 1.5.0-3/debian/changelog 2016-05-19 18:28:47.000000000 +0000 +++ 1.5.0-4/debian/changelog 2018-10-13 01:10:17.000000000 +0000 @@ -1,3 +1,11 @@ +structure-synth (1.5.0-4) unstable; urgency=medium + + * Upgraded Standards-Version from 3.9.8 to 4.2.1.2 + * Switch to use QT5. Added patch qt5_win64.patch. + - Closes: #874181 Closes: #875203 + + -- Miriam Ruiz Sat, 13 Oct 2018 03:10:17 +0200 + structure-synth (1.5.0-3) unstable; urgency=medium * Upgraded Standards-Version from 3.9.3 to 3.9.8 diff -pruN 1.5.0-3/debian/control 1.5.0-4/debian/control --- 1.5.0-3/debian/control 2016-05-19 18:28:04.000000000 +0000 +++ 1.5.0-4/debian/control 2018-10-13 01:10:17.000000000 +0000 @@ -3,12 +3,11 @@ Section: graphics Priority: optional Maintainer: Miriam Ruiz Build-Depends: debhelper (>= 9), quilt, dh-buildinfo, - libx11-dev, mesa-common-dev, libgl1-mesa-dev, libglu1-mesa-dev, libxext-dev, - qt4-qmake, libqt4-dev (>= 4.3), libqt4-opengl-dev (>= 4.3) -Standards-Version: 3.9.8 + libx11-dev, mesa-common-dev, libgl1-mesa-dev, libglu1-mesa-dev, freeglut3-dev, + libxext-dev, qt5-qmake, qtbase5-dev, qtbase5-dev-tools, qtscript5-dev, + libqt5opengl5-dev +Standards-Version: 4.2.1.2 Homepage: http://structuresynth.sourceforge.net/ -Vcs-Git: git://git.debian.org/collab-maint/structure-synth.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/structure-synth.git;a=summary Package: structure-synth Architecture: any diff -pruN 1.5.0-3/debian/patches/qt5_win64.patch 1.5.0-4/debian/patches/qt5_win64.patch --- 1.5.0-3/debian/patches/qt5_win64.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.5.0-4/debian/patches/qt5_win64.patch 2018-10-13 01:10:17.000000000 +0000 @@ -0,0 +1,188 @@ +Index: structure-synth-1.5.0/Examples/Nouveau.es +=================================================================== +--- structure-synth-1.5.0.orig/Examples/Nouveau.es ++++ structure-synth-1.5.0/Examples/Nouveau.es +@@ -1,6 +1,5 @@ + #define shrink s 0.996 + +-set seed 9 + // Camera settings. Place these before first rule call. + set translation [-2.66914 -1.23905 -20] + set rotation [0.707436 -0.702911 -0.0738339 0.542177 0.472696 0.694696 -0.453408 -0.531484 0.715504] +Index: structure-synth-1.5.0/StructureSynth/GUI/TemplateExportDialog.cpp +=================================================================== +--- structure-synth-1.5.0.orig/StructureSynth/GUI/TemplateExportDialog.cpp ++++ structure-synth-1.5.0/StructureSynth/GUI/TemplateExportDialog.cpp +@@ -899,33 +899,33 @@ namespace StructureSynth { + + void TemplateExportDialog::retranslateUi() + { +- setWindowTitle(QApplication::translate("Dialog", "Template Export", 0, QApplication::UnicodeUTF8)); +- label->setText(QApplication::translate("Dialog", "Template:", 0, QApplication::UnicodeUTF8)); +- templatePathButton->setText(QApplication::translate("Dialog", "Template Path...", 0, QApplication::UnicodeUTF8)); +- descriptionLabel->setText(QApplication::translate("Dialog", "Description", 0, QApplication::UnicodeUTF8)); ++ setWindowTitle(QApplication::translate("Dialog", "Template Export", 0)); ++ label->setText(QApplication::translate("Dialog", "Template:", 0)); ++ templatePathButton->setText(QApplication::translate("Dialog", "Template Path...", 0)); ++ descriptionLabel->setText(QApplication::translate("Dialog", "Description", 0)); + descriptionTextBrowser->setHtml(QApplication::translate("Dialog", "\n" + "\n" +- "

This template was created by ....

", 0, QApplication::UnicodeUTF8)); +- primitivesLabel->setText(QApplication::translate("Dialog", "Primitives in Template", 0, QApplication::UnicodeUTF8)); +- templateOutputGroupBox->setTitle(QApplication::translate("Dialog", "Template Output", 0, QApplication::UnicodeUTF8)); +- fileRadioButton->setText(QApplication::translate("Dialog", "File:", 0, QApplication::UnicodeUTF8)); +- filePushButton->setText(QApplication::translate("Dialog", "File...", 0, QApplication::UnicodeUTF8)); +- //uniqueCheckBox->setText(QApplication::translate("Dialog", "Add unique ID to filename", 0, QApplication::UnicodeUTF8)); +- clipboardRadioButton->setText(QApplication::translate("Dialog", "Clipboard", 0, QApplication::UnicodeUTF8)); +- postProcessingGroupBox->setTitle(QApplication::translate("Dialog", "Post Processing", 0, QApplication::UnicodeUTF8)); +- runAfterCheckBox->setText(QApplication::translate("Dialog", "Run the following command after export:", 0, QApplication::UnicodeUTF8)); +- afterCommandLineEdit->setText(QApplication::translate("Dialog", "", 0, QApplication::UnicodeUTF8)); +- tabWidget->setTabText(tabWidget->indexOf(settingstab), QApplication::translate("Dialog", "Settings", 0, QApplication::UnicodeUTF8)); +- label_4->setText(QApplication::translate("Dialog", "Width:", 0, QApplication::UnicodeUTF8)); +- label_5->setText(QApplication::translate("Dialog", "Height:", 0, QApplication::UnicodeUTF8)); +- lockAspectRatioCheckBox->setText(QApplication::translate("Dialog", "Lock aspect ratio (Current = 1.23)", 0, QApplication::UnicodeUTF8)); +- modifyTemplateLabel->setText(QApplication::translate("Dialog", "Modify template before applying", 0, QApplication::UnicodeUTF8)); +- saveModificationsButton->setText(QApplication::translate("Dialog", "Save Modifications", 0, QApplication::UnicodeUTF8)); +- undoButton->setText(QApplication::translate("Dialog", "Revert (Undo Changed)", 0, QApplication::UnicodeUTF8)); +- modifyOutputCheckBox->setText(QApplication::translate("Dialog", "Modify output before saving (spawns edit window when pressing OK)", 0, QApplication::UnicodeUTF8)); +- tabWidget->setTabText(tabWidget->indexOf(advancedTab), QApplication::translate("Dialog", "Modify", 0, QApplication::UnicodeUTF8)); ++ "

This template was created by ....

", 0)); ++ primitivesLabel->setText(QApplication::translate("Dialog", "Primitives in Template", 0)); ++ templateOutputGroupBox->setTitle(QApplication::translate("Dialog", "Template Output", 0)); ++ fileRadioButton->setText(QApplication::translate("Dialog", "File:", 0)); ++ filePushButton->setText(QApplication::translate("Dialog", "File...", 0)); ++ //uniqueCheckBox->setText(QApplication::translate("Dialog", "Add unique ID to filename", 0)); ++ clipboardRadioButton->setText(QApplication::translate("Dialog", "Clipboard", 0)); ++ postProcessingGroupBox->setTitle(QApplication::translate("Dialog", "Post Processing", 0)); ++ runAfterCheckBox->setText(QApplication::translate("Dialog", "Run the following command after export:", 0)); ++ afterCommandLineEdit->setText(QApplication::translate("Dialog", "", 0)); ++ tabWidget->setTabText(tabWidget->indexOf(settingstab), QApplication::translate("Dialog", "Settings", 0)); ++ label_4->setText(QApplication::translate("Dialog", "Width:", 0)); ++ label_5->setText(QApplication::translate("Dialog", "Height:", 0)); ++ lockAspectRatioCheckBox->setText(QApplication::translate("Dialog", "Lock aspect ratio (Current = 1.23)", 0)); ++ modifyTemplateLabel->setText(QApplication::translate("Dialog", "Modify template before applying", 0)); ++ saveModificationsButton->setText(QApplication::translate("Dialog", "Save Modifications", 0)); ++ undoButton->setText(QApplication::translate("Dialog", "Revert (Undo Changed)", 0)); ++ modifyOutputCheckBox->setText(QApplication::translate("Dialog", "Modify output before saving (spawns edit window when pressing OK)", 0)); ++ tabWidget->setTabText(tabWidget->indexOf(advancedTab), QApplication::translate("Dialog", "Modify", 0)); + + } // retranslateUi + +Index: structure-synth-1.5.0/StructureSynth/GUI/TemplateExportDialog.h +=================================================================== +--- structure-synth-1.5.0.orig/StructureSynth/GUI/TemplateExportDialog.h ++++ structure-synth-1.5.0/StructureSynth/GUI/TemplateExportDialog.h +@@ -3,29 +3,29 @@ + #include + #include + #include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + + #include "../Model/Rendering/TemplateRenderer.h" + +Index: structure-synth-1.5.0/StructureSynth/Model/Rendering/ObjRenderer.cpp +=================================================================== +--- structure-synth-1.5.0.orig/StructureSynth/Model/Rendering/ObjRenderer.cpp ++++ structure-synth-1.5.0/StructureSynth/Model/Rendering/ObjRenderer.cpp +@@ -84,7 +84,7 @@ namespace StructureSynth { + */ + void CreateUnitSphere(int dt,int dp, ObjGroup& motherGroup, Matrix4f m) + { +- float DTOR = 3.1415/180.0; ++ float DTOR = 3.1415f/180.0f; + double dtheta = 180.0/dt; + double dphi = 360.0/dp; + ObjGroup group; +Index: structure-synth-1.5.0/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp +=================================================================== +--- structure-synth-1.5.0.orig/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp ++++ structure-synth-1.5.0/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp +@@ -6,6 +6,7 @@ + #include "SyntopiaCore/Math/Vector3.h" + #include "SyntopiaCore/Logging/Logging.h" + #include "SyntopiaCore/Misc/MiniParser.h" ++#include + + using namespace SyntopiaCore::Math; + using namespace SyntopiaCore::Misc; +Index: structure-synth-1.5.0/SyntopiaCore/GLEngine/Raytracer/Sampler.cpp +=================================================================== +--- structure-synth-1.5.0.orig/SyntopiaCore/GLEngine/Raytracer/Sampler.cpp ++++ structure-synth-1.5.0/SyntopiaCore/GLEngine/Raytracer/Sampler.cpp +@@ -40,7 +40,7 @@ namespace SyntopiaCore { + angle = 6.0f + sx/r; + } + } +- angle *= 3.1415 / 4.f; ++ angle *= 3.1415f / 4.f; + return Vector3f(r * cosf(angle),r * sinf(angle),0); + } + +Index: structure-synth-1.5.0/SyntopiaCore/GLEngine/Sphere.h +=================================================================== +--- structure-synth-1.5.0.orig/SyntopiaCore/GLEngine/Sphere.h ++++ structure-synth-1.5.0/SyntopiaCore/GLEngine/Sphere.h +@@ -3,6 +3,7 @@ + #include "SyntopiaCore/Math/Vector3.h" + #include "Object3D.h" + #include ++#include + + namespace SyntopiaCore { + namespace GLEngine { +Index: structure-synth-1.5.0/changelog.txt +=================================================================== +--- structure-synth-1.5.0.orig/changelog.txt ++++ structure-synth-1.5.0/changelog.txt +@@ -1,3 +1,4 @@ ++Test commit + + Changelog for Structure Synth: + ------------ diff -pruN 1.5.0-3/debian/patches/series 1.5.0-4/debian/patches/series --- 1.5.0-3/debian/patches/series 2016-05-19 18:24:10.000000000 +0000 +++ 1.5.0-4/debian/patches/series 2018-10-13 01:02:25.000000000 +0000 @@ -3,3 +3,4 @@ sunflow.patch fix_help.patch gcc4.7.patch gcc6.1.patch +qt5_win64.patch diff -pruN 1.5.0-3/debian/rules 1.5.0-4/debian/rules --- 1.5.0-3/debian/rules 2016-05-19 17:51:05.000000000 +0000 +++ 1.5.0-4/debian/rules 2018-10-13 01:10:17.000000000 +0000 @@ -19,12 +19,12 @@ build-indep: build-arch: build-stamp build-stamp: config-stamp dh_testdir - qmake-qt4 -project \ + qmake -qt=qt5 -project \ -after "CONFIG+=opengl" -after "QT+=xml opengl script" -after "unix:LIBS+=-lGLU" - qmake-qt4 + qmake -qt=qt5 $(MAKE) \ - CFLAGS="$(CFLAGS) -DDATADIR=\\\"/usr/share/structure-synth\\\"" \ - CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS) -DDATADIR=\\\"/usr/share/structure-synth\\\"" \ + CFLAGS="$(CFLAGS) -fPIC -DDATADIR=\\\"/usr/share/structure-synth\\\"" \ + CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS) -fPIC -DDATADIR=\\\"/usr/share/structure-synth\\\"" \ LFLAGS="$(LDFLAGS) -Wl,-z,defs -Wl,-as-needed -Wl,--no-undefined" \ TARGET="structure-synth" touch $@ @@ -37,7 +37,7 @@ clean: rm -f build-stamp config-stamp test ! -e Makefile || $(MAKE) distclean \ TARGET="structure-synth" - rm -f *.pro + rm -f *.pro .qmake.stash [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch dh_clean