From b28cf02e8ddfbe21509d9edf39242e47da1261b4 Mon Sep 17 00:00:00 2001
From: Thomas Karl Pietrowski <thopiekar@googlemail.com>
Date: Fri, 25 Nov 2016 17:58:38 +0100
Subject: [PATCH] master: Updating cura for splitted packaging

---
 master/Cura/control               | 30 ++++++++++++++++++++----------
 master/Cura/cura-firmware.install |  1 -
 master/Cura/cura.install          |  3 ++-
 master/Cura/rules                 |  9 +++++----
 4 files changed, 27 insertions(+), 16 deletions(-)
 delete mode 100644 master/Cura/cura-firmware.install

diff --git a/master/Cura/control b/master/Cura/control
index ad8c749..8d17a4d 100644
--- a/master/Cura/control
+++ b/master/Cura/control
@@ -22,14 +22,16 @@ Depends:
  ${misc:Depends},
  ${python3:Depends},
  cura-engine,
+ cura-resources-materials,
  python3-uranium,
  qml-module-qtqml-models2,
  qml-module-qtquick-controls,
  qml-module-qtquick-dialogs,
 Recommends:
- cura-firmware,
+ cura-resources-firmware,
  cura-plugin-sliceinfo,
  cura-plugin-ultimakermachineactions,
+ cura-plugin-um3networkprinting,
  cura-plugin-x3dreader,
 Provides:
  cura-plugin-api-3,
@@ -41,15 +43,6 @@ Description:  3D printer / slicing GUI built on top of the Uranium framework
  .
  We re-worked the whole GUI code at Ultimaker, because the old code started to become a unmaintainable.
 
-Package: cura-firmware
-Architecture: all
-Depends:
- ${misc:Depends},
-Provides:
- cura-firmware-ultimaker
-Description:  Cura firmware files
- These files are needed to update the firmware of your printer.
-
 Package: cura-plugin-sliceinfo
 Architecture: all
 Depends:
@@ -80,6 +73,23 @@ XB-Python3-Version:
 Description:  Cura plugin - UltimakerMachineActions
  This is plugin adds additional functions to preform some Ultimaker-specific actions.
 
+Package: cura-plugin-um3networkprinting
+Architecture: all
+Depends:
+ cura-plugin-api-3,
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${python3:Depends},
+Provides:
+ ${python3:Provides},
+ cura-extra-plugin-um3networkprinting,
+Replaces:
+ cura-extra-plugin-um3networkprinting,
+XB-Python3-Version:
+ ${python3:Versions},
+Description:  Cura plugin - UltimakerMachineActions
+ This is plugin adds additional functions to preform some Ultimaker-specific actions.
+
 Package: cura-plugin-x3dreader
 Architecture: all
 Depends:
diff --git a/master/Cura/cura-firmware.install b/master/Cura/cura-firmware.install
deleted file mode 100644
index c4922ba..0000000
--- a/master/Cura/cura-firmware.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/cura/resources/firmware
diff --git a/master/Cura/cura.install b/master/Cura/cura.install
index e5a24c6..871aef0 100644
--- a/master/Cura/cura.install
+++ b/master/Cura/cura.install
@@ -1,6 +1,5 @@
 usr/share/cura/resources/quality
 usr/share/cura/resources/qml
-usr/share/cura/resources/materials
 usr/share/cura/resources/meshes
 usr/share/cura/resources/i18n
 usr/share/cura/resources/variants
@@ -10,6 +9,7 @@ usr/share/cura/resources/themes
 usr/share/cura/resources/themes/cura
 usr/share/cura/resources/images
 usr/share/cura/resources/definitions
+usr/lib/cura/plugins/__init__.py
 usr/lib/cura/plugins/XRayView
 usr/lib/cura/plugins/SolidView
 usr/lib/cura/plugins/LegacyProfileReader
@@ -20,6 +20,7 @@ usr/lib/cura/plugins/GCodeProfileReader
 usr/lib/cura/plugins/ImageReader
 usr/lib/cura/plugins/VersionUpgrade
 usr/lib/cura/plugins/3MFReader
+usr/lib/cura/plugins/3MFWriter
 usr/lib/cura/plugins/CuraEngineBackend
 usr/lib/cura/plugins/USBPrinting
 usr/lib/cura/plugins/PerObjectSettingsTool
diff --git a/master/Cura/rules b/master/Cura/rules
index 1f224ec..013682b 100755
--- a/master/Cura/rules
+++ b/master/Cura/rules
@@ -17,10 +17,11 @@ override_dh_install:
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
-	-DURANIUM_SCRIPTS_DIR=/usr/share/uranium/scripts/ \
-	-DCURA_VERSION=$(DEB_PACKAGE_VERSION) \
-	-DCURA_BUILDTYPE=PPA
+	                  -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+	                  -DURANIUM_SCRIPTS_DIR=/usr/share/uranium/scripts/ \
+	                  -DGETTEXT_MSGINIT_EXECUTABLE=/usr/bin/msginit \
+	                  -DCURA_VERSION=$(DEB_PACKAGE_VERSION) \
+	                  -DCURA_BUILDTYPE=PPA
 
 override_dh_installmime:
 	cp -fv cura.sharedmimeinfo debian/cura.sharedmimeinfo