solvespace (2.3+repack1-2) unstable; urgency=medium
authorAnton Gladky <gladk@debian.org>
Mon, 6 Mar 2017 19:59:20 +0000 (19:59 +0000)
committerAnton Gladky <gladk@debian.org>
Mon, 6 Mar 2017 19:59:20 +0000 (19:59 +0000)
  * [0d4dc2b] Add missing dependency on libslvs1. (Closes: #856937)

[dgit import unpatched solvespace 2.3+repack1-2]

19 files changed:
1  2 
debian/changelog
debian/compat
debian/control
debian/copyright
debian/docs
debian/get_orig.sh
debian/libslvs1-dev.install
debian/libslvs1.install
debian/patches/01_RemoveGitHash.patch
debian/patches/20_use_system_unifont.patch
debian/patches/series
debian/rules
debian/solvespace.1
debian/solvespace.install
debian/solvespace.manpages
debian/solvespace.sharedmimeinfo
debian/source/format
debian/source/options
debian/watch

index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..7189eb465dd3fca5c36ee1031c95eaefa8328afc
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,20 @@@
++solvespace (2.3+repack1-2) unstable; urgency=medium
++
++  * [0d4dc2b] Add missing dependency on libslvs1. (Closes: #856937)
++
++ -- Anton Gladky <gladk@debian.org>  Mon, 06 Mar 2017 20:59:20 +0100
++
++solvespace (2.3+repack1-1) unstable; urgency=medium
++
++  * [a7825d4] Add d/watch.
++  * [15facd8] Update get_orig.sh script.
++  * [4bcf775] New upstream version 2.3+repack1
++  * [5bfcd9a] Refresh patch.
++
++ -- Anton Gladky <gladk@debian.org>  Sat, 31 Dec 2016 09:54:59 +0100
++
++solvespace (2.1+repack2-1) unstable; urgency=medium
++
++  * Initial Release. (Closes: #797997)
++
++ -- Anton Gladky <gladk@debian.org>  Mon, 15 Aug 2016 22:31:44 +0200
diff --cc debian/compat
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..ec635144f60048986bc560c5576355344005e6e7
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++9
diff --cc debian/control
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..da92eb399a17425f74fc41569e80f1c1cb8d199f
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,63 @@@
++Source: solvespace
++Section: graphics
++Priority: optional
++Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
++Uploaders: whitequark <whitequark@whitequark.org>,
++           Anton Gladky <gladk@debian.org>
++Build-Depends: cmake,
++               debhelper (>= 9),
++               libfontconfig1-dev,
++               libgl-dev,
++               libglew-dev,
++               libglu-dev,
++               libgtkmm-2.4-dev,
++               libjson-c-dev,
++               libpangomm-1.4-dev,
++               libpng-dev,
++               unifont,
++               zlib1g-dev
++Standards-Version: 3.9.8
++Homepage: http://solvespace.com
++Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/solvespace.git
++Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/solvespace.git
++
++Package: solvespace
++Architecture: any
++Multi-Arch: foreign
++Depends: ${misc:Depends}, ${shlibs:Depends}
++Description: 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: libslvs1
++Section: libs
++Architecture: any
++Multi-Arch: same
++Depends: ${misc:Depends}, ${shlibs: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: libdevel
++Architecture: any
++Multi-Arch: same
++Depends: ${misc:Depends}, ${shlibs:Depends}, libslvs1 (= ${binary:Version})
++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.
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..bb13cf70dcaec9e51ed7c592b368ac6582f506dd
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,57 @@@
++Format: https://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
++ 2015-2016 whitequark <whitequark@whitequark.org>
++ 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/libdxfrw/*
++Copyright: 2011-2015 José F. Soriano, rallazz@gmail.com
++License: GPL-2.0+
++
++Files: src/fonts/unicode.lff.gz
++Copyright: 2011 Rallaz <rallazz@gmail.com>
++           2011 Eugene Osintsev <osgene@omskelecom.ru>
++           2011 Yoshimune Kobayashi <cfg47520@syd.odn.ne,jp>
++License: GPL-2.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 <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".
++
++License: GPL-2.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 2 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 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --cc debian/docs
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b43bf86b50fd8d3529a0dc062c30006ed38f309e
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++README.md
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..2e3788778e433062ea373c83dcc844582705e544
new file mode 100755 (executable)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,17 @@@
++#!/bin/bash
++
++RELEASE_NAME=v2.3
++
++UPSTREAM="https://github.com/solvespace/solvespace.git"
++git clone --depth=1 --recursive -b ${RELEASE_NAME} ${UPSTREAM}
++
++rm -rfv solvespace/extlib/libfreetype
++rm -rfv solvespace/extlib/libpng
++rm -rfv solvespace/extlib/zlib
++rm -rfv solvespace/extlib/si
++rm -rfv solvespace/debian
++rm -rfv solvespace/.gi*
++rm -rfv solvespace/.travis
++rm -rfv solvespace/src/fonts/unifont-8.0.01.hex.gz
++
++tar cJf solvespace_${RELEASE_NAME}+repack2.tar.xz solvespace
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..8de0fcdc08eb24efb4963b5d609af15ae434892b
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,2 @@@
++usr/include/slvs.h
++usr/lib/*/libslvs.so
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..ffa6d6e1a45cc7c31b9cd6b270b90ecc39947262
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++usr/lib/*/libslvs.so.*
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..4fd06ee8761c7db660b2b0d21746adc74337374b
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,16 @@@
++Description: Remove git hash commit consideration
++Author: Anton Gladky <gladk@debian.org>
++Last-Update: 2016-12-31
++
++Index: solvespace/CMakeLists.txt
++===================================================================
++--- solvespace.orig/CMakeLists.txt
+++++ solvespace/CMakeLists.txt
++@@ -20,7 +20,6 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX
++ # NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds
++ # can come from a variety of sources. If you are mirroring the sources or otherwise build when
++ # the .git directory is not present, please comment the following line:
++-include(GetGitCommitHash)
++ # and instead uncomment the following, adding the complete git hash of the checkout you are using:
++ # set(GIT_COMMIT_HASH 0000000000000000000000000000000000000000)
++ 
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..2ece363af54a8f1e96fff92eb119d9b37e7bf0bf
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,56 @@@
++Description: Use system packaged unifont
++Author: Anton Gladky <gladk@debian.org>
++Last-Update: 2016-08-15
++
++Index: solvespace/src/CMakeLists.txt
++===================================================================
++--- solvespace.orig/src/CMakeLists.txt
+++++ solvespace/src/CMakeLists.txt
++@@ -101,10 +101,10 @@ add_custom_command(
++     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/generated/bitmapfont.table.h
++     COMMAND $<TARGET_FILE:unifont2c>
++             ${CMAKE_CURRENT_BINARY_DIR}/generated/bitmapfont.table.h
++-            ${CMAKE_CURRENT_SOURCE_DIR}/fonts/unifont-8.0.01.hex.gz
+++            /usr/share/unifont/unifont.hex
++             ${chars}
++     DEPENDS unifont2c
++-            ${CMAKE_CURRENT_SOURCE_DIR}/fonts/unifont-8.0.01.hex.gz
+++            /usr/share/unifont/unifont.hex
++             ${chars}
++     VERBATIM)
++ 
++Index: solvespace/tools/unifont2c.cpp
++===================================================================
++--- solvespace.orig/tools/unifont2c.cpp
+++++ solvespace/tools/unifont2c.cpp
++@@ -118,17 +118,17 @@ int main(int argc, char** argv) {
++         properties[codepoint].exists = true;
++     }
++ 
++-    gzFile unifont = gzopen(argv[2], "rb");
+++    FILE *unifont = fopen(argv[2], "rb");
++     if(!unifont)
++         die("unifont fopen failed");
++ 
++     while(1) {
++         char buf[100];
++-        if(!gzgets(unifont, buf, sizeof(buf))){
++-            if(gzeof(unifont)) {
+++        if(!fgets(buf, sizeof(buf), unifont)){
+++            if(feof(unifont)) {
++                 break;
++             } else {
++-                die("unifont gzgets failed");
+++                die("unifont gets failed");
++             }
++         }
++ 
++@@ -164,7 +164,7 @@ int main(int argc, char** argv) {
++         properties[codepoint].isWide = isWide;
++     }
++ 
++-    gzclose(unifont);
+++    fclose(unifont);
++ 
++     FILE *source = fopen(argv[1], "wt");
++     if(!source)
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..ebc2025ab4e784d6a49844404685b027170f7d09
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,2 @@@
++01_RemoveGitHash.patch
++20_use_system_unifont.patch 
diff --cc debian/rules
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..ce2eb52beb5d7b9bfcad988ea41fd7e44f1b2b97
new file mode 100755 (executable)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++#!/usr/bin/make -f
++
++%:
++      dh $@ --parallel
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d997372de8603bc42d69939cc1ca3da1f976cda3
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,28 @@@
++.\"Created with GNOME Manpages Editor Wizard
++.\"http://sourceforge.net/projects/gmanedit2
++.TH solvespace 1 "August 15, 2016" "" "SOLVESPACE"
++
++.SH NAME
++solvespace \- a parametric 3d CAD program 
++
++.SH DESCRIPTION
++.PP
++.B modeling 3d parts -
++draw with extrudes, revolves, and Boolean (union / difference) operations
++.PP
++.B modeling 1d parts -
++draw the part as a single section, and export DXF, PDF, SVG; use 3d assembly to verify fit
++.PP
++.B 3d-printed parts -
++export the STL or other triangle mesh expected by most 3d printers
++.PP
++.B 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
++.PP
++.B  mechanism design -
++use the constraint solver to simulate planar or spatial linkages, with pin, ball, or slide joints
++.PP
++.B  plane and solid geometry -
++replace hand-solved trigonometry and spreadsheets with a live dimensioned drawing
++.PP
++
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..0ca010aadd349b4f38949b7e37633909a5575120
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,3 @@@
++usr/bin/solvespace
++usr/share/applications
++usr/share/icons
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..be9c64acc2297da8604323dd35dbc5738774e528
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++debian/solvespace.1
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..4f6e2cf52f7fac86e476364b8b1499ff9fcdbdef
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,8 @@@
++<?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>
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..163aaf8d82b6c54f23c45f32895dbdfdcc27b047
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..3fbd3a471bfaf8869750e4a2f0a9d6a4d955b222
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,3 @@@
++tar-ignore = "*.sublime-*"
++tar-ignore = "build*"
++tar-ignore = ".git"
diff --cc debian/watch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..72df02aabbda5d9f57ed7d3b8f3a1def87033811
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,3 @@@
++version=3
++opts=repacksuffix=+dfsg1,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
++https://github.com/solvespace/solvespace/tags .*/v?(\d\S*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))