diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-10-13 04:37:24 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-10-13 04:37:24 -0200 |
| commit | 07ac33c000c046df51de1b1249c74ef5fbe307a5 (patch) | |
| tree | 08512777c60cd485a65188d430def711a4e820e5 /libre/java7-openjdk/PKGBUILD | |
| parent | f90b5da18e958f987c30494730d4b73af31a0388 (diff) | |
java7-openjdk-7.u65_2.5.2-3.parabola1: use new java-*-common scripts. rewrite install scripts
Diffstat (limited to 'libre/java7-openjdk/PKGBUILD')
| -rw-r--r-- | libre/java7-openjdk/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libre/java7-openjdk/PKGBUILD b/libre/java7-openjdk/PKGBUILD index fb4f665a4..3451acb54 100644 --- a/libre/java7-openjdk/PKGBUILD +++ b/libre/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 221783 2014-09-15 20:19:56Z guillaume $ +# $Id: PKGBUILD 224243 2014-10-12 19:04:03Z guillaume $ # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org> # Maintainer (Arch): Guillaume ALAUX <guillaume@archlinux.org> # Contributor (Arch): Jan de Groot <jgc@archlinux.org> @@ -15,7 +15,7 @@ _JDK_UPDATE_VERSION=65 _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver} -pkgrel=2.parabola1 +pkgrel=3.parabola1 arch=('i686' 'x86_64') url='http://icedtea.classpath.org' license=('custom') @@ -117,7 +117,7 @@ check() { package_jre7-openjdk-headless() { pkgdesc='OpenJDK Java 7 headless runtime environment (Parabola rebranded)' - depends=('java-common' 'libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-java') + depends=('java-runtime-common' 'libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-java') optdepends=('libcups: needed for Java Mauve support - libmawt.so' 'fontconfig: needed for Java Mauve support - libmawt.so' 'java-rhino: for some JavaScript support') @@ -246,7 +246,7 @@ package_jre7-openjdk() { package_jdk7-openjdk() { pkgdesc='OpenJDK Java 7 development kit (Parabola rebranded)' - depends=("jre7-openjdk=${pkgver}-${pkgrel}") + depends=('java-environment-common' "jre7-openjdk=${pkgver}-${pkgrel}") provides=('java-environment=7' 'java-environment-openjdk=7') replaces=('openjdk6' 'jdk7-openjdk-wm') install=jdk7-openjdk.install |