summarylogtreecommitdiffstats
path: root/.SRCINFO
diff options
context:
space:
mode:
Diffstat (limited to '.SRCINFO')
-rw-r--r--.SRCINFO6
1 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d29cf7029dcb..691b3ec61770 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = micromanager-git
pkgdesc = Software package for microscopy hardware devices control. CMMCore and python2 bindings only.
- pkgver = 1.4.13.r2326.g5117eb9
+ pkgver = 1.4.13.r2306.gf5e50bd
pkgrel = 1
url = http://www.micro-manager.org
install = mm.install
@@ -14,7 +14,9 @@ pkgbase = micromanager-git
depends = libdc1394
depends = python2
depends = python2-numpy
- source = micromanager-git::git+https://github.com/mdcurtis/micromanager-upstream.git
+ provides = micromanager
+ conflicts = micromanager
+ source = micromanager-git::git+https://github.com/mdcurtis/micromanager-upstream.git#commit=f5e50bd
source = python_makefile.diff
source = python_setup.diff
source = micromanager-lib.conf