Merge pull request #21 from thopiekar/2.5

Merging 2.5 into master
This commit is contained in:
Thomas Karl Pietrowski 2017-04-30 10:25:28 +02:00 committed by GitHub
commit ff0453a1bf
4 changed files with 9 additions and 3 deletions

View File

@ -1,5 +1,5 @@
Source: cura-extra-plugins
Section: science
Section: graphics
Priority: optional
Maintainer: Thomas Karl Pietrowski <thopiekar@googlemail.com>
Build-Depends:

View File

@ -1,5 +1,5 @@
Source: cura
Section: science
Section: graphics
Priority: optional
Maintainer: Thomas Karl Pietrowski <thopiekar@googlemail.com>
Build-Depends:

View File

@ -18,7 +18,6 @@ Vcs-Git: https://github.com/Ultimaker/Uranium.git
Vcs-Browser: https://github.com/Ultimaker/Uranium
Package: python3-uranium
Section: python
Architecture: all
Depends:
${shlibs:Depends},
@ -61,6 +60,7 @@ Description: A Python framework for building Desktop applications.
Package: uranium-tools
Architecture: all
Section: devel
Depends:
${shlibs:Depends},
${python3:Depends},

View File

@ -16,6 +16,12 @@ Depends:
Provides:
fdm-materials,
cura-resources-materials-generic,
cura-resources-materials-chromatik,
cura-resources-materials-fiberlogy,
cura-resources-materials-filo3d,
cura-resources-materials-imade3d,
cura-resources-materials-octofiber,
cura-resources-materials-polymaker,
cura-resources-materials-ultimaker,
Conflicts:
cura (<< 2.4),