2.3: Syncing work from master

2.3/Cura-extra-plugins/control

@@ -2,7 +2,9 @@ Source: cura-extra-plugins
 Section: science
 Priority: optional
 Maintainer: Thomas Karl Pietrowski <thopiekar@googlemail.com>
-Build-Depends: debhelper (>=9), cmake, python3-all-dev
+Build-Depends:
+ debhelper (>=9), cmake,
+ python3-all-dev
 Standards-Version: 3.9.6
 
 Package: cura-extra-plugins-all
@@ -11,17 +13,27 @@ Depends:
 # cura-extra-plugin-doodle3d,
  cura-extra-plugin-octoprint,
  cura-extra-plugin-postprocessing,
+ cura-extra-plugin-um3networkprinting,
 Enhances:
  cura
-Description: 3rd party plugins for Cura
+Description: Cura plugin meta-package
- <insert long description, indented with spaces>
+ .
+
+Package: cura-extra-plugin-um3networkprinting
+Architecture: all
+Depends:
+ cura-plugin-api-3,
+ python3-zeroconf,
+ ${misc:Depends}
+Description: Cura plugin - UM3NetworkPrinting
+ For more info see: https://github.com/Ultimaker/UM3NetworkPrintingPlugin
 
 #Package: cura-extra-plugin-doodle3d
 #Architecture: all
 #Depends:
 # cura-plugin-api-2,
 # ${misc:Depends}
-#Description: 3rd party plugins for Cura
+#Description: Cura plugin - Doodle3D
 # .
 
 Package: cura-extra-plugin-postprocessing
@@ -29,8 +41,8 @@ Architecture: all
 Depends:
  cura-plugin-api-3,
  ${misc:Depends}
-Description: postprocessing plugin for Cura
+Description: Cura plugin - PostProcessing
- .
+ For more info see: https://github.com/nallath/PostProcessingPlugin
 
 Package: cura-extra-plugin-octoprint
 Architecture: all
@@ -38,5 +50,5 @@ Depends:
  cura-plugin-api-3,
  python3-zeroconf,
  ${misc:Depends}
-Description: postprocessing plugin for Cura
+Description: Cura plugin - OctoPrint
- .
+ For more info see: https://github.com/fieldOfView/OctoPrintPlugin

2.3/Cura-extra-plugins/rules

@@ -3,7 +3,8 @@
 # output every command that modifies files on the build system.
 export DH_VERBOSE = 1
 
-CURA_PLUGINS = PostProcessingPlugin OctoPrintPlugin
+CURA_PLUGINS = PostProcessingPlugin OctoPrintPlugin UM3NetworkPrintingPlugin
+# List of disabled plugins: Doodle3DPlugin
 
 %:
 	dh $@ --parallel

2.3/Cura/control

@@ -2,7 +2,8 @@ Source: cura
 Section: science
 Priority: optional
 Maintainer: Thomas Karl Pietrowski <thopiekar@googlemail.com>
-Build-Depends: debhelper (>= 9), cmake, dh-python,
+Build-Depends:
+ debhelper (>= 9), cmake,
  python3-dev,
  python3-uranium, uranium-tools,
  qttools5-dev, qttools5-dev-tools,

2.3/CuraEngine/control

@@ -2,9 +2,13 @@ Source: cura-engine
 Section: utils
 Priority: optional
 Maintainer: Thomas Karl Pietrowski <thopiekar@googlemail.com>
-Build-Depends: debhelper (>= 9), cmake, dh-python,
+Build-Depends:
+ debhelper (>= 9), cmake,
+ python3-all-dev,
  libarcus-dev,
  protobuf-compiler, libprotobuf-dev,
+# Tests
+ libcppunit-dev,
 Standards-Version: 3.9.6
 Homepage: https://github.com/Ultimaker/CuraEngine
 Vcs-Git: https://github.com/Ultimaker/CuraEngine.git

2.3/CuraEngine/rules

@@ -4,7 +4,7 @@
 #export DH_VERBOSE = 1
 
 %:
-	dh $@ --with python3 --buildsystem=cmake --parallel
+	dh $@ --buildsystem=cmake --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
@@ -13,3 +13,6 @@ override_dh_auto_configure:
 
 override_dh_install:
 	dh_install --fail-missing
+
+override_dh_auto_test:
+	@echo "Skipping tests..."

2.3/Uranium/control

@@ -2,7 +2,8 @@ Source: uranium
 Section: python
 Priority: optional
 Maintainer: Thomas Karl Pietrowski <thopiekar@googlemail.com>
-Build-Depends: debhelper (>= 9), cmake, dh-python,
+Build-Depends:
+ debhelper (>= 9), cmake,
  python3-all-dev, python3-pyqt5, python3-numpy,
  doxygen,
  gettext,

2.3/libArcus/control

@@ -2,8 +2,9 @@ Source: libarcus
 Section: devel
 Priority: optional
 Maintainer: Thomas Karl Pietrowski <thopiekar@googlemail.com>
-Build-Depends: debhelper (>= 9), cmake, dh-python,
+Build-Depends: debhelper (>= 9), cmake,
- python3-dev, python3-sip-dev,
+ python3-all-dev, python3-all-dbg,
+ python3-sip-dev, python3-sip-dbg,
  protobuf-compiler, libprotobuf10-dev | libprotobuf-dev (>= 3.0.0), libprotoc10-dev | libprotoc-dev,
 Standards-Version: 3.9.6
 Homepage: https://github.com/Ultimaker/libArcus
@@ -21,6 +22,16 @@ Depends:
 Description:  Communication library between internal components for Ultimaker software 
   Communication library between internal components for Ultimaker software 
 
+Package: libarcus-dbg
+Architecture: any
+Multi-Arch: same
+Section: debug
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description:  Communication library between internal components for Ultimaker software 
+  Communication library between internal components for Ultimaker software 
+
 Package: libarcus-dev
 Architecture: any
 Multi-Arch: same
@@ -46,3 +57,18 @@ XB-Python3-Version:
  ${python3:Versions}
 Description:  Communication library between internal components for Ultimaker software 
   Communication library between internal components for Ultimaker software 
+
+Package: python3-arcus-dbg
+Architecture: any
+Section: python
+Depends:
+ ${shlibs:Depends},
+ ${python3:Depends},
+ ${misc:Depends},
+ libarcus (= ${binary:Version})
+Provides:
+ ${python3:Provides}
+XB-Python3-Version:
+ ${python3:Versions}
+Description:  Communication library between internal components for Ultimaker software
+  Communication library between internal components for Ultimaker software

2.3/libArcus/rules

@@ -3,16 +3,69 @@
 # output every command that modifies files on the build system.
 export DH_VERBOSE = 1
 
+CMAKE_COMMON_OPTIONS := -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+                        -DBUILD_EXAMPLES:BOOL=OFF
+
 %:
 	dh $@ --with python3 --buildsystem=cmake --parallel
 
-override_dh_install:
+override_dh_auto_clean:
-	dh_install --fail-missing
+	rm -rf build-*
+	- rm -rf debian/tmp
+	- rm -rf debian/tmp-dbg
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
+	for PYX in $(shell py3versions -rv) ; do \
-	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+	    mkdir -p build-$${PYX}; \
+	    dh_auto_configure -a \
+                          --builddirectory=build-$${PYX} -- \
+	                      $(CMAKE_COMMON_OPTIONS) \
+	                      -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
+	                      -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
+	                      -DPYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$${PYX}m.so \
+	                      -DPYTHON_INCLUDE_DIR:FILEPATH=/usr/include/python$${PYX}m \
+	                      -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python$${PYX} ; \
+	done
+	
+	# DEBUG
+	for PYX in $(shell py3versions -rv) ; do \
+	    mkdir -p build-$${PYX}-dbg; \
+	    dh_auto_configure -a \
+                          --builddirectory=build-$${PYX}-dbg -- \
+	                      $(CMAKE_COMMON_OPTIONS) \
+	                      -DCMAKE_BUILD_TYPE:STRING="Debug" \
+	                      -DCMAKE_INSTALL_LIBDIR=/usr/lib/debug/lib/$(DEB_HOST_MULTIARCH) \
+	                      -DPYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$${PYX}m.so \
+	                      -DPYTHON_DEBUG_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$${PYX}dm.so \
+	                      -DPYTHON_INCLUDE_DIR:FILEPATH=/usr/include/python$${PYX}dm \
+	                      -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python$${PYX}dm ; \
+	done
 
+override_dh_auto_build:
+	for PYX in $(shell py3versions -rv) ; do \
+	    dh_auto_build -a --builddirectory=build-$${PYX}; \
+	    dh_auto_build -a --builddirectory=build-$${PYX}-dbg; \
+	done
 
+override_dh_auto_install:
+	for PYX in $(shell py3versions -rv) ; do \
+	    dh_auto_install -a --builddirectory=build-$${PYX} --destdir=debian/tmp; \
+	    dh_auto_install -a --builddirectory=build-$${PYX}-dbg --destdir=debian/tmp-dbg; \
+	done
 
+override_dh_auto_test:
+	for PYX in $(shell py3versions -rv) ; do \
+	    dh_auto_test --builddirectory=build-$${PYX}; \
+	    dh_auto_test --builddirectory=build-$${PYX}-dbg; \
+	done
 
+override_dh_install:
+	dh_install \
+	    -plibarcus-dbg \
+	    -ppython3-arcus-dbg \
+	--sourcedir=debian/tmp-dbg --list-missing
+	dh_install -a --remaining-packages --fail-missing
+
+override_dh_strip:
+	dh_strip -plibarcus --dbg-package=libarcus-dbg
+	dh_strip -ppython3-arcus --dbg-package=python3-arcus-dbg