From: Federico Ceratto Date: Sat, 29 Sep 2018 15:30:40 +0000 (+0100) Subject: goxel (0.8.1-1) unstable; urgency=medium X-Git-Tag: archive/raspbian/0.11.0-1.1+rpi1~1^2^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=37b88f1c26ae2f4f5d7b4d9ccf6b95da61d95dbf;p=goxel.git goxel (0.8.1-1) unstable; urgency=medium * New upstream release [dgit import unpatched goxel 0.8.1-1] --- 37b88f1c26ae2f4f5d7b4d9ccf6b95da61d95dbf diff --cc debian/changelog index 0000000,0000000..505b0c1 new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,37 @@@ ++goxel (0.8.1-1) unstable; urgency=medium ++ ++ * New upstream release ++ ++ -- Federico Ceratto Sat, 29 Sep 2018 16:30:40 +0100 ++ ++goxel (0.8.0-2) unstable; urgency=medium ++ ++ * Fix install paths (Closes: #907448) ++ ++ -- Federico Ceratto Mon, 17 Sep 2018 19:52:51 +0100 ++ ++goxel (0.8.0-1) unstable; urgency=medium ++ ++ * New upstream release (Closes: #906469, #891888) ++ ++ -- Federico Ceratto Sat, 18 Aug 2018 11:52:36 +0100 ++ ++goxel (0.7.3-1) unstable; urgency=medium ++ ++ * New upstream release ++ ++ -- Federico Ceratto Sun, 18 Mar 2018 19:44:50 +0000 ++ ++goxel (0.7.2-1) unstable; urgency=medium ++ ++ * New upstream release ++ * Add supported architectures (Closes: #882530) ++ * Update description (Closes: #882516) ++ ++ -- Federico Ceratto Fri, 24 Nov 2017 23:54:57 +0000 ++ ++goxel (0.7.1-2) unstable; urgency=medium ++ ++ * Initial release (Closes: #876204) ++ ++ -- Federico Ceratto Tue, 03 Oct 2017 13:47:45 +0100 diff --cc debian/compat index 0000000,0000000..b4de394 new file mode 100644 --- /dev/null +++ b/debian/compat @@@ -1,0 -1,0 +1,1 @@@ ++11 diff --cc debian/control index 0000000,0000000..138411c new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,25 @@@ ++Source: goxel ++Section: graphics ++Priority: optional ++Maintainer: Federico Ceratto ++Build-Depends: debhelper (>= 11~), ++ clang, ++ help2man, ++ libglfw3-dev, ++ libgtk-3-dev, ++ libinih-dev, ++ scons, ++ uthash-dev ++Standards-Version: 4.2.1 ++Homepage: https://github.com/guillaumechereau/goxel ++Vcs-Git: https://salsa.debian.org/debian/goxel.git ++Vcs-Browser: https://salsa.debian.org/debian/goxel ++ ++Package: goxel ++Architecture: amd64 arm64 armel armhf i386 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 x32 ++Depends: ${shlibs:Depends}, ${misc:Depends}, libinih1 ++Description: 3D voxel editor ++ Goxel is a 3D program that lets you create voxel volumes. ++ It supports 24 bits RGB colors, unlimited scene size and undo buffers. ++ Layers, procedural generation and Marching Cube rendering. ++ Exports to obj, pyl, magica voxel, png, qubicle, povray, and more diff --cc debian/copyright index 0000000,0000000..f282b69 new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,0 +1,140 @@@ ++Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ ++Upstream-Name: goxel ++Source: https://github.com/guillaumechereau/goxel ++ ++Files: * ++Copyright: 2015-2017 Guillaume Chereau ++License: GPL-3.0+ ++ ++Files: ext_src/imgui/* ++Copyright: 2017 Omar Cornut ++Source: https://github.com/ocornut/imgui ++License: MIT ++ ++Files: ext_src/inih/* ++Copyright: 2009-2017 Ben Hoyt ++Source: https://github.com/benhoyt/inih ++License: BSD-3 ++ Copyright (c) 2009, Ben Hoyt ++ All rights reserved. ++ . ++ Redistribution and use in source and binary forms, with or without ++ modification, are permitted provided that the following conditions are met: ++ * Redistributions of source code must retain the above copyright ++ notice, this list of conditions and the following disclaimer. ++ * Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in the ++ documentation and/or other materials provided with the distribution. ++ * Neither the name of Ben Hoyt nor the names of its contributors ++ may be used to endorse or promote products derived from this software ++ without specific prior written permission. ++ . ++ THIS SOFTWARE IS PROVIDED BY BEN HOYT ''AS IS'' AND ANY ++ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ++ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++ DISCLAIMED. IN NO EVENT SHALL BEN HOYT BE LIABLE FOR ANY ++ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ++ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++Files: ext_src/noc/noc_file_dialog.h ++Copyright: 2015-2017 Guillaume Chereau ++License: MIT ++ ++Files: ext_src/stb/* ++Copyright: 2014 Sean Barrett ++Source: http://nothings.org/ ++License: public-domain ++ This software has been placed in the public domain by its author. ++ Where that dedication is not recognized, you are granted a perpetual, ++ irrevocable license to copy and modify this file as you see fit. ++ ++Files: data/fonts/DejaVuSans-light.ttf ++Copyright: Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. ++ Bitstream Vera is a trademark of Bitstream, Inc. ++ DejaVu changes are in public domain. ++Source: http://dejavu-fonts.org/ ++License: bitstream-vera ++ Permission is hereby granted, free of charge, to any person obtaining a copy ++ of the fonts accompanying this license ("Fonts") and associated ++ documentation files (the "Font Software"), to reproduce and distribute the ++ Font Software, including without limitation the rights to use, copy, merge, ++ publish, distribute, and/or sell copies of the Font Software, and to permit ++ persons to whom the Font Software is furnished to do so, subject to the ++ following conditions: ++ . ++ The above copyright and trademark notices and this permission notice shall ++ be included in all copies of one or more of the Font Software typefaces. ++ . ++ The Font Software may be modified, altered, or added to, and in particular ++ the designs of glyphs or characters in the Fonts may be modified and ++ additional glyphs or characters may be added to the Fonts, only if the fonts ++ are renamed to names not containing either the words "Bitstream" or the word ++ "Vera". ++ . ++ This License becomes null and void to the extent applicable to Fonts or Font ++ Software that has been modified and is distributed under the "Bitstream ++ Vera" names. ++ . ++ The Font Software may be sold as part of a larger software package but no ++ copy of one or more of the Font Software typefaces may be sold by itself. ++ . ++ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ++ OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, ++ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, ++ TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME ++ FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ++ ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, ++ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF ++ THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE ++ FONT SOFTWARE. ++ . ++ Except as contained in this notice, the names of Gnome, the Gnome ++ Foundation, and Bitstream Inc., shall not be used in advertising or ++ otherwise to promote the sale, use or other dealings in this Font Software ++ without prior written authorization from the Gnome Foundation or Bitstream ++ Inc., respectively. For further information, contact: fonts at gnome dot ++ org. ++ ++Files: debian/* ++Copyright: 2017 Federico Ceratto ++License: GPL-3.0+ ++ ++License: GPL-3.0+ ++ This program 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, either version 3 of the License, or ++ (at your option) any later version. ++ . ++ 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 program. If not, see . ++ . ++ On Debian systems, the complete text of the GNU General ++ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". ++ ++License: MIT ++ Permission is hereby granted, free of charge, to any person obtaining a copy ++ of this software and associated documentation files (the "Software"), to deal ++ in the Software without restriction, including without limitation the rights ++ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ copies of the Software, and to permit persons to whom the Software is ++ furnished to do so, subject to the following conditions: ++ . ++ The above copyright notice and this permission notice shall be included in ++ all copies or substantial portions of the Software. ++ . ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++ SOFTWARE. diff --cc debian/gitlab-ci.yml index 0000000,0000000..acf5513 new file mode 100644 --- /dev/null +++ b/debian/gitlab-ci.yml @@@ -1,0 -1,0 +1,10 @@@ ++image: registry.gitlab.com/eighthave/ci-image-git-buildpackage:latest ++ ++pages: ++ stage: deploy ++ artifacts: ++ paths: ++ - "*.deb" ++ script: ++ - gitlab-ci-git-buildpackage-all ++ - gitlab-ci-aptly diff --cc debian/goxel.desktop index 0000000,0000000..60b51ca new file mode 100644 --- /dev/null +++ b/debian/goxel.desktop @@@ -1,0 -1,0 +1,12 @@@ ++[Desktop Entry] ++Version=1.0 ++Type=Application ++Name=Goxel ++GenericName=3D voxel editor ++Categories=Graphics;2DGraphics;3DGraphics;RasterGraphics; ++Keywords=3D;voxel; ++Comment=3D voxel editor ++Exec=goxel ++Icon=goxel ++StartupNotify=true ++Terminal=false diff --cc debian/goxel.docs index 0000000,0000000..b43bf86 new file mode 100644 --- /dev/null +++ b/debian/goxel.docs @@@ -1,0 -1,0 +1,1 @@@ ++README.md diff --cc debian/goxel.install index 0000000,0000000..c1653ba new file mode 100644 --- /dev/null +++ b/debian/goxel.install @@@ -1,0 -1,0 +1,3 @@@ ++debian/goxel.desktop usr/share/applications ++goxel usr/bin ++goxel.png usr/share/pixmaps diff --cc debian/patches/0003-harden-and-fix-build index 0000000,0000000..fe7f94c new file mode 100644 --- /dev/null +++ b/debian/patches/0003-harden-and-fix-build @@@ -1,0 -1,0 +1,11 @@@ ++From: Federico Ceratto ++Subject: Enable hardening flags, fix build ++ ++--- a/SConstruct +++++ b/SConstruct ++@@ -177,3 +177,5 @@ ++ ) ++ ++ env.Program(target='goxel', source=sources) +++env.Append(CFLAGS='-Wformat-security -Werror=format-security -fPIE') +++env.Append(CFLAGS='-Wno-error=format-overflow=') diff --cc debian/patches/series index 0000000,0000000..ce462fc new file mode 100644 --- /dev/null +++ b/debian/patches/series @@@ -1,0 -1,0 +1,1 @@@ ++0003-harden-and-fix-build diff --cc debian/rules index 0000000,0000000..6eb857b new file mode 100755 --- /dev/null +++ b/debian/rules @@@ -1,0 -1,0 +1,38 @@@ ++#!/usr/bin/make -f ++export DH_VERBOSE = 1 ++NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) ++ ++include /usr/share/dpkg/default.mk # provides DEB_VERSION ++ ++%: ++ dh $@ ++ ++override_dh_auto_clean: ++ scons -c ++ rm -rf .sconf_temp config.log debian/goxel.1 goxel.xpm goxel.png ++ if [ -d .ext_src ]; then rm ext_src -rf; mv .ext_src ext_src; fi ++ ++override_dh_auto_build: ++ mv ext_src .ext_src ++ mkdir ext_src ++ cp -a .ext_src/imgui ext_src ++ cp -a .ext_src/noc ext_src ++ cp -a .ext_src/inih ext_src ++ cp -a .ext_src/stb ext_src ++ cp -a .ext_src/cycles ext_src ++ scons cycles=0 debug=0 clang=1 --jobs=$(NUMJOBS) --no-cache ++ cp -a ./osx/goxel/goxel/Assets.xcassets/AppIcon.appiconset/64.png ./goxel.png ++ rm ext_src -rf ++ mv .ext_src ext_src ++ ++override_dh_installman: ++ help2man -N --no-discard-stderr \ ++ --no-info --version-string="$(DEB_VERSION)" \ ++ -n "3D voxel editor" ./goxel > debian/goxel.1 ++ dh_installman ./debian/goxel.1 ++ ++override_dh_usrlocal: ++ true ++ ++override_dh_auto_install: ++ PREFIX=/usr dh_auto_install diff --cc debian/source/format index 0000000,0000000..163aaf8 new file mode 100644 --- /dev/null +++ b/debian/source/format @@@ -1,0 -1,0 +1,1 @@@ ++3.0 (quilt) diff --cc debian/watch index 0000000,0000000..f3298bd new file mode 100644 --- /dev/null +++ b/debian/watch @@@ -1,0 -1,0 +1,4 @@@ ++version=3 ++ ++opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/goxel-$1\.tar\.gz/ \ ++ https://github.com/guillaumechereau/goxel/tags .*/v?(\d\S*)\.tar\.gz