From 8f19bca4603b527987bc6d151872069a4017c4aa Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Mon, 13 May 2019 14:36:06 +0000 Subject: [PATCH 1/6] control edited online with Bitbucket --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 059f43b..672028a 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: fractorium Section: graphics Priority: optional -Maintainer: Gambhiro Bhikkhu +Maintainer: Matt Feemster Build-Depends: debhelper (>= 9), g++ (>= 5.4), libc6-dev, libgl1-mesa-dev, libgl-dev, libglm-dev, libjpeg-dev, libpng-dev, libqt5opengl5-dev, libtbb-dev, libxml2-dev, ocl-icd-libopencl1, ocl-icd-opencl-dev, opencl-headers, qt5-default, qt5-qmake, qtbase5-dev, libopenexr22, libopenexr-dev Standards-Version: 3.9.5 Homepage: http://fractorium.com/ From 4bf490882262921411477bb2447197638ac7659c Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Mon, 13 May 2019 14:36:51 +0000 Subject: [PATCH 2/6] copyright edited online with Bitbucket --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index f831034..1f6c1c8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: fractorium -Source: https://github.com/mfeemster/fractorium +Source: https://bitbucket.org/mfeemster/fractorium Files: * Copyright: 2018 Matt Feemster From 9c4f541eae5689aa78a8864b4cdb920b6c437fef Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Mon, 13 May 2019 14:40:35 +0000 Subject: [PATCH 3/6] package-linux.sh edited online with Bitbucket --- package-linux.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/package-linux.sh b/package-linux.sh index 061d4fd..7c704e3 100755 --- a/package-linux.sh +++ b/package-linux.sh @@ -121,6 +121,7 @@ tar --exclude='package-linux.sh' \ ./Data/Mica_Group.ugr \ ./Data/Quartz_Varieties.ugr \ ./Data/dark_linux.qss \ + ./Data/lightdark.qss \ . [ $? -ne 0 ] && echo "Tar command failed." && exit 2 From 540e2346882d277b2ac1ef1c756f2ec1a4317624 Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Mon, 13 May 2019 14:57:39 +0000 Subject: [PATCH 4/6] control.package edited online with Bitbucket --- Data/control.package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Data/control.package b/Data/control.package index 91d8193..53821dc 100644 --- a/Data/control.package +++ b/Data/control.package @@ -1,7 +1,7 @@ Source: Fractorium Section: graphics Priority: optional -Maintainer: Gambhiro Bhikkhu +Maintainer: Matt Feemster Build-Depends: debhelper (>= 9) Standards-Version: 3.9.5 Homepage: http://fractorium.com/ From 04761955b25c37504ef6b501e5c4d467c5602e0a Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Mon, 13 May 2019 15:09:15 +0000 Subject: [PATCH 5/6] BuildGuideQtCreator.md edited online with Bitbucket --- Data/BuildGuideQtCreator.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Data/BuildGuideQtCreator.md b/Data/BuildGuideQtCreator.md index 18cd843..185b430 100644 --- a/Data/BuildGuideQtCreator.md +++ b/Data/BuildGuideQtCreator.md @@ -160,7 +160,8 @@ Apatite_Supergroup.ugr boxtail_pack_02.gradient boxtail_pack_03_triangle.gradient boxtail_pack_04_mineshack.gradient -dark.qss +dark_windows.qss +lightdark.qss ember.dll ember.exp ember.lib @@ -198,6 +199,7 @@ tatasz_pack_02_warmer.gradient tatasz_pack_03.gradient tbb.dll platforms\qwindows.dll +imageformats\qjpeg.dll ``` Double click fractorium.exe to run it, and use the command line to run the others. @@ -223,7 +225,8 @@ or you can install [Visual C++ Redistributable Packages for Visual Studio 2017 ( ├─ boxtail_pack_02.gradient ├─ boxtail_pack_03_triangle.gradient ├─ boxtail_pack_04_mineshack.gradient - ├─ dark.qss + ├─ dark_windows.qss + ├─ lightdark.qss ├─ ember.dll ├─ emberanimate.exe ├─ embercl.dll @@ -265,4 +268,7 @@ or you can install [Visual C++ Redistributable Packages for Visual Studio 2017 ( └─platforms │ ├─qwindows.dll + └─imageformats + │ + ├─qjpeg.dll ``` From 8457a9c4e9eac85e336f0fe98b89f13c8bb90974 Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Mon, 13 May 2019 15:14:52 +0000 Subject: [PATCH 6/6] BuildGuideQtCreator.md edited online with Bitbucket --- Data/BuildGuideQtCreator.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Data/BuildGuideQtCreator.md b/Data/BuildGuideQtCreator.md index 185b430..799c796 100644 --- a/Data/BuildGuideQtCreator.md +++ b/Data/BuildGuideQtCreator.md @@ -198,8 +198,8 @@ tatasz_pack_02_dark.gradient tatasz_pack_02_warmer.gradient tatasz_pack_03.gradient tbb.dll -platforms\qwindows.dll imageformats\qjpeg.dll +platforms\qwindows.dll ``` Double click fractorium.exe to run it, and use the command line to run the others. @@ -265,10 +265,10 @@ or you can install [Visual C++ Redistributable Packages for Visual Studio 2017 ( ├─ vccorlib140.dll (optional) ├─ concrt140.dll (optional) │ - └─platforms - │ - ├─qwindows.dll └─imageformats │ ├─qjpeg.dll + └─platforms + │ + ├─qwindows.dll ```