summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Fox-Rabinovitz2015-07-01 17:20:58 -0400
committerJoseph Fox-Rabinovitz2015-07-01 17:20:58 -0400
commit56941c1f8e6c2bb7e90c3cdf108366f919e06aaf (patch)
treefd9b92dea713945d8fb3a052db535616ea1260f4
parent598e272991dcbc520963067ebad833b5fc5a098d (diff)
downloadaur-56941c1f8e6c2bb7e90c3cdf108366f919e06aaf.tar.gz
Added conflict to new version of package
Diffstat
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 314482edb98f..d785fdb00a15 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,6 +10,7 @@ pkgbase = panoply
depends = java-environment>=7
depends = hicolor-icon-theme
depends = desktop-file-utils
+ conflicts = panoply-nodesktop
source = http://www.giss.nasa.gov/tools/panoply/PanoplyJ.zip
source = LICENSES
source = panoply-script.patch
diff --git a/PKGBUILD b/PKGBUILD
index 6a5d7a6a6041..ccc6b2b881cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ depends=('java-environment>=7'
makedepends=()
optdepends=()
provides=()
-conflicts=()
+conflicts=(panoply-nodesktop)
replaces=()
backup=()
options=()