summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMuflone2015-09-06 18:33:36 +0200
committerMuflone2015-09-06 18:33:36 +0200
commit57a96e4f79c73ee1bc3edf69936ebc5b68c9386f (patch)
tree86d2411c80681213f05f85c38a2dd0af9f0f27a1
parentaa0309671750ce51e0f44f5db28e54d3b35bbd7b (diff)
downloadaur-57a96e4f79c73ee1bc3edf69936ebc5b68c9386f.tar.gz
Updated package eclipse-jee 4.5.0-2
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 32871145615d..6d3a93437b09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = eclipse-jee
pkgdesc = Eclipse IDE for Java EE Developers
pkgver = 4.5.0
- pkgrel = 1
+ pkgrel = 2
url = http://www.eclipse.org
install = eclipse-jee.install
arch = i686
@@ -12,6 +12,7 @@ pkgbase = eclipse-jee
depends = webkitgtk2
provides = eclipse=4.5.0
conflicts = eclipse
+ conflicts = eclipse-common
source = eclipse.sh
source = eclipse.desktop
source = eclipse.ini.patch
diff --git a/PKGBUILD b/PKGBUILD
index 4124d2b4d766..ca3bf62aee2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,14 +6,14 @@ _eclipse_name=mars
_eclipse_release=R
pkgname=eclipse-jee
pkgver=4.5.0
-pkgrel=1
+pkgrel=2
pkgdesc="Eclipse IDE for Java EE Developers"
arch=('i686' 'x86_64')
url="http://www.eclipse.org"
license=('EPL')
depends=('java-environment>=6' 'gtk2' 'webkitgtk2')
provides=("eclipse=${pkgver}")
-conflicts=('eclipse')
+conflicts=('eclipse' 'eclipse-common')
install="${pkgname}.install"
source=("eclipse.sh"
"eclipse.desktop"