diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-09 17:15:33 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-09 17:15:33 +0100 |
| commit | 81c145bbc94619d18db270991d31912a3d50c43b (patch) | |
| tree | d4019392a513b226493ade11b1486d73dbb1e68e /extra/openjdk6 | |
| parent | 4290dec175736d43c7df289c599f553c469f3678 (diff) | |
| parent | 0a7c64736c0b026c3105928d89500a8af1ad5eac (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/recoll/PKGBUILD
core/dnsutils/PKGBUILD
core/tzdata/PKGBUILD
extra/cabal-install/PKGBUILD
extra/feh/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/indent/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/kdebase-workspace/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdesdk/PKGBUILD
extra/ktorrent/PKGBUILD
extra/libktorrent/PKGBUILD
libre/mplayer-libre/PKGBUILD
multilib/lib32-libxau/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/wine/PKGBUILD
staging/kdenetwork/PKGBUILD
staging/kdepim/PKGBUILD
testing/bluez/PKGBUILD
testing/xf86-input-evdev/PKGBUILD
Diffstat (limited to 'extra/openjdk6')
| -rw-r--r-- | extra/openjdk6/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index 423532c37..44352b095 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 151907 2012-03-03 18:57:24Z andyrtr $ +# $Id: PKGBUILD 152644 2012-03-07 19:17:54Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -9,7 +9,7 @@ _icedteaver=1.11.1 _openjdk_version=b24 _openjdk_date=14_nov_2011 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} -pkgrel=2 +pkgrel=3 url='http://icedtea.classpath.org' arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -88,7 +88,7 @@ package_openjdk6() { 'alsa-lib: for sound' 'giflib: for gif format support') conflicts=('java-environment' 'java-runtime') - provides=('java-environment=6' 'java-runtime=6') + provides=('java-environment=6' 'java-runtime=6' 'java-runtime-headless=6') install=openjdk6.install if [ "${CARCH}" = "x86_64" ]; then |