summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Goldsmith2017-09-05 02:29:45 -0400
committerAdam Goldsmith2017-09-05 02:29:45 -0400
commitdee06a8c42029f4f3847b21a7fa2c56d24a4ce6b (patch)
tree40d56a98896236baefd3ad8c7283bfc4d18283b9
parentc33c2a4d7b7e1a473ace6dcf897dfcc858b5fd4a (diff)
downloadaur-dee06a8c42029f4f3847b21a7fa2c56d24a4ce6b.tar.gz
Add conflict/provide for cura-resources-materials
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
2 files changed, 7 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 11dbae081f87..4402ef208a14 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Jan 29 22:43:24 UTC 2017
+# Tue Sep 5 06:29:04 UTC 2017
pkgbase = cura-fdm-materials-git
pkgdesc = A full software solution for 3D printing aimed at RepRaps and the Ultimaker.
- pkgver = cura.2.3.0.7.g96f68f3
+ pkgver = 2.7.0.9.gce3ed95
pkgrel = 1
url = https://github.com/Ultimaker/fdm_materials
arch = any
@@ -10,7 +10,9 @@ pkgbase = cura-fdm-materials-git
makedepends = git
makedepends = cmake
provides = cura-fdm-materials
+ provides = cura-resources-materials
conflicts = cura-fdm-materials
+ conflicts = cura-resources-materials
source = git+https://github.com/Ultimaker/fdm_materials
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index c053c18cef7a..fb9968642c3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,14 @@
# Maintainer: Adam Goldsmith <contact@adamgoldsmith.name>
pkgname=cura-fdm-materials-git
-pkgver=cura.2.3.0.7.g96f68f3
+pkgver=2.7.0.9.gce3ed95
pkgrel=1
pkgdesc="A full software solution for 3D printing aimed at RepRaps and the Ultimaker."
arch=('any')
license=('GPL3')
url="https://github.com/Ultimaker/fdm_materials"
-provides=('cura-fdm-materials')
-conflicts=('cura-fdm-materials')
-depends=()
+provides=('cura-fdm-materials' 'cura-resources-materials')
+conflicts=('cura-fdm-materials' 'cura-resources-materials')
makedepends=('git' 'cmake')
source=('git+https://github.com/Ultimaker/fdm_materials')
md5sums=('SKIP')