summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGaetan Bisson2019-12-21 10:47:51 -1000
committerGaetan Bisson2019-12-21 10:47:51 -1000
commit5aba2ea936166ad4de6e6f069c68ea93a37a3991 (patch)
treef8190b569691dae6ed0056f539cdea04338b11ff
parent0cf9231f3c302429b40004c587e312faed69c0a2 (diff)
parente823082ff54dac558da2b36b29e0167dd90e398a (diff)
downloadaur-5aba2ea936166ad4de6e6f069c68ea93a37a3991.tar.gz
Merge branch 'master' of ssh://aur/mupdf-git
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 6 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 66bc5fa8404..165f945c1ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,7 +15,11 @@ pkgbase = mupdf-git
depends = libjpeg-turbo
depends = openjpeg2
provides = mupdf
+ provides = mupdf-gl
+ provides = mupdf-tools
conflicts = mupdf
+ conflicts = mupdf-gl
+ conflicts = mupdf-tools
source = git://git.ghostscript.com/mupdf.git
source = lcms2::git://git.ghostscript.com/thirdparty-lcms2.git
source = git://git.ghostscript.com/mujs.git
diff --git a/PKGBUILD b/PKGBUILD
index 3bfe0a7f3ae..a601dc485ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,8 +21,8 @@ sha256sums=('SKIP'
'SKIP'
'3240d4ebda002cb2c4f42cd42793c6160f1701d349d0acb797819dfd10d4fedd')
-conflicts=("${_pkgname}")
-provides=("${_pkgname}")
+conflicts=("${_pkgname}"{,-gl,-tools})
+provides=("${_pkgname}"{,-gl,-tools})
pkgver() {
cd "${srcdir}/${_pkgname}"