Merge branch 'master' of https://github.com/thopiekar/Cura-packaging

Cura/control

@@ -29,10 +29,7 @@ Depends:
  qml-module-qtquick-dialogs,
 Recommends:
  cura-resources-firmware,
- cura-plugin-sliceinfo,
- cura-plugin-ultimakermachineactions,
- cura-plugin-um3networkprinting,
- cura-plugin-x3dreader,
+ cura-plugins-all,
 Provides:
  cura-plugin-api-3,
  ${python3:Provides},
@@ -43,6 +40,20 @@ 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-plugins-all
+Architecture: all
+Depends:
+ cura-plugin-sliceinfo,
+ cura-plugin-ultimakermachineactions,
+ cura-plugin-um3networkprinting,
+ cura-plugin-x3dreader,
+Provides:
+ cura-plugins
+Enhances:
+ cura
+Description: Cura plugin meta-package
+ .
+
 Package: cura-plugin-sliceinfo
 Architecture: all
 Depends:

fdm_materials/control

@@ -17,6 +17,8 @@ Provides:
  fdm-materials,
  cura-resources-materials-generic,
  cura-resources-materials-ultimaker,
+Conflicts:
+ cura (<< 2.4),
 Description:  Cura material files
  These files are needed to work with printers like UM2+ and UM3.