[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)

[Andreas Radke]

    Date: Wednesday, February 20, 2013 @ 18:19:24
  Author: andyrtr
Revision: 178356

enable replaces for next update

Modified:
  java7-openjdk/trunk/PKGBUILD

----------+
 PKGBUILD |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-20 17:18:38 UTC (rev 178355)
+++ PKGBUILD	2013-02-20 17:19:24 UTC (rev 178356)
@@ -135,7 +135,6 @@
               'fontconfig: needed for Java Mauve support - libmawt.so')
   provides=('java-runtime-headless=7')
   conflicts=('openjdk6')
-  #  replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
   backup=(etc/profile.d/jre.sh
           etc/profile.d/jre.csh
           etc/java-7-openjdk/calendars.properties
@@ -289,7 +288,7 @@
   depends=('jre7-openjdk')
   provides=('java-environment=7')
   conflicts=('java-environment')
-  #  replaces=('openjdk6')
+  replaces=('openjdk6')
   backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh)
 
   cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
@@ -337,7 +336,8 @@
 
 package_openjdk7-src() {
   pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources"
-
+  replaces=('openjdk6-src')
+  
   install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \
              ${pkgdir}/${_jvmdir}/src.zip
 }