diff --git a/.travis.yml b/.travis.yml
index 5e831b1..b51c80c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,18 +11,6 @@ script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.travis/build-debian.sh; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./.travis/build-macos.sh; fi
deploy:
- # Releases to solvespace/solvespace
- - provider: releases
- api_key:
- secure: dDlkIawHcODlW9B/20/cQCtzeoocvs0hKuNngRKXKqzXLWTRq33oq/B7+39tAixWbmv6exTpijiKrRNFiSCW5Z4iwHLwaRD4XJznxw63e/Hus/dxg2Tvqx7XFpkCz8mT1Z+gZQE5YxAngeZPpI/sZbZtF1UO3yH5eLeeokZ15p26ZskQUPoYuzrTgTzYL3XfpG3F+20rNBawH1ycsCTVD/08/n31d2m3CrKAsbW7er92ek6w4fzKr7NW8WeXjrPJETVpw5fQg1Od3pRGW8dPQaJcvKQEogMp8Mm0ETYd0qigg89/giBz7QwOgmAWQ4dH+DfZH4Ojl//127QztBolMvyDMQBykWrtJoGcij05sT6K2IJr2FHeUBO12MAEdjiVvhQj3DtTzjPiZAHHDBSLWxLKWWhlhHE4pq7g1MQhqXkaAHI2BLNzwLmaowbMT0bECf9yfz6xx18h6XPQFX44oOktraobVALFlyHqeKa8zdcUt22LF6uAL1m5dxL0tny3eXCIPE4UH/RZgua/cHV9G3cUvKQa/QnFSLRhvWVSbGB+7YsHouBJcsUOOW1gmd5442XuC7mpppccRldh+GSxUk6TBJRAx7TeQ0ybDUaoco9MUqp2twv3KreR2+8Q12PDaAhfQVNEGdF3wTm1sShImjCN4VN3eSLlBEbve1QRQXM=
- skip_cleanup: true
- file_glob: true
- file:
- - ../*.deb
- on:
- repo: solvespace/solvespace
- tags: true
- condition: "$TRAVIS_OS_NAME == linux"
- provider: releases
api_key:
secure: dDlkIawHcODlW9B/20/cQCtzeoocvs0hKuNngRKXKqzXLWTRq33oq/B7+39tAixWbmv6exTpijiKrRNFiSCW5Z4iwHLwaRD4XJznxw63e/Hus/dxg2Tvqx7XFpkCz8mT1Z+gZQE5YxAngeZPpI/sZbZtF1UO3yH5eLeeokZ15p26ZskQUPoYuzrTgTzYL3XfpG3F+20rNBawH1ycsCTVD/08/n31d2m3CrKAsbW7er92ek6w4fzKr7NW8WeXjrPJETVpw5fQg1Od3pRGW8dPQaJcvKQEogMp8Mm0ETYd0qigg89/giBz7QwOgmAWQ4dH+DfZH4Ojl//127QztBolMvyDMQBykWrtJoGcij05sT6K2IJr2FHeUBO12MAEdjiVvhQj3DtTzjPiZAHHDBSLWxLKWWhlhHE4pq7g1MQhqXkaAHI2BLNzwLmaowbMT0bECf9yfz6xx18h6XPQFX44oOktraobVALFlyHqeKa8zdcUt22LF6uAL1m5dxL0tny3eXCIPE4UH/RZgua/cHV9G3cUvKQa/QnFSLRhvWVSbGB+7YsHouBJcsUOOW1gmd5442XuC7mpppccRldh+GSxUk6TBJRAx7TeQ0ybDUaoco9MUqp2twv3KreR2+8Q12PDaAhfQVNEGdF3wTm1sShImjCN4VN3eSLlBEbve1QRQXM=
@@ -32,25 +20,3 @@ deploy:
repo: solvespace/solvespace
tags: true
condition: "$TRAVIS_OS_NAME == osx"
- # Releases to whitequark/solvespace (to be removed)
- - provider: releases
- api_key:
- secure: DA3tW0My37vbi2t3dZ061281Xm8KSIkeLdFZsQISrut0g1kkbWuBTPxAfvE3B6OE8p47wAclE/wxA1+obMTVkY0oYpd5u+JelYNHxU/oL8Ww0xdUANwKNJ1JD2EZP8nSz7JSvxuGILC6AFPoTjawsG97SXwiTyp7z0PA6nvzraE=
- skip_cleanup: true
- file_glob: true
- file:
- - ../*.deb
- on:
- repo: whitequark/solvespace
- tags: true
- condition: "$TRAVIS_OS_NAME == linux"
- - provider: releases
- api_key:
- secure: DA3tW0My37vbi2t3dZ061281Xm8KSIkeLdFZsQISrut0g1kkbWuBTPxAfvE3B6OE8p47wAclE/wxA1+obMTVkY0oYpd5u+JelYNHxU/oL8Ww0xdUANwKNJ1JD2EZP8nSz7JSvxuGILC6AFPoTjawsG97SXwiTyp7z0PA6nvzraE=
- skip_cleanup: true
- file: build/solvespace.dmg
- on:
- repo: whitequark/solvespace
- tags: true
- condition: "$TRAVIS_OS_NAME == osx"
-
diff --git a/.travis/build-debian.sh b/.travis/build-debian.sh
index 124e45b..b3ac2cb 100755
--- a/.travis/build-debian.sh
+++ b/.travis/build-debian.sh
@@ -2,5 +2,7 @@
if echo $TRAVIS_TAG | grep ^v; then BUILD_TYPE=RelWithDebInfo; else BUILD_TYPE=Debug; fi
-export BUILD_TYPE
-dpkg-buildpackage -b -us -uc
+mkdir build
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+make VERBOSE=1
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index a561717..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-solvespace (2.1) unstable; urgency=low
-
- * Initial Release.
-
- -- whitequark <whitequark@whitequark.org> Fri, 20 Mar 2015 12:39:28 +0300
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 30e8c97..0000000
--- a/debian/control
+++ /dev/null
@@ -1,73 +0,0 @@
-Source: solvespace
-Section: graphics
-Priority: optional
-Maintainer: whitequark <whitequark@whitequark.org>
-Build-Depends: debhelper (>= 9), cmake, libpng12-dev, zlib1g-dev, libjson-c-dev,
- libfontconfig1-dev, libgtkmm-2.4-dev, libpangomm-1.4-dev,
- libgl-dev, libglu-dev, libglew-dev
-Standards-Version: 3.9.5
-Homepage: http://solvespace.com
-Vcs-Git: git://github.com/whitequark/solvespace
-Vcs-Browser: https://github.com/whitequark/solvespace
-
-Package: solvespace
-Architecture: any
-Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: SolveSpace parametric 2d/3d CAD
- SolveSpace is a parametric 2d/3d CAD program. Applications include:
- .
- * modeling 3d parts — draw with extrudes, revolves, and Boolean
- (union / difference) operations;
- * modeling 2d parts — draw the part as a single section, and export DXF,
- PDF, SVG; use 3d assembly to verify fit;
- * 3d-printed parts — export the STL or other triangle mesh expected by
- most 3d printers;
- * preparing CAM data — export 2d vector art for a waterjet machine or
- laser cutter; or generate STEP or STL, for import into third-party
- CAM software for machining;
- * mechanism design — use the constraint solver to simulate planar or
- spatial linkages, with pin, ball, or slide joints;
- * plane and solid geometry — replace hand-solved trigonometry and
- spreadsheets with a live dimensioned drawing.
-
-Package: solvespace-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: solvespace (= ${binary:Version}), ${misc:Depends}
-Description: SolveSpace parametric 2d/3d CAD (debugging files)
- SolveSpace is a parametric 2d/3d CAD.
- .
- This package contains the debugging symbols for solvespace.
-
-Package: libslvs1
-Section: libs
-Architecture: any
-Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: SolveSpace geometric kernel
- SolveSpace is a parametric 2d/3d CAD. libslvs contains the geometric
- kernel of SolveSpace, built as a library.
-
-Package: libslvs1-dev
-Section: libs
-Architecture: any
-Multi-Arch: same
-Depends: libslvs1, ${misc:Depends}
-Description: SolveSpace geometric kernel (development files)
- SolveSpace is a parametric 2d/3d CAD. libslvs contains the geometric
- kernel of SolveSpace, built as a library.
- .
- This package includes development files for libslvs.
-
-Package: libslvs1-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: libslvs1 (= ${binary:Version}), ${misc:Depends}
-Description: SolveSpace geometric kernel (debugging files)
- SolveSpace is a parametric 2d/3d CAD. libslvs contains the geometric
- kernel of SolveSpace, built as a library.
- .
- This package contains the debugging symbols for libslvs1.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index f747b00..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,44 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: solvespace
-Source: https://github.com/solvespace/solvespace
-
-Files: *
-Copyright: 2008-2013 Jonathan Westhues
-Copyright: 2015-2016 whitequark <whitequark@whitequark.org>
-Copyright: 2015-2016 Aleksey Egorov <anandamide@mail.ru>
-License: GPL-3.0+
-
-Files: debian/*
-Copyright: 2015-2016 whitequark <whitequark@whitequark.org>
-License: GPL-3.0+
-
-Files: extlib/si/*
-Copyright: 1998-2005 3Dconnexion
-License:
- Permission to use, copy, modify, and distribute this software for all
- purposes and without fees is hereby grated provided that this copyright
- notice appears in all copies. Permission to modify this software is granted
- and 3Dconnexion will support such modifications only if said modifications are
- approved by 3Dconnexion.
-
-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 <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 887d731..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-COPYING.txt
-README.md
diff --git a/debian/libslvs1-dev.install b/debian/libslvs1-dev.install
deleted file mode 100644
index 7adf7a6..0000000
--- a/debian/libslvs1-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/include/slvs.h
diff --git a/debian/libslvs1.install b/debian/libslvs1.install
deleted file mode 100644
index 0869500..0000000
--- a/debian/libslvs1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/**/libslvs.so*
diff --git a/debian/menu b/debian/menu
deleted file mode 100644
index d8b2603..0000000
--- a/debian/menu
+++ /dev/null
@@ -1,7 +0,0 @@
-?package(solvespace):needs="X11" section="Applications/Graphics" \
- title="SolveSpace" command="/usr/bin/solvespace" \
- hints="CAD" \
- icon16x16="/usr/share/pixmaps/solvespace-16x16.xpm" \
- icon24x24="/usr/share/pixmaps/solvespace-24x24.xpm" \
- icon32x32="/usr/share/pixmaps/solvespace-32x32.xpm" \
- icon48x48="/usr/share/pixmaps/solvespace-48x48.xpm"
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 084b447..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#DH_VERBOSE = 1
-
-# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/default.mk
-
-# main packaging script based on dh7 syntax
-%:
- dh $@
-
-# debmake generated override targets
-# This is example for Cmake (See http://bugs.debian.org/641051 )
-override_dh_auto_configure:
- dh_auto_configure -- \
- -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
- -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
-
-# create a -dbg package
-override_dh_strip:
- dh_strip -psolvespace --dbg-package=solvespace-dbg
- dh_strip -plibslvs1 --dbg-package=libslvs1-dbg
diff --git a/debian/solvespace.install b/debian/solvespace.install
deleted file mode 100644
index 432a325..0000000
--- a/debian/solvespace.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin/solvespace
-usr/share/icons
-usr/share/applications
-usr/share/pixmaps
diff --git a/debian/solvespace.sharedmimeinfo b/debian/solvespace.sharedmimeinfo
deleted file mode 100644
index 4f6e2cf..0000000
--- a/debian/solvespace.sharedmimeinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
- <mime-type type="application/x-solvespace">
- <comment>SolveSpace sketch</comment>
- <glob pattern="*.slvs"/>
- <generic-icon name="x-office-document"/>
- </mime-type>
-</mime-info>
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 89ae9db..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (native)
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index 3fbd3a4..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1,3 +0,0 @@
-tar-ignore = "*.sublime-*"
-tar-ignore = "build*"
-tar-ignore = ".git"