summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0c4bbb4077a7..3f157c1d9280 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -28,6 +28,8 @@ pkgbase = jdk11-openjdk-dcevm
provides = jdk-openjdk=11.0.15.u1
provides = openjdk11-src=11.0.15.u1
provides = openjdk-src=11.0.15.u1
+ conflicts = jdk11-openjdk-dcevm-conflicts-fixed
+ replaces = jdk11-openjdk-dcevm-conflicts-fixed
backup = etc/jdk11-openjdk-dcevm/net.properties
backup = etc/jdk11-openjdk-dcevm/logging.properties
backup = etc/jdk11-openjdk-dcevm/security/java.security
diff --git a/PKGBUILD b/PKGBUILD
index 59ecfb8a2dfe..58ef6ccb7588 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: therealfarfetchd <aur@therealfarfetchd.dev>
+# Maintainer: nycex <bernhard / ithnet.com>
# Based on jdk11-adoptopenjdk
@@ -22,6 +22,8 @@ optdepends=(
'gtk2: for the Gtk+ 2 look and feel'
'gtk3: for the Gtk+ 3 look and feel'
)
+conflicts=('jdk11-openjdk-dcevm-conflicts-fixed')
+replaces=('jdk11-openjdk-dcevm-conflicts-fixed')
provides=(
"java-runtime-headless=${_majorver}"