[arch-commits] Commit in java7-openjdk/repos (14 files)
Guillaume Alaux
guillaume at archlinux.org
Sun Nov 16 20:53:16 UTC 2014
Date: Sunday, November 16, 2014 @ 21:53:16
Author: guillaume
Revision: 226336
Revert push to extra
Added:
java7-openjdk/repos/extra-i686/jdk7-openjdk.profile
(from rev 226334, java7-openjdk/repos/extra-i686/jdk7-openjdk.profile)
java7-openjdk/repos/extra-i686/jdk7-openjdk.profile.csh
(from rev 226334, java7-openjdk/repos/extra-i686/jdk7-openjdk.profile.csh)
java7-openjdk/repos/extra-i686/jre7-openjdk.profile
(from rev 226334, java7-openjdk/repos/extra-i686/jre7-openjdk.profile)
java7-openjdk/repos/extra-i686/jre7-openjdk.profile.csh
(from rev 226334, java7-openjdk/repos/extra-i686/jre7-openjdk.profile.csh)
java7-openjdk/repos/extra-x86_64/jdk7-openjdk.profile
(from rev 226334, java7-openjdk/repos/extra-x86_64/jdk7-openjdk.profile)
java7-openjdk/repos/extra-x86_64/jdk7-openjdk.profile.csh
(from rev 226334, java7-openjdk/repos/extra-x86_64/jdk7-openjdk.profile.csh)
java7-openjdk/repos/extra-x86_64/jre7-openjdk.profile
(from rev 226334, java7-openjdk/repos/extra-x86_64/jre7-openjdk.profile)
java7-openjdk/repos/extra-x86_64/jre7-openjdk.profile.csh
(from rev 226334, java7-openjdk/repos/extra-x86_64/jre7-openjdk.profile.csh)
Modified:
java7-openjdk/repos/extra-i686/PKGBUILD
java7-openjdk/repos/extra-i686/jdk7-openjdk.install
java7-openjdk/repos/extra-i686/jre7-openjdk-headless.install
java7-openjdk/repos/extra-x86_64/PKGBUILD
java7-openjdk/repos/extra-x86_64/jdk7-openjdk.install
java7-openjdk/repos/extra-x86_64/jre7-openjdk-headless.install
--------------------------------------------+
extra-i686/PKGBUILD | 8 ++++----
extra-i686/jdk7-openjdk.install | 4 ++--
extra-i686/jdk7-openjdk.profile | 1 +
extra-i686/jdk7-openjdk.profile.csh | 1 +
extra-i686/jre7-openjdk-headless.install | 4 ++--
extra-i686/jre7-openjdk.profile | 4 ++++
extra-i686/jre7-openjdk.profile.csh | 4 ++++
extra-x86_64/PKGBUILD | 8 ++++----
extra-x86_64/jdk7-openjdk.install | 4 ++--
extra-x86_64/jdk7-openjdk.profile | 1 +
extra-x86_64/jdk7-openjdk.profile.csh | 1 +
extra-x86_64/jre7-openjdk-headless.install | 4 ++--
extra-x86_64/jre7-openjdk.profile | 4 ++++
extra-x86_64/jre7-openjdk.profile.csh | 4 ++++
14 files changed, 36 insertions(+), 16 deletions(-)
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-11-16 20:37:21 UTC (rev 226335)
+++ extra-i686/PKGBUILD 2014-11-16 20:53:16 UTC (rev 226336)
@@ -14,7 +14,7 @@
_bootstrap=0 # 0/1 for quick build or full bootstrap
pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver}
-pkgrel=2
+pkgrel=1
arch=('i686' 'x86_64')
url='http://icedtea.classpath.org'
license=('custom')
@@ -116,7 +116,7 @@
package_jre7-openjdk-headless() {
pkgdesc='OpenJDK Java 7 headless runtime environment'
- depends=('java-runtime-common' 'libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-utils')
+ 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')
@@ -178,7 +178,7 @@
done
popd
- # Link JKS keystore from ca-certificates-utils
+ # Link JKS keystore from ca-certificates-java
rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
@@ -199,7 +199,7 @@
package_jre7-openjdk() {
pkgdesc='OpenJDK Java 7 full runtime environment'
depends=("jre7-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme')
- optdepends=('icedtea-web: web browser plugin + Java Web Start'
+ optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
'alsa-lib: for basic sound support'
'giflib: for gif format support'
'libpulse: for advanced sound support'
Modified: extra-i686/jdk7-openjdk.install
===================================================================
--- extra-i686/jdk7-openjdk.install 2014-11-16 20:37:21 UTC (rev 226335)
+++ extra-i686/jdk7-openjdk.install 2014-11-16 20:53:16 UTC (rev 226336)
@@ -25,7 +25,7 @@
esac
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/bin/update-ca-trust
+ /usr/bin/init-jks-keystore
fi
}
@@ -36,7 +36,7 @@
fi
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/bin/update-ca-trust
+ /usr/bin/init-jks-keystore
fi
}
Copied: java7-openjdk/repos/extra-i686/jdk7-openjdk.profile (from rev 226334, java7-openjdk/repos/extra-i686/jdk7-openjdk.profile)
===================================================================
--- extra-i686/jdk7-openjdk.profile (rev 0)
+++ extra-i686/jdk7-openjdk.profile 2014-11-16 20:53:16 UTC (rev 226336)
@@ -0,0 +1 @@
+export JAVA_HOME=/usr/lib/jvm/java-7-openjdk
Copied: java7-openjdk/repos/extra-i686/jdk7-openjdk.profile.csh (from rev 226334, java7-openjdk/repos/extra-i686/jdk7-openjdk.profile.csh)
===================================================================
--- extra-i686/jdk7-openjdk.profile.csh (rev 0)
+++ extra-i686/jdk7-openjdk.profile.csh 2014-11-16 20:53:16 UTC (rev 226336)
@@ -0,0 +1 @@
+setenv J2SDKDIR "/usr/lib/jvm/java-7-openjdk"
Modified: extra-i686/jre7-openjdk-headless.install
===================================================================
--- extra-i686/jre7-openjdk-headless.install 2014-11-16 20:37:21 UTC (rev 226335)
+++ extra-i686/jre7-openjdk-headless.install 2014-11-16 20:53:16 UTC (rev 226336)
@@ -25,7 +25,7 @@
esac
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/bin/update-ca-trust
+ /usr/bin/init-jks-keystore
fi
}
@@ -35,7 +35,7 @@
fi
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/bin/update-ca-trust
+ /usr/bin/init-jks-keystore
fi
}
Copied: java7-openjdk/repos/extra-i686/jre7-openjdk.profile (from rev 226334, java7-openjdk/repos/extra-i686/jre7-openjdk.profile)
===================================================================
--- extra-i686/jre7-openjdk.profile (rev 0)
+++ extra-i686/jre7-openjdk.profile 2014-11-16 20:53:16 UTC (rev 226336)
@@ -0,0 +1,4 @@
+export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre}
+
+# Enable this for non-reparenting window managers
+#export _JAVA_AWT_WM_NONREPARENTING=1
Copied: java7-openjdk/repos/extra-i686/jre7-openjdk.profile.csh (from rev 226334, java7-openjdk/repos/extra-i686/jre7-openjdk.profile.csh)
===================================================================
--- extra-i686/jre7-openjdk.profile.csh (rev 0)
+++ extra-i686/jre7-openjdk.profile.csh 2014-11-16 20:53:16 UTC (rev 226336)
@@ -0,0 +1,4 @@
+setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre"
+
+# Enable this for non-reparenting window managers
+#setenv _JAVA_AWT_WM_NONREPARENTING 1
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-11-16 20:37:21 UTC (rev 226335)
+++ extra-x86_64/PKGBUILD 2014-11-16 20:53:16 UTC (rev 226336)
@@ -14,7 +14,7 @@
_bootstrap=0 # 0/1 for quick build or full bootstrap
pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver}
-pkgrel=2
+pkgrel=1
arch=('i686' 'x86_64')
url='http://icedtea.classpath.org'
license=('custom')
@@ -116,7 +116,7 @@
package_jre7-openjdk-headless() {
pkgdesc='OpenJDK Java 7 headless runtime environment'
- depends=('java-runtime-common' 'libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-utils')
+ 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')
@@ -178,7 +178,7 @@
done
popd
- # Link JKS keystore from ca-certificates-utils
+ # Link JKS keystore from ca-certificates-java
rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
@@ -199,7 +199,7 @@
package_jre7-openjdk() {
pkgdesc='OpenJDK Java 7 full runtime environment'
depends=("jre7-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme')
- optdepends=('icedtea-web: web browser plugin + Java Web Start'
+ optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
'alsa-lib: for basic sound support'
'giflib: for gif format support'
'libpulse: for advanced sound support'
Modified: extra-x86_64/jdk7-openjdk.install
===================================================================
--- extra-x86_64/jdk7-openjdk.install 2014-11-16 20:37:21 UTC (rev 226335)
+++ extra-x86_64/jdk7-openjdk.install 2014-11-16 20:53:16 UTC (rev 226336)
@@ -25,7 +25,7 @@
esac
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/bin/update-ca-trust
+ /usr/bin/init-jks-keystore
fi
}
@@ -36,7 +36,7 @@
fi
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/bin/update-ca-trust
+ /usr/bin/init-jks-keystore
fi
}
Copied: java7-openjdk/repos/extra-x86_64/jdk7-openjdk.profile (from rev 226334, java7-openjdk/repos/extra-x86_64/jdk7-openjdk.profile)
===================================================================
--- extra-x86_64/jdk7-openjdk.profile (rev 0)
+++ extra-x86_64/jdk7-openjdk.profile 2014-11-16 20:53:16 UTC (rev 226336)
@@ -0,0 +1 @@
+export JAVA_HOME=/usr/lib/jvm/java-7-openjdk
Copied: java7-openjdk/repos/extra-x86_64/jdk7-openjdk.profile.csh (from rev 226334, java7-openjdk/repos/extra-x86_64/jdk7-openjdk.profile.csh)
===================================================================
--- extra-x86_64/jdk7-openjdk.profile.csh (rev 0)
+++ extra-x86_64/jdk7-openjdk.profile.csh 2014-11-16 20:53:16 UTC (rev 226336)
@@ -0,0 +1 @@
+setenv J2SDKDIR "/usr/lib/jvm/java-7-openjdk"
Modified: extra-x86_64/jre7-openjdk-headless.install
===================================================================
--- extra-x86_64/jre7-openjdk-headless.install 2014-11-16 20:37:21 UTC (rev 226335)
+++ extra-x86_64/jre7-openjdk-headless.install 2014-11-16 20:53:16 UTC (rev 226336)
@@ -25,7 +25,7 @@
esac
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/bin/update-ca-trust
+ /usr/bin/init-jks-keystore
fi
}
@@ -35,7 +35,7 @@
fi
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/bin/update-ca-trust
+ /usr/bin/init-jks-keystore
fi
}
Copied: java7-openjdk/repos/extra-x86_64/jre7-openjdk.profile (from rev 226334, java7-openjdk/repos/extra-x86_64/jre7-openjdk.profile)
===================================================================
--- extra-x86_64/jre7-openjdk.profile (rev 0)
+++ extra-x86_64/jre7-openjdk.profile 2014-11-16 20:53:16 UTC (rev 226336)
@@ -0,0 +1,4 @@
+export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre}
+
+# Enable this for non-reparenting window managers
+#export _JAVA_AWT_WM_NONREPARENTING=1
Copied: java7-openjdk/repos/extra-x86_64/jre7-openjdk.profile.csh (from rev 226334, java7-openjdk/repos/extra-x86_64/jre7-openjdk.profile.csh)
===================================================================
--- extra-x86_64/jre7-openjdk.profile.csh (rev 0)
+++ extra-x86_64/jre7-openjdk.profile.csh 2014-11-16 20:53:16 UTC (rev 226336)
@@ -0,0 +1,4 @@
+setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre"
+
+# Enable this for non-reparenting window managers
+#setenv _JAVA_AWT_WM_NONREPARENTING 1
More information about the arch-commits
mailing list