summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorkolorafa2017-04-04 20:34:42 +0200
committerkolorafa2017-04-04 20:34:42 +0200
commit3d484dc77c7f8a79fa31b9806198f04b5c9c6709 (patch)
tree66347223bdf61fd3981b0082cc13f97718983a9d
parentd78439f01c2a0cd76cb40d82ff39592fb938f94a (diff)
downloadaur-3d484dc77c7f8a79fa31b9806198f04b5c9c6709.tar.gz
Added flag that it conflicts with opencv2
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e2eaef39c582..0888b3d4dbb0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = timedoctorpro
pkgdesc = App to track work time from timedoctor.com
pkgver = 1.4.75.14
- pkgrel = 4
+ pkgrel = 5
url = https://www.timedoctor.com/download.html
arch = x86_64
license = proprietary
@@ -11,6 +11,7 @@ pkgbase = timedoctorpro
depends = qt4
depends = opencv
depends = jasper
+ conflicts = opencv2
source = https://updates.timedoctor.com/download/_production/tdpro/linux-ubuntu-16.04/timedoctorpro_1.4.75-14ubuntu16.04_amd64.deb
source = https://archive.archlinux.org/packages/j/jasper/jasper-1.900.5-1-x86_64.pkg.tar.xz
md5sums = 0d50154852f5f10bd8e470066f61a523
diff --git a/PKGBUILD b/PKGBUILD
index 7653bcadb96a..9be881dd2760 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=timedoctorpro
pkgver=1.4.75.14
urlver=$(echo $pkgver|sed 's/\.\([^.]*\)$/-\1/')
-pkgrel=4
+pkgrel=5
arch=('x86_64')
pkgdesc="App to track work time from timedoctor.com"
url="https://www.timedoctor.com/download.html"
@@ -15,6 +15,7 @@ license=('proprietary')
#maybe also depends=('libxss')
depends=('libx11' 'libxcb' 'zlib' 'qt4' 'opencv' 'jasper')
+conflicts=('opencv2')
source=(
"https://updates.timedoctor.com/download/_production/tdpro/linux-ubuntu-16.04/timedoctorpro_${urlver}ubuntu16.04_amd64.deb"