Merge branch 'master' into master-protobuf-3.6

This commit is contained in:
Thomas Karl Pietrowski 2018-10-13 15:34:21 +02:00 committed by GitHub
commit c399d438e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 36 additions and 58 deletions

View File

@ -1,4 +1,4 @@
cura (1:3.4.1) unstable; urgency=low
cura (1:3.5) unstable; urgency=low
* Initial release

View File

@ -21,10 +21,12 @@ Depends:
${shlibs:Depends},
${misc:Depends},
${python3:Depends},
# brewed by Ultimaker
cura-engine,
cura-resources-materials,
python3-uranium,
python3-savitar,
# QML
qml-module-qtqml-models2,
qml-module-qtquick-controls,
qml-module-qtquick-controls2,

View File

@ -1,46 +1,8 @@
usr/bin/cura
usr/lib/cura/plugins/3MFReader
usr/lib/cura/plugins/3MFWriter
usr/lib/cura/plugins/ChangeLogPlugin
usr/lib/cura/plugins/CuraEngineBackend
usr/lib/cura/plugins/CuraProfileReader
usr/lib/cura/plugins/CuraProfileWriter
usr/lib/cura/plugins/FirmwareUpdateChecker
usr/lib/cura/plugins/GCodeGzReader
usr/lib/cura/plugins/GCodeGzWriter
usr/lib/cura/plugins/GCodeProfileReader
usr/lib/cura/plugins/GCodeWriter
usr/lib/cura/plugins/ImageReader
usr/lib/cura/plugins/LegacyProfileReader
usr/lib/cura/plugins/MachineSettingsAction
usr/lib/cura/plugins/ModelChecker
usr/lib/cura/plugins/MonitorStage
usr/lib/cura/plugins/PerObjectSettingsTool
usr/lib/cura/plugins/PrepareStage
usr/lib/cura/plugins/RemovableDriveOutputDevice
usr/lib/cura/plugins/SimulationView
usr/lib/cura/plugins/SolidView
usr/lib/cura/plugins/SupportEraser
usr/lib/cura/plugins/Toolbox
usr/lib/cura/plugins/UFPWriter
usr/lib/cura/plugins/UserAgreement
usr/lib/cura/plugins/VersionUpgrade
usr/lib/cura/plugins/XmlMaterialProfile
usr/lib/cura/plugins/XRayView
usr/lib/cura/plugins/*
usr/lib/python3/dist-packages/cura
usr/share/applications/
usr/share/cura/resources/bundled_packages.json
usr/share/cura/resources/definitions
usr/share/cura/resources/extruders
usr/share/cura/resources/i18n
usr/share/cura/resources/images
usr/share/cura/resources/meshes
usr/share/cura/resources/qml
usr/share/cura/resources/quality
usr/share/cura/resources/setting_visibility
usr/share/cura/resources/shaders
usr/share/cura/resources/themes
usr/share/cura/resources/variants
usr/share/icons/hicolor/128x128/apps
usr/share/cura/resources/*
usr/share/icons/*
usr/share/metainfo/
usr/share/mime/packages/

View File

@ -1,4 +1,4 @@
cura-engine (1:3.4.1) unstable; urgency=medium
cura-engine (1:3.5) unstable; urgency=medium
* Initial release

View File

@ -6,7 +6,8 @@ Build-Depends:
debhelper (>= 9), cmake,
python3-all-dev,
libarcus-dev,
protobuf-compiler, libprotobuf-dev,
# Protobuf (>= 3.5)
protobuf-compiler (>= 3.5), libprotobuf-dev (>= 3.5),
stb-dev,
# Tests
libcppunit-dev,

View File

@ -17,6 +17,8 @@ There is also a issue report for different problems at [#1094](https://github.co
* https://code.launchpad.net/~thopiekar/+recipe/cura-engine-stable-daily
* https://code.launchpad.net/~thopiekar/+recipe/fdm-materials-stable-daily
* https://code.launchpad.net/~thopiekar/+recipe/libarcus-stable-daily
* https://code.launchpad.net/~thopiekar/+recipe/libcharon-stable-daily
* https://code.launchpad.net/~thopiekar/+recipe/libsavitar-stable-daily
* https://code.launchpad.net/~thopiekar/+recipe/uranium-stable-daily
* https://code.launchpad.net/~thopiekar/+recipe/stb-stable-daily (3rd-party) (not updated frequently)
* (protobuf is not updated frequently)
@ -28,6 +30,7 @@ There is also a issue report for different problems at [#1094](https://github.co
* https://code.launchpad.net/~thopiekar/+recipe/fdm-materials-master-daily
* https://code.launchpad.net/~thopiekar/+recipe/libarcus-master-daily
* https://code.launchpad.net/~thopiekar/+recipe/libcharon-master-daily
* https://code.launchpad.net/~thopiekar/+recipe/libsavitar-master-daily
* https://code.launchpad.net/~thopiekar/+recipe/uranium-master-daily
* https://code.launchpad.net/~thopiekar/+recipe/protobuf-daily (3rd-party)
* https://code.launchpad.net/~thopiekar/+recipe/stb-daily (3rd-party)

View File

@ -1,4 +1,4 @@
uranium (1:3.4.1) unstable; urgency=low
uranium (1:3.5) unstable; urgency=low
* Initial release

View File

@ -3,14 +3,19 @@ Section: python
Priority: optional
Maintainer: Thomas Karl Pietrowski <thopiekar@googlemail.com>
Build-Depends:
debhelper (>= 9), cmake,
debhelper (>= 9),
cmake,
python3-all-dev,
python3-pyqt5, python3-numpy,
# PyQt
python3-pyqt5,
python3-numpy,
python3-scipy,
# Docs
doxygen,
gettext,
# Test suite
python3-pytest, pylint3,
python3-scipy,
python3-pytest,
pylint3,
Standards-Version: 3.9.6
Homepage: https://github.com/Ultimaker/Uranium
X-Python3-Version: >= 3.4
@ -23,11 +28,13 @@ Depends:
${shlibs:Depends},
${python3:Depends},
${misc:Depends},
# brewed by Ultimaker
uranium-plugins,
python3-arcus,
# 3rd party Python modules
python3-numpy,
python3-scipy,
python3-shapely,
# PyQt5
python3-pyqt5,
python3-pyqt5.qtopengl,

View File

@ -12,5 +12,8 @@ Package: stb
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: stb-dev
Description: <insert up to 60 chars description>
<insert long description, indented with spaces>
Description: Sean's Tool Box - single-file public domain (or MIT licensed) libraries for C/C++
This is a single header file with a bunch of useful utilities for getting stuff done in C/C++.
.
Documentation: http://nothings.org/stb/stb_h.html
Unit tests: http://nothings.org/stb/stb.c

View File

@ -1,4 +1,4 @@
cura-binary-data (3.4.1) unstable; urgency=low
cura-binary-data (3.5) unstable; urgency=low
* Initial release

View File

@ -1,4 +1,4 @@
fdm-materials (3.4.1) unstable; urgency=low
fdm-materials (3.5) unstable; urgency=low
* Initial release

View File

@ -1,4 +1,4 @@
libarcus (1:3.4.1) unstable; urgency=low
libarcus (1:3.5) unstable; urgency=low
* Initial release

View File

@ -10,8 +10,8 @@ Build-Depends:
python3-all-dev, python3-all-dbg,
# SIP
python3-sip-dev, python3-sip-dbg,
# Protobuf
protobuf-compiler, libprotobuf-dev (>= 3.0.0), libprotoc-dev,
# Protobuf >= 3.5
protobuf-compiler (>= 3.5), libprotobuf-dev (>= 3.5), libprotoc-dev,
Standards-Version: 3.9.8
X-Python3-Version: >= 3.4
Homepage: https://github.com/Ultimaker/libArcus

View File

@ -1,4 +1,4 @@
libcharon (3.4.1) unstable; urgency=medium
libcharon (3.5) unstable; urgency=medium
* Initial release

View File

@ -1,4 +1,4 @@
libsavitar (3.4.1) unstable; urgency=medium
libsavitar (3.5) unstable; urgency=medium
* Initial release