jdk: revert merge from 3.0

2013-01-25 22:50:22 +01:00 · 2013-01-25 22:50:22 +01:00 · 37b40a5b77
commit 37b40a5b77
parent 10737cd886
4 changed files with 156 additions and 76 deletions
--- a/jdk/.footprint
+++ b/jdk/.footprint
@ -85,6 +85,19 @@ drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/db/bin/
 drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/db/lib/
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derby.jar
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derby.war
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derbyLocale_cs.jar
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derbyLocale_de_DE.jar
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derbyLocale_es.jar
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derbyLocale_fr.jar
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derbyLocale_hu.jar
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derbyLocale_it.jar
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derbyLocale_ja_JP.jar
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derbyLocale_ko_KR.jar
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derbyLocale_pl.jar
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derbyLocale_pt_BR.jar
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derbyLocale_ru.jar
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derbyLocale_zh_CN.jar
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derbyLocale_zh_TW.jar
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derbyclient.jar
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derbynet.jar
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/db/lib/derbyrun.jar
@ -117,70 +130,6 @@ lrwxrwxrwx	root/root	usr/lib/jdk1.7.0_11/jre/bin/ControlPanel -> jcontrol
 -rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/bin/unpack200
 drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/
 -rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/alt-rt.jar
-drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/
-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/fxavcodecplugin-52.so
-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/fxavcodecplugin-53.so
-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/fxplugins.so
-drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/headless/
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/headless/libmawt.so
-drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/jli/
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/jli/libjli.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/jvm.cfg
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libJdbcOdbc.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libattach.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libawt.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libdcpr.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libdeploy.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libdt_socket.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libfontmanager.so
-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libglass.so
-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libgstplugins-lite.so
-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libgstreamer-lite.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libhprof.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libinstrument.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libj2gss.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libj2pcsc.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libj2pkcs11.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libjaas_unix.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libjava.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libjava_crw_demo.so
-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libjavafx-font.so
-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libjavafx-iio.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libjavaplugin_jni.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libjawt.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libjdwp.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libjfr.so
-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libjfxmedia.so
-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libjfxwebkit.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libjpeg.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libjsdt.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libjsig.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libjsound.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libjsoundalsa.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libkcms.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libmanagement.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libmlib_image.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libnet.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libnio.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libnpjp2.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libnpt.so
-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libprism-es2.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/librmi.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libsaproc.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libsctp.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libsplashscreen.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libsunec.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libt2k.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libunpack.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libverify.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/libzip.so
-drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/server/
-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/server/Xusage.txt
-r--r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/server/classes.jsa
-lrwxrwxrwx	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/server/libjsig.so -> ../libjsig.so
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/server/libjvm.so
-drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/xawt/
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/amd64/xawt/libmawt.so
 drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/applet/
 -rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/calendars.properties
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/charsets.jar
@ -193,13 +142,24 @@ drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/cmm/
 -r--r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/cmm/sRGB.pf
 -rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/content-types.properties
 -r-xr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/currency.data
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy.jar
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy.jar
 drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/MixedCodeMainDialog.ui
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/cautionshield.icns
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/ffjcext.zip
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/java-icon.ico
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/messages.properties
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/messages_de.properties
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/messages_es.properties
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/messages_fr.properties
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/messages_it.properties
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/messages_ja.properties
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/messages_ko.properties
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/messages_pt_BR.properties
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/messages_sv.properties
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/messages_zh_CN.properties
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/messages_zh_HK.properties
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/messages_zh_TW.properties
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/mixcode_s.png
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/deploy/splash.gif
 drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/desktop/
@ -309,6 +269,78 @@ drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/fonts/
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/fonts/LucidaTypewriterBold.ttf
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/fonts/LucidaTypewriterRegular.ttf
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/fonts/fonts.dir
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/client/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/client/Xusage.txt
+-r--r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/client/classes.jsa
+lrwxrwxrwx	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/client/libjsig.so -> ../libjsig.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/client/libjvm.so
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/fxavcodecplugin-52.so
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/fxavcodecplugin-53.so
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/fxplugins.so
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/headless/
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/headless/libmawt.so
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/jli/
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/jli/libjli.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/jvm.cfg
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libJdbcOdbc.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libattach.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libawt.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libdcpr.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libdeploy.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libdt_socket.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libfontmanager.so
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libglass.so
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libgstplugins-lite.so
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libgstreamer-lite.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libhprof.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libinstrument.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libj2gss.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libj2pcsc.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libj2pkcs11.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjaas_unix.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjava.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjava_crw_demo.so
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjavafx-font.so
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjavafx-iio.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjavaplugin_jni.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjavaplugin_nscp.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjavaplugin_nscp_gcc29.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjavaplugin_oji.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjawt.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjdwp.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjfr.so
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjfxmedia.so
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjfxwebkit.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjpeg.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjsdt.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjsig.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjsound.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libjsoundalsa.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libkcms.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libmanagement.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libmlib_image.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libnet.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libnio.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libnpjp2.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libnpt.so
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libprism-es2.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/librmi.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libsaproc.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libsctp.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libsplashscreen.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libsunec.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libt2k.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libunpack.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libverify.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/libzip.so
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/server/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/server/Xusage.txt
+-r--r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/server/classes.jsa
+lrwxrwxrwx	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/server/libjsig.so -> ../libjsig.so
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/server/libjvm.so
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/xawt/
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/i386/xawt/libmawt.so
 drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/images/
 drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/images/cursors/
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/images/cursors/cursors.properties
@ -325,13 +357,56 @@ drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/images/icons/
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/images/icons/sun-java_HighContrastInverse.png
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/images/icons/sun-java_LowContrast.png
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/javafx.properties
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/javaws.jar
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/javaws.jar
 -rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/jce.jar
 -rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/jexec
 -rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/jfr.jar
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/jfxrt.jar
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/jsse.jar
 -rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/jvm.hprof.txt
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/de/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/de/LC_MESSAGES/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/es/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/es/LC_MESSAGES/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/fr/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/fr/LC_MESSAGES/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/it/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/it/LC_MESSAGES/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/ja/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/ja/LC_MESSAGES/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/ko.UTF-8/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/ko.UTF-8/LC_MESSAGES/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/ko/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/ko/LC_MESSAGES/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/pt_BR/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/pt_BR/LC_MESSAGES/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/pt_BR/LC_MESSAGES/sunw_java_plugin.mo
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/sv/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/sv/LC_MESSAGES/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/zh.GBK/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/zh.GBK/LC_MESSAGES/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/zh/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/zh/LC_MESSAGES/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/zh_HK.BIG5HK/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/sunw_java_plugin.mo
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/zh_TW.BIG5/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/zh_TW/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/zh_TW/LC_MESSAGES/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
 -rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/logging.properties
 -rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/management-agent.jar
 drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/management/
@ -347,7 +422,7 @@ drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/oblique-fonts/
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/oblique-fonts/LucidaTypewriterBoldOblique.ttf
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/oblique-fonts/LucidaTypewriterOblique.ttf
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/oblique-fonts/fonts.dir
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/plugin.jar
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/lib/plugin.jar
 -rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/psfont.properties.ja
 -rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/psfontj2d.properties
 -rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/lib/resources.jar
@ -839,6 +914,9 @@ drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/plugin/
 drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/plugin/desktop/
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/plugin/desktop/sun_java.desktop
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/plugin/desktop/sun_java.png
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/plugin/i386/
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/jre/plugin/i386/ns7/
+-rw-r--r--	root/root	usr/lib/jdk1.7.0_11/jre/plugin/i386/ns7/libjavaplugin_oji.so
 drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/lib/
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/lib/ant-javafx.jar
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/lib/ct.sym
@ -1160,11 +1238,11 @@ drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/lib/visualvm/profiler/config/Modules/
 drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/lib/visualvm/profiler/lib/
 drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/lib/visualvm/profiler/lib/deployed/
 drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/lib/visualvm/profiler/lib/deployed/jdk15/
-drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/lib/visualvm/profiler/lib/deployed/jdk15/linux-amd64/
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/lib/visualvm/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/lib/visualvm/profiler/lib/deployed/jdk15/linux/
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/lib/visualvm/profiler/lib/deployed/jdk15/linux/libprofilerinterface.so
 drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/lib/visualvm/profiler/lib/deployed/jdk16/
-drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/lib/visualvm/profiler/lib/deployed/jdk16/linux-amd64/
-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/lib/visualvm/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so
+drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/lib/visualvm/profiler/lib/deployed/jdk16/linux/
+-rwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/lib/visualvm/profiler/lib/deployed/jdk16/linux/libprofilerinterface.so
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/lib/visualvm/profiler/lib/jfluid-server-15.jar
 -rw-r--r--	root/root	usr/lib/jdk1.7.0_11/lib/visualvm/profiler/lib/jfluid-server.jar
 drwxr-xr-x	root/root	usr/lib/jdk1.7.0_11/lib/visualvm/profiler/lib/locale/
--- a/jdk/.md5sum
+++ b/jdk/.md5sum
@ -1 +1 @@
-d8f65419fa65f179382ae310237fd1f4  jdk-7u11-linux-x64.tar.gz
+22239a786477a7d21bc8a835455ca24a  jdk-7u11-linux-i586.tar.gz
--- a/jdk/Pkgfile
+++ b/jdk/Pkgfile
@ -1,17 +1,18 @@
 # Description: Java 2 Software Development Kit
 # URL: http://java.sun.com
 # Maintainer: Jose V Beneyto, sepen at crux dot nu
-# Arch Maintainer: Predrag Ivanovic, predivan at open dot telekom dot rs
 # Packager: Simone Rota, sip at crux dot nu

 name=jdk
 version=1.7.0_11
 release=1
-source=(file:///$name-7u11-linux-x64.tar.gz)
+source=(file:///$name-7u11-linux-i586.tar.gz)

 build(){
-	rm -rf $SRC/jdk*/{man/ja,jre/lib/{locale,deploy/messages_},db/lib/derbyLocale*}*
+	rm -rf $SRC/jdk*/{man/ja,jre/lib/javaws/messages_,demo,sample}*
 	rm -rf $SRC/jdk*/jre/lib/fontconfig.{RedHat,SuSE,Sun,Turbo}.*
+	rm -rf $SRC/jdk*/jre/plugin/i386/ns7-gcc29
+	rm -rf $SRC/jdk*/jre/.systemPrefs
 	rm -rf $SRC/jdk*/{,jre/}[A-Z]*

 	install -d $PKG/usr/lib
--- a/jdk/README
+++ b/jdk/README
@ -4,7 +4,8 @@ REQUIREMENTS

   Download the Java SE Development Kit (JDK) from
   - http://www.oracle.com/technetwork/java/javase/downloads/index.html
+
   and put the file
-   -  jdk-7u*-linux-x64.tar.gz
+   -  jdk-7u*-linux-i586.tar.gz

   into the directory defined by PKGMK_SOURCE_DIR. See pkgmk.conf(5).