[libjogl2-java] 09/58: Imported Debian patch 2.0-rc3-1

Tony Mancill tmancill at moszumanska.debian.org
Thu Sep 4 03:59:08 UTC 2014


This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository libjogl2-java.

commit 3f7b5c5c7506b1359db04c0059a14b15d2c077f4
Merge: 1507fe2 02cd93d
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Thu Oct 6 15:53:38 2011 +0200

    Imported Debian patch 2.0-rc3-1

 .classpath                                         |    2 +
 .externalToolBuilders/jogl builder.launch          |   12 +-
 .gitignore                                         |    6 -
 .htaccess                                          |    7 -
 .project                                           |    6 +-
 LICENSE.txt                                        |  150 +-
 README.txt                                         |   26 +-
 REPOSITORIES.txt                                   |    6 +-
 debian/changelog                                   |   11 +
 debian/control                                     |  511 ++--
 debian/libjogl-java-doc.docs                       |    2 -
 debian/libjogl2-awt-java.install                   |    3 -
 debian/libjogl2-awt-jni.install                    |    1 -
 debian/libjogl2-awt-newt-java.install              |    1 -
 debian/libjogl2-core-java.install                  |    4 -
 debian/libjogl2-core-newt-java.install             |    2 -
 debian/libjogl2-core-newt-jni.install              |    1 -
 debian/libjogl2-desktop-gl2es12-jni.install        |    1 -
 debian/libjogl2-desktop-java.install               |    1 -
 debian/libjogl2-desktop-jni.install                |    1 -
 debian/libjogl2-es-common-java.install             |    1 -
 debian/libjogl2-es1-java.install                   |    1 -
 debian/libjogl2-es1-jni.install                    |    1 -
 debian/libjogl2-es2-java.install                   |    1 -
 debian/libjogl2-es2-jni.install                    |    1 -
 debian/libjogl2-glu-java.install                   |    3 -
 debian/libjogl2-java-doc.docs                      |    1 +
 debian/libjogl2-java.install                       |    1 +
 debian/libjogl2-jni.install                        |    6 +
 debian/libjogl2-platform-java.install              |    2 -
 debian/libjogl2-platform-jni.install               |    1 -
 debian/libjogl2-platform-newt-java.install         |    1 -
 debian/orig-tar.sh                                 |   19 +-
 debian/patches/disable_android.diff                |   37 +
 debian/patches/otherArchsoswin.diff                |   20 +-
 debian/patches/series                              |    3 +-
 debian/patches/swt.diff                            |    9 +-
 debian/patches/variousFixes.diff                   |   44 +-
 debian/rules                                       |    8 +-
 doc/HowToBuild.html                                |   10 +-
 doc/Implementation/runtime-properties.txt          |   22 +-
 doc/NEWT-Overview.html                             |  181 ++
 doc/NewUI-Req01.txt                                |   66 +
 doc/Overview-OpenGL-Evolution-And-JOGL.html        |  212 ++
 doc/TODO.txt                                       |    2 -
 doc/curve/alt-algorithm-rsantina-01.pdf            |  Bin 0 -> 52435 bytes
 doc/deployment/JOGL-DEPLOYMENT.html                |  205 +-
 doc/licenses/Apache.LICENSE-1.1                    |   58 +
 doc/licenses/Apache.LICENSE-2.0                    |  202 ++
 doc/licenses/SGIFreeSWLicB.2.0.pdf                 |  Bin 0 -> 61086 bytes
 doc/licenses/ubuntu-font-licence-1.0.txt           |   96 +
 etc/profile.jogl                                   |   80 +-
 jnlp-files/applet-version-jnlp.html                |   41 -
 jnlp-files/applet-version-lancheronly.html         |   39 -
 jnlp-files/applet-version.jnlp                     |   24 -
 jnlp-files/application-version.jnlp                |   19 -
 jnlp-files/atomic/jogl-awt.jnlp                    |   98 +
 jnlp-files/atomic/jogl-noawt.jnlp                  |   96 +
 jnlp-files/atomic/nativewindow-awt.jnlp            |   72 +
 jnlp-files/atomic/nativewindow-noawt.jnlp          |   83 +
 jnlp-files/atomic/newt-awt-jogl.jnlp               |   89 +
 jnlp-files/atomic/newt-awt.jnlp                    |   86 +
 jnlp-files/atomic/newt-noawt-jogl.jnlp             |   88 +
 jnlp-files/atomic/newt-noawt.jnlp                  |   85 +
 jnlp-files/javaws-version.jnlp                     |   19 -
 jnlp-files/jogl-all-awt.jnlp                       |   39 +-
 jnlp-files/jogl-all-mobile.jnlp                    |   72 +
 jnlp-files/jogl-all-noawt.jnlp                     |   39 +-
 ...nner-newt-ElektronenMultiplizierer-napplet.html |   67 +
 ...pplet-runner-newt-ElektronenMultiplizierer.html |   84 +
 ...applet-runner-newt-GraphTextDemo01-napplet.html |   68 +
 .../jogl-applet-runner-newt-GraphTextDemo01.html   |   86 +
 ...let-runner-newt-GraphUISceneDemo01-napplet.html |   69 +
 ...jogl-applet-runner-newt-GraphUISceneDemo01.html |   87 +
 ...plet-runner-newt-gears-normal-launcheronly.html |  147 ++
 ...gl-applet-runner-newt-gears-normal-napplet.html |  107 +
 .../jogl-applet-runner-newt-gears-normal.html      |  196 ++
 ...l-applet-runner-newt-gears-special-napplet.html |   71 +
 .../jogl-applet-runner-newt-gears-special.html     |   89 +
 jnlp-files/jogl-applet-runner-newt.jnlp            |   26 +
 jnlp-files/jogl-applet-version-lancheronly.html    |   56 +
 jnlp-files/jogl-applet-version-napplet.html        |   61 +
 jnlp-files/jogl-applet-version.html                |   59 +
 jnlp-files/jogl-applet-version.jnlp                |   24 +
 jnlp-files/jogl-application-version.jnlp           |   19 +
 jnlp-files/jogl-awt.jnlp                           |   24 -
 jnlp-files/jogl-core.jnlp                          |   68 -
 jnlp-files/jogl-javaws-version.jnlp                |   19 +
 jnlp-files/jogl-test-applets.html                  |  199 ++
 jnlp-files/nativewindow-all-awt.jnlp               |   65 -
 jnlp-files/nativewindow-awt.jnlp                   |   22 -
 jnlp-files/nativewindow.jnlp                       |   77 -
 jnlp-files/newt-all-awt.jnlp                       |   65 -
 jnlp-files/newt-all-noawt.jnlp                     |   65 -
 jnlp-files/newt-awt.jnlp                           |   22 -
 jnlp-files/newt-jogl.jnlp                          |   22 -
 jnlp-files/newt.jnlp                               |   79 -
 make/README-zip-bundles.txt                        |    8 +
 make/build-common.xml                              |  350 ++-
 make/build-jogl.xml                                |  390 ++-
 make/build-nativewindow.xml                        |  130 +-
 make/build-newt.xml                                |  281 +--
 make/build-test.xml                                |   42 +-
 make/build.xml                                     |  212 +-
 make/config/intptr.cfg                             |   17 -
 make/config/jogl/cg-common.cfg                     |    1 +
 make/config/jogl/cgl-macosx.cfg                    |    1 +
 make/config/jogl/cglext.cfg                        |    3 +-
 make/config/jogl/egl.cfg                           |    5 +-
 make/config/jogl/eglext.cfg                        |    5 +-
 make/config/jogl/gl-common.cfg                     |   23 +-
 make/config/jogl/gl-es1.cfg                        |    3 +-
 make/config/jogl/gl-es2.cfg                        |    3 +-
 make/config/jogl/gl-gl4bc.cfg                      |    6 +-
 make/config/jogl/gl-headers.cfg                    |    4 +-
 make/config/jogl/gl-if-CustomJavaCode-gl.java      |   19 +-
 make/config/jogl/gl-if-gl2.cfg                     |    1 -
 make/config/jogl/gl-if-gl3.cfg                     |    1 -
 make/config/jogl/gl-if-gl3bc.cfg                   |    1 -
 make/config/jogl/gl-if-gl4.cfg                     |    1 -
 .../config/jogl/gl-impl-CustomJavaCode-common.java |    6 +-
 .../jogl/gl-impl-CustomJavaCode-desktop.java       |   83 +-
 .../jogl/gl-impl-CustomJavaCode-embedded.java      |   41 +-
 .../jogl/gl-impl-CustomJavaCode-gl2_es2.java       |    8 +-
 make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java |  116 +-
 make/config/jogl/gl-impl-CustomJavaCode-gles1.java |   82 +-
 make/config/jogl/gl-impl-CustomJavaCode-gles2.java |   64 +-
 make/config/jogl/gl2_es2-common.cfg                |   10 +-
 make/config/jogl/gl3-headers.cfg                   |    3 +-
 make/config/jogl/gl3ext-headers.cfg                |    1 +
 make/config/jogl/glu-gl2.cfg                       |    5 +-
 make/config/jogl/glxext.cfg                        |    1 -
 make/config/jogl/wgl-win32.cfg                     |    3 +-
 make/config/jogl/wglext.cfg                        |    1 -
 make/config/nativewindow/jawt-win32.cfg            |    3 +-
 make/config/nativewindow/jawt-x11.cfg              |    3 +-
 make/config/nativewindow/win32-CustomJavaCode.java |    2 +
 make/config/nativewindow/win32-lib.cfg             |    8 +-
 make/config/nativewindow/x11-lib.cfg               |    6 +-
 make/joglversion                                   |    1 +
 make/lib/gluegen.compiler.intelgdl.xml             |   43 -
 make/lib/swt/LICENSE.txt                           |   16 -
 make/lib/swt/README.txt                            |    1 -
 make/lib/swt/cocoa-macosx-x86_64/about.html        |  205 --
 .../swt/cocoa-macosx-x86_64/about_files/IJG_README |  385 ---
 .../cocoa-macosx-x86_64/about_files/mpl-v11.txt    |  470 ----
 make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar     |  Bin 2110655 -> 0 bytes
 make/lib/swt/cocoa-macosx/about.html               |  218 --
 make/lib/swt/cocoa-macosx/about_files/IJG_README   |  385 ---
 make/lib/swt/cocoa-macosx/about_files/mpl-v11.txt  |  470 ----
 make/lib/swt/cocoa-macosx/swt-debug.jar            |  Bin 2197872 -> 0 bytes
 make/lib/swt/epl-v10.html                          |  261 --
 make/lib/swt/gtk-linux-x86/about.html              |  301 ---
 make/lib/swt/gtk-linux-x86/about_files/IJG_README  |  385 ---
 .../swt/gtk-linux-x86/about_files/about_cairo.html |   48 -
 .../lib/swt/gtk-linux-x86/about_files/lgpl-v21.txt |  506 ----
 make/lib/swt/gtk-linux-x86/about_files/mpl-v11.txt |  470 ----
 .../gtk-linux-x86/about_files/pixman-licenses.txt  |   92 -
 .../swt/gtk-linux-x86/about_files/webkit-bsd.txt   |   20 -
 make/lib/swt/gtk-linux-x86/swt-debug.jar           |  Bin 2097107 -> 0 bytes
 make/lib/swt/gtk-linux-x86_64/about.html           |  301 ---
 .../swt/gtk-linux-x86_64/about_files/IJG_README    |  385 ---
 .../gtk-linux-x86_64/about_files/about_cairo.html  |   48 -
 .../swt/gtk-linux-x86_64/about_files/lgpl-v21.txt  |  506 ----
 .../swt/gtk-linux-x86_64/about_files/mpl-v11.txt   |  470 ----
 .../about_files/pixman-licenses.txt                |   92 -
 .../gtk-linux-x86_64/about_files/webkit-bsd.txt    |   20 -
 make/lib/swt/gtk-linux-x86_64/swt-debug.jar        |  Bin 2259562 -> 0 bytes
 make/lib/swt/notice.html                           |  107 -
 make/lib/swt/win32-win32-x86/about.html            |  184 --
 .../lib/swt/win32-win32-x86/about_files/IJG_README |  385 ---
 .../swt/win32-win32-x86/about_files/mpl-v11.txt    |  470 ----
 make/lib/swt/win32-win32-x86/swt-debug.jar         |  Bin 2402240 -> 0 bytes
 make/lib/swt/win32-win32-x86_64/about.html         |  171 --
 .../swt/win32-win32-x86_64/about_files/IJG_README  |  385 ---
 .../swt/win32-win32-x86_64/about_files/mpl-v11.txt |  470 ----
 make/lib/swt/win32-win32-x86_64/swt-debug.jar      |  Bin 2425896 -> 0 bytes
 make/lib/wince/arm/nvap/libEGL.lib                 |  Bin 9314 -> 0 bytes
 make/lib/wince/arm/nvap/libGLESv1_CM.lib           |  Bin 32500 -> 0 bytes
 make/lib/wince/arm/nvap/libGLESv2.lib              |  Bin 30670 -> 0 bytes
 make/lib/wince/arm/nvap/libKD.lib                  |  Bin 34346 -> 0 bytes
 make/lib/wince/arm/nvap/libnvkdmain.lib            |  Bin 3036 -> 0 bytes
 make/lib/wince/arm/nvap/libnvomx.lib               |  Bin 5962 -> 0 bytes
 make/nativewindowversion                           |    1 +
 make/newtversion                                   |    1 +
 make/resources/android/AndroidManifest-jogl.xml    |   28 +
 .../resources/android/AndroidManifest-launcher.xml |  128 +
 make/resources/android/AndroidManifest-test.xml    |   17 +
 .../android/res-jogl/drawable-hdpi/icon.png        |  Bin 0 -> 2516 bytes
 .../android/res-jogl/drawable-ldpi/icon.png        |  Bin 0 -> 1172 bytes
 .../android/res-jogl/drawable-mdpi/icon.png        |  Bin 0 -> 1570 bytes
 make/resources/android/res-jogl/layout/main.xml    |   12 +
 make/resources/android/res-jogl/values/strings.xml |    8 +
 .../android/res-launcher/drawable-hdpi/icon.png    |  Bin 0 -> 2516 bytes
 .../android/res-launcher/drawable-ldpi/icon.png    |  Bin 0 -> 1172 bytes
 .../android/res-launcher/drawable-mdpi/icon.png    |  Bin 0 -> 1570 bytes
 .../resources/android/res-launcher/layout/main.xml |   12 +
 .../android/res-launcher/values/colors.xml         |    6 +
 .../android/res-launcher/values/strings.xml        |   22 +
 .../android/res-launcher/values/styles.xml         |   20 +
 make/scripts/adb-install-all.sh                    |    4 +
 make/scripts/adb-reinstall-all.sh                  |    4 +
 make/scripts/adb-uninstall-all.sh                  |    4 +
 make/scripts/clean-graph.sh                        |    3 +
 make/scripts/clean-tests.sh                        |    5 +
 make/scripts/crosstest-java-android-armv7-rel.sh   |   69 +
 make/scripts/crosstest-java-linux-armv7-rel.sh     |   60 +
 make/scripts/crosstest-launch-android-activity.sh  |   17 +
 make/scripts/eglestest-java-linux.sh               |   44 +
 make/scripts/java-win32-dbg.bat                    |    8 +-
 make/scripts/java-win32.bat                        |    8 +-
 make/scripts/java-win64-dbg.bat                    |   12 +-
 make/scripts/java-win64.bat                        |    6 +-
 make/scripts/lstjars.sh                            |   78 +-
 make/scripts/make.jogl.all.android-armv7-cross.sh  |  112 +
 make/scripts/make.jogl.all.linux-armv7-cross.sh    |   41 +
 make/scripts/make.jogl.all.linux-x86.sh            |   29 +-
 make/scripts/make.jogl.all.linux-x86_64.sh         |   23 +-
 make/scripts/make.jogl.all.macosx.sh               |    1 -
 make/scripts/make.jogl.all.win32.bat               |   11 +-
 make/scripts/make.jogl.all.win64.bat               |   11 +-
 make/scripts/make.jogl.doc.all.x86_64.sh           |    7 +-
 make/scripts/make.jogl.doc.x86_64.sh               |    7 +-
 make/scripts/setenv-jogl.sh                        |    5 +-
 make/scripts/tests-armv7l_eabi.sh                  |    7 +
 make/scripts/tests-javaws-x64.bat                  |    2 +-
 make/scripts/tests-x32.bat                         |   11 +-
 make/scripts/tests-x32.sh                          |    8 +-
 make/scripts/tests-x64.bat                         |   42 +-
 make/scripts/tests-x64.sh                          |    7 +-
 make/scripts/tests.sh                              |  145 +-
 make/stub_includes/egl/EGL/eglplatform.h           |    2 +-
 make/stub_includes/gluegen/gluegen_types.h         |   44 -
 make/stub_includes/gluegen/inttypes.h              |    7 -
 make/stub_includes/gluegen/stdarg.h                |    7 -
 make/stub_includes/gluegen/stddef.h                |    6 -
 make/stub_includes/gluegen/stdint.h                |    7 -
 make/stub_includes/jni/classfile_constants.h       |  523 ----
 make/stub_includes/jni/jawt.h                      |  214 +-
 make/stub_includes/jni/jdwpTransport.h             |  237 --
 make/stub_includes/jni/jni.h                       |   75 +-
 make/stub_includes/jni/jvmti.h                     | 2504 --------------------
 make/stub_includes/jni/macosx/AWTCocoaComponent.h  |   15 -
 make/stub_includes/jni/macosx/JDWP.h               |   53 -
 make/stub_includes/jni/macosx/JDWPCommands.h       |  238 --
 make/stub_includes/jni/macosx/jni_md.h             |   23 +-
 make/stub_includes/jni/macosx/jvmdi.h              | 1012 --------
 make/stub_includes/jni/macosx/jvmpi.h              |  642 -----
 make/stub_includes/jni/win32/jawt_md.h             |   32 +-
 make/stub_includes/jni/win32/jni_md.h              |   23 +-
 make/stub_includes/jni/x11/jawt_md.h               |   29 +-
 make/stub_includes/jni/x11/jni_md.h                |   23 +-
 make/stub_includes/khr/KHR/khrplatform.h           |  104 +-
 make/stub_includes/macosx/OpenGL/OpenGL.h          |    3 +-
 make/stub_includes/opengl/macosx-window-system.h   |    1 +
 make/stub_includes/win32/WindowsDWM.h              |   33 +
 make/stub_includes/win32/window-lib.c              |    1 +
 make/stub_includes/win32/windows.h                 |    2 +
 make/stub_includes/x11/X11/extensions/Xrender.h    |   42 +
 make/stub_includes/x11/window-lib.c                |    4 +
 make/versions.xml                                  |    1 +
 nbproject/.gitignore                               |    1 -
 .../jogamp/android/launcher/ClassLoaderUtil.java   |  121 +
 .../android/launcher/LauncherTempFileCache.java    |  477 ++++
 .../android/launcher/NEWTLauncherActivity.java     |  254 ++
 .../launcher/NEWTLauncherElektronActivity.java     |   15 +
 .../launcher/NEWTLauncherGearsES1Activity.java     |   15 +
 .../launcher/NEWTLauncherGearsES2Activity.java     |   15 +
 .../NEWTLauncherGearsES2TransActivity.java         |   15 +
 .../launcher/NEWTLauncherGraphUI1pActivity.java    |   15 +
 .../launcher/NEWTLauncherGraphUI2pActivity.java    |   15 +
 .../launcher/NEWTLauncherRedSquareES1Activity.java |   15 +
 .../launcher/NEWTLauncherRedSquareES2Activity.java |   15 +
 .../gluegen/opengl/BuildComposablePipeline.java    |   19 +-
 .../com/jogamp/gluegen/opengl/GLEmitter.java       |    1 +
 .../gluegen/opengl/GLJavaMethodBindingEmitter.java |    1 +
 .../opengl/nativesig/NativeSignatureEmitter.java   |    1 +
 .../NativeSignatureJavaMethodBindingEmitter.java   |    1 +
 .../com/jogamp/graph/curve/OutlineShape.java       |  629 +++++
 .../classes/com/jogamp/graph/curve/Region.java     |  191 ++
 .../com/jogamp/graph/curve/opengl/GLRegion.java    |  127 +
 .../jogamp/graph/curve/opengl/RegionRenderer.java  |   83 +
 .../com/jogamp/graph/curve/opengl/RenderState.java |  111 +
 .../com/jogamp/graph/curve/opengl/Renderer.java    |  281 +++
 .../jogamp/graph/curve/opengl/TextRenderer.java    |  192 ++
 .../com/jogamp/graph/curve/tess/Triangulation.java |   44 +
 .../com/jogamp/graph/curve/tess/Triangulator.java  |   69 +
 src/jogl/classes/com/jogamp/graph/font/Font.java   |  106 +
 .../classes/com/jogamp/graph/font/FontFactory.java |   92 +
 .../classes/com/jogamp/graph/font/FontSet.java     |   60 +
 src/jogl/classes/com/jogamp/graph/geom/AABBox.java |  326 +++
 .../classes/com/jogamp/graph/geom/Outline.java     |  243 ++
 .../classes/com/jogamp/graph/geom/Triangle.java    |   79 +
 src/jogl/classes/com/jogamp/graph/geom/Vertex.java |   91 +
 .../com/jogamp/graph/geom/opengl/SVertex.java      |  174 ++
 .../classes/com/jogamp/graph/math/Quaternion.java  |  382 +++
 .../classes/com/jogamp/graph/math/VectorUtil.java  |  433 ++++
 src/jogl/classes/com/jogamp/graph/package.html     |   33 +
 .../classes/com/jogamp/opengl/JoglVersion.java     |    4 +-
 .../opengl/cg/CgDynamicLibraryBundleInfo.java      |   30 +-
 .../com/jogamp/opengl/util/AWTAnimatorImpl.java    |   26 +-
 .../classes/com/jogamp/opengl/util/Animator.java   |   16 +-
 .../com/jogamp/opengl/util/AnimatorBase.java       |   67 +-
 .../jogamp/opengl/util/DefaultAnimatorImpl.java    |    4 +-
 .../classes/com/jogamp/opengl/util/FBObject.java   |  457 +++-
 .../com/jogamp/opengl/util/FPSAnimator.java        |   29 +-
 .../classes/com/jogamp/opengl/util/FileUtil.java   |   89 -
 .../com/jogamp/opengl/util/GLArrayDataClient.java  |  296 ++-
 .../jogamp/opengl/util/GLArrayDataEditable.java    |   63 +-
 .../com/jogamp/opengl/util/GLArrayDataServer.java  |  332 ++-
 .../com/jogamp/opengl/util/GLArrayDataWrapper.java |  274 ++-
 .../com/jogamp/opengl/util/GLArrayHandler.java     |   11 -
 .../classes/com/jogamp/opengl/util/GLBuffers.java  |  412 +++-
 .../jogamp/opengl/util/GLFixedArrayHandler.java    |   65 -
 .../jogamp/opengl/util/GLPixelStorageModes.java    |  136 ++
 .../com/jogamp/opengl/util/GLReadBufferUtil.java   |  181 ++
 .../com/jogamp/opengl/util/ImmModeSink.java        |   64 +-
 .../classes/com/jogamp/opengl/util/Locator.java    |  137 --
 .../classes/com/jogamp/opengl/util/PMVMatrix.java  |  202 +-
 .../classes/com/jogamp/opengl/util/StreamUtil.java |   98 -
 .../com/jogamp/opengl/util/awt/Overlay.java        |    1 -
 .../com/jogamp/opengl/util/awt/Screenshot.java     |   69 +-
 .../com/jogamp/opengl/util/awt/TextRenderer.java   |    4 +-
 .../jogamp/opengl/util/awt/TextureRenderer.java    |   29 +-
 .../classes/com/jogamp/opengl/util/gl2/GLUT.java   |    8 +-
 .../jogamp/opengl/util/glsl/GLSLArrayHandler.java  |   85 -
 .../com/jogamp/opengl/util/glsl/ShaderCode.java    |   99 +-
 .../com/jogamp/opengl/util/glsl/ShaderProgram.java |  215 +-
 .../com/jogamp/opengl/util/glsl/ShaderState.java   | 1004 +++++---
 .../com/jogamp/opengl/util/glsl/ShaderUtil.java    |   44 +-
 .../opengl/util/glsl/fixedfunc/FixedFuncUtil.java  |   28 +-
 .../jogamp/opengl/util/glsl/sdk/CompileShader.java |    6 +-
 .../com/jogamp/opengl/util/texture/Texture.java    |  198 +-
 .../jogamp/opengl/util/texture/TextureData.java    |    7 +-
 .../com/jogamp/opengl/util/texture/TextureIO.java  |  125 +-
 .../opengl/util/texture/spi/LEDataInputStream.java |   92 +-
 .../util/texture/spi/NetPbmTextureWriter.java      |   13 +-
 .../jogamp/opengl/util/texture/spi/SGIImage.java   |   10 +-
 .../util/texture/spi/awt/IIOTextureWriter.java     |    8 +-
 .../media/opengl/DefaultGLCapabilitiesChooser.java |   39 +-
 .../classes/javax/media/opengl/FPSCounter.java     |  117 +
 .../javax/media/opengl/GLAnimatorControl.java      |   42 +-
 .../classes/javax/media/opengl/GLArrayData.java    |   50 +-
 .../classes/javax/media/opengl/GLAutoDrawable.java |   23 +-
 src/jogl/classes/javax/media/opengl/GLBase.java    |    7 +
 .../classes/javax/media/opengl/GLCapabilities.java |   55 +-
 .../media/opengl/GLCapabilitiesImmutable.java      |    8 +-
 src/jogl/classes/javax/media/opengl/GLContext.java |  245 +-
 .../javax/media/opengl/GLDebugListener.java        |   44 +
 .../classes/javax/media/opengl/GLDebugMessage.java |  248 ++
 .../javax/media/opengl/GLDrawableFactory.java      |   67 +-
 .../javax/media/opengl/GLPipelineFactory.java      |   29 +-
 src/jogl/classes/javax/media/opengl/GLProfile.java |  496 ++--
 .../classes/javax/media/opengl/GLRunnable.java     |    6 +-
 .../classes/javax/media/opengl/GLUniformData.java  |   14 +-
 .../classes/javax/media/opengl/awt/GLCanvas.java   |   65 +-
 .../classes/javax/media/opengl/awt/GLJPanel.java   |   39 +-
 .../media/opengl/fixedfunc/GLLightingFunc.java     |   29 +-
 .../javax/media/opengl/fixedfunc/GLMatrixFunc.java |   25 +
 .../media/opengl/fixedfunc/GLPointerFunc.java      |   27 +-
 .../media/opengl/fixedfunc/GLPointerFuncUtil.java  |   55 +
 .../jogamp/graph/curve/opengl/RegionFactory.java   |   74 +
 .../graph/curve/opengl/RegionRendererImpl01.java   |   93 +
 .../jogamp/graph/curve/opengl/RenderStateImpl.java |   74 +
 .../graph/curve/opengl/TextRendererImpl01.java     |   96 +
 .../jogamp/graph/curve/opengl/VBORegion2PES2.java  |  328 +++
 .../jogamp/graph/curve/opengl/VBORegionSPES2.java  |  160 ++
 .../graph/curve/opengl/shader/AttributeNames.java  |   45 +
 .../graph/curve/opengl/shader/UniformNames.java    |   10 +
 .../graph/curve/opengl/shader/attributes.glsl      |   11 +
 .../opengl/shader/curverenderer01-es2-merged.vp    |   19 +
 .../curve/opengl/shader/curverenderer01-es2.vp     |    9 +
 .../curve/opengl/shader/curverenderer01-gl2.vp     |    6 +
 .../curve/opengl/shader/curverenderer01-xxx.vp     |   12 +
 .../opengl/shader/curverenderer01a-es2-merged.fp   |   52 +
 .../curve/opengl/shader/curverenderer01a-es2.fp    |   13 +
 .../curve/opengl/shader/curverenderer01a-gl2.fp    |    6 +
 .../curve/opengl/shader/curverenderer01a-xxx.fp    |   42 +
 .../curve/opengl/shader/curverenderer01b-es2.fp    |   14 +
 .../curve/opengl/shader/curverenderer01b-gl2.fp    |    6 +
 .../curve/opengl/shader/curverenderer01b-xxx.fp    |   82 +
 .../curve/opengl/shader/curverenderer02a-es2.fp    |   14 +
 .../curve/opengl/shader/curverenderer02a-gl2.fp    |    6 +
 .../curve/opengl/shader/curverenderer02a-xxx.fp    |   48 +
 .../curve/opengl/shader/curverenderer02b-es2.fp    |   14 +
 .../curve/opengl/shader/curverenderer02b-gl2.fp    |    6 +
 .../curve/opengl/shader/curverenderer02b-xxx.fp    |   88 +
 .../jogamp/graph/curve/opengl/shader/uniforms.glsl |   22 +
 .../jogamp/graph/curve/opengl/shader/varyings.glsl |    9 +
 .../jogamp/graph/curve/tess/CDTriangulator2D.java  |  203 ++
 .../jogamp/graph/curve/tess/GraphOutline.java      |   72 +
 .../jogamp/graph/curve/tess/GraphVertex.java       |  123 +
 .../classes/jogamp/graph/curve/tess/HEdge.java     |  130 +
 src/jogl/classes/jogamp/graph/curve/tess/Loop.java |  332 +++
 .../jogamp/graph/curve/text/GlyphShape.java        |   99 +
 .../jogamp/graph/curve/text/GlyphString.java       |  206 ++
 .../classes/jogamp/graph/font/FontConstructor.java |   39 +
 src/jogl/classes/jogamp/graph/font/FontInt.java    |   53 +
 .../classes/jogamp/graph/font/JavaFontLoader.java  |  155 ++
 .../jogamp/graph/font/UbuntuFontLoader.java        |  139 ++
 .../graph/font/fonts/ubuntu/CONTRIBUTING.txt       |   21 +
 .../jogamp/graph/font/fonts/ubuntu/FONTLOG.txt     |  211 ++
 .../jogamp/graph/font/fonts/ubuntu/LICENCE-FAQ.txt |  177 ++
 .../jogamp/graph/font/fonts/ubuntu/LICENCE.txt     |   96 +
 .../jogamp/graph/font/fonts/ubuntu/README.txt      |   15 +
 .../jogamp/graph/font/fonts/ubuntu/TRADEMARKS.txt  |    4 +
 .../jogamp/graph/font/fonts/ubuntu/Ubuntu-B.ttf    |  Bin 0 -> 339320 bytes
 .../jogamp/graph/font/fonts/ubuntu/Ubuntu-BI.ttf   |  Bin 0 -> 362784 bytes
 .../jogamp/graph/font/fonts/ubuntu/Ubuntu-L.ttf    |  Bin 0 -> 421172 bytes
 .../jogamp/graph/font/fonts/ubuntu/Ubuntu-LI.ttf   |  Bin 0 -> 415424 bytes
 .../jogamp/graph/font/fonts/ubuntu/Ubuntu-M.ttf    |  Bin 0 -> 346940 bytes
 .../jogamp/graph/font/fonts/ubuntu/Ubuntu-MI.ttf   |  Bin 0 -> 372728 bytes
 .../jogamp/graph/font/fonts/ubuntu/Ubuntu-R.ttf    |  Bin 0 -> 359668 bytes
 .../jogamp/graph/font/fonts/ubuntu/Ubuntu-RI.ttf   |  Bin 0 -> 389744 bytes
 .../jogamp/graph/font/fonts/ubuntu/copyright.txt   |    5 +
 .../jogamp/graph/font/typecast/TypecastFont.java   |  296 +++
 .../font/typecast/TypecastFontConstructor.java     |   84 +
 .../jogamp/graph/font/typecast/TypecastGlyph.java  |  232 ++
 .../graph/font/typecast/TypecastHMetrics.java      |   84 +
 .../graph/font/typecast/TypecastRenderer.java      |  220 ++
 .../graph/font/typecast/ot/Disassembler.java       |  109 +
 .../jogamp/graph/font/typecast/ot/Fixed.java       |  852 +++++++
 .../jogamp/graph/font/typecast/ot/Mnemonic.java    |  397 ++++
 .../jogamp/graph/font/typecast/ot/OTFont.java      |  293 +++
 .../graph/font/typecast/ot/OTFontCollection.java   |  170 ++
 .../jogamp/graph/font/typecast/ot/OTGlyph.java     |  169 ++
 .../jogamp/graph/font/typecast/ot/Point.java       |   29 +
 .../graph/font/typecast/ot/mac/ResourceData.java   |   45 +
 .../graph/font/typecast/ot/mac/ResourceFile.java   |   77 +
 .../graph/font/typecast/ot/mac/ResourceHeader.java |   61 +
 .../graph/font/typecast/ot/mac/ResourceMap.java    |   83 +
 .../font/typecast/ot/mac/ResourceReference.java    |   81 +
 .../graph/font/typecast/ot/mac/ResourceType.java   |   82 +
 .../graph/font/typecast/ot/table/BaseTable.java    |  435 ++++
 .../font/typecast/ot/table/CffStandardStrings.java |  424 ++++
 .../graph/font/typecast/ot/table/CffTable.java     |  620 +++++
 .../graph/font/typecast/ot/table/Charstring.java   |   33 +
 .../font/typecast/ot/table/CharstringType2.java    |  235 ++
 .../graph/font/typecast/ot/table/ClassDef.java     |   33 +
 .../font/typecast/ot/table/ClassDefFormat1.java    |   39 +
 .../font/typecast/ot/table/ClassDefFormat2.java    |   37 +
 .../graph/font/typecast/ot/table/CmapFormat.java   |  134 ++
 .../graph/font/typecast/ot/table/CmapFormat0.java  |   92 +
 .../graph/font/typecast/ot/table/CmapFormat2.java  |  173 ++
 .../graph/font/typecast/ot/table/CmapFormat4.java  |  165 ++
 .../graph/font/typecast/ot/table/CmapFormat6.java  |   87 +
 .../font/typecast/ot/table/CmapFormatUnknown.java  |   54 +
 .../font/typecast/ot/table/CmapIndexEntry.java     |  117 +
 .../graph/font/typecast/ot/table/CmapTable.java    |  161 ++
 .../graph/font/typecast/ot/table/Coverage.java     |   83 +
 .../font/typecast/ot/table/CoverageFormat1.java    |   88 +
 .../font/typecast/ot/table/CoverageFormat2.java    |   89 +
 .../graph/font/typecast/ot/table/CvtTable.java     |   61 +
 .../graph/font/typecast/ot/table/Device.java       |   50 +
 .../font/typecast/ot/table/DirectoryEntry.java     |  115 +
 .../graph/font/typecast/ot/table/DsigEntry.java    |   43 +
 .../graph/font/typecast/ot/table/DsigTable.java    |   69 +
 .../graph/font/typecast/ot/table/Feature.java      |   85 +
 .../graph/font/typecast/ot/table/FeatureList.java  |  118 +
 .../font/typecast/ot/table/FeatureRecord.java      |   88 +
 .../graph/font/typecast/ot/table/FeatureTags.java  |   63 +
 .../graph/font/typecast/ot/table/FpgmTable.java    |   47 +
 .../graph/font/typecast/ot/table/GaspRange.java    |   45 +
 .../graph/font/typecast/ot/table/GaspTable.java    |   63 +
 .../font/typecast/ot/table/GlyfCompositeComp.java  |  200 ++
 .../typecast/ot/table/GlyfCompositeDescript.java   |  202 ++
 .../graph/font/typecast/ot/table/GlyfDescript.java |  124 +
 .../font/typecast/ot/table/GlyfSimpleDescript.java |  246 ++
 .../graph/font/typecast/ot/table/GlyfTable.java    |  132 ++
 .../font/typecast/ot/table/GlyphDescription.java   |   86 +
 .../graph/font/typecast/ot/table/GposTable.java    |   66 +
 .../graph/font/typecast/ot/table/GsubTable.java    |  181 ++
 .../graph/font/typecast/ot/table/HdmxTable.java    |  130 +
 .../graph/font/typecast/ot/table/HeadTable.java    |  206 ++
 .../graph/font/typecast/ot/table/HheaTable.java    |  136 ++
 .../graph/font/typecast/ot/table/HmtxTable.java    |  141 ++
 .../jogamp/graph/font/typecast/ot/table/ID.java    |  399 ++++
 .../graph/font/typecast/ot/table/KernSubtable.java |   49 +
 .../typecast/ot/table/KernSubtableFormat0.java     |   47 +
 .../typecast/ot/table/KernSubtableFormat2.java     |   42 +
 .../graph/font/typecast/ot/table/KernTable.java    |   62 +
 .../graph/font/typecast/ot/table/KerningPair.java  |   44 +
 .../graph/font/typecast/ot/table/LangSys.java      |  105 +
 .../font/typecast/ot/table/LangSysRecord.java      |   88 +
 .../graph/font/typecast/ot/table/Ligature.java     |   85 +
 .../graph/font/typecast/ot/table/LigatureSet.java  |   85 +
 .../font/typecast/ot/table/LigatureSubst.java      |   73 +
 .../typecast/ot/table/LigatureSubstFormat1.java    |   95 +
 .../graph/font/typecast/ot/table/LocaTable.java    |   77 +
 .../graph/font/typecast/ot/table/Lookup.java       |  110 +
 .../graph/font/typecast/ot/table/LookupList.java   |  108 +
 .../font/typecast/ot/table/LookupSubtable.java     |   60 +
 .../typecast/ot/table/LookupSubtableFactory.java   |   64 +
 .../graph/font/typecast/ot/table/LtshTable.java    |   68 +
 .../graph/font/typecast/ot/table/MaxpTable.java    |  163 ++
 .../graph/font/typecast/ot/table/NameRecord.java   |  146 ++
 .../graph/font/typecast/ot/table/NameTable.java    |  147 ++
 .../graph/font/typecast/ot/table/Os2Table.java     |  357 +++
 .../graph/font/typecast/ot/table/Panose.java       |   96 +
 .../graph/font/typecast/ot/table/PcltTable.java    |  105 +
 .../graph/font/typecast/ot/table/PostTable.java    |  423 ++++
 .../graph/font/typecast/ot/table/PrepTable.java    |   47 +
 .../graph/font/typecast/ot/table/Program.java      |   40 +
 .../graph/font/typecast/ot/table/RangeRecord.java  |   87 +
 .../graph/font/typecast/ot/table/Script.java       |  118 +
 .../graph/font/typecast/ot/table/ScriptList.java   |  115 +
 .../graph/font/typecast/ot/table/ScriptRecord.java |   88 +
 .../graph/font/typecast/ot/table/ScriptTags.java   |   61 +
 .../font/typecast/ot/table/SignatureBlock.java     |   46 +
 .../graph/font/typecast/ot/table/SingleSubst.java  |   81 +
 .../font/typecast/ot/table/SingleSubstFormat1.java |   92 +
 .../font/typecast/ot/table/SingleSubstFormat2.java |   97 +
 .../graph/font/typecast/ot/table/TTCHeader.java    |   59 +
 .../jogamp/graph/font/typecast/ot/table/Table.java |   69 +
 .../font/typecast/ot/table/TableDirectory.java     |  130 +
 .../font/typecast/ot/table/TableException.java     |   46 +
 .../graph/font/typecast/ot/table/TableFactory.java |  185 ++
 .../graph/font/typecast/ot/table/VdmxTable.java    |  197 ++
 .../graph/font/typecast/ot/table/VheaTable.java    |  148 ++
 .../graph/font/typecast/ot/table/VmtxTable.java    |  112 +
 .../graph/font/typecast/t2/T2Interpreter.java      | 1044 ++++++++
 .../jogamp/graph/font/typecast/t2/T2Mnemonic.java  |   86 +
 .../font/typecast/tt/engine/GraphicsState.java     |   50 +
 .../graph/font/typecast/tt/engine/Interpreter.java | 1357 +++++++++++
 .../graph/font/typecast/tt/engine/Parser.java      |  192 ++
 .../jogamp/graph/geom/plane/AffineTransform.java   |  580 +++++
 .../geom/plane/IllegalPathStateException.java      |   34 +
 .../plane/NoninvertibleTransformException.java     |   31 +
 .../classes/jogamp/graph/geom/plane/Path2D.java    |  431 ++++
 .../jogamp/graph/geom/plane/PathIterator.java      |   42 +
 src/jogl/classes/jogamp/graph/math/MathFloat.java  |   45 +
 .../classes/jogamp/graph/math/plane/Crossing.java  |  903 +++++++
 .../opengl/DesktopGLDynamicLibraryBundleInfo.java  |   18 +-
 .../opengl/DesktopGLDynamicLookupHelper.java       |    4 -
 .../jogamp/opengl/ExtensionAvailabilityCache.java  |   42 +-
 src/jogl/classes/jogamp/opengl/FPSCounterImpl.java |  137 ++
 .../classes/jogamp/opengl/GLBufferSizeTracker.java |   47 +-
 .../jogamp/opengl/GLBufferStateTracker.java        |   61 +-
 src/jogl/classes/jogamp/opengl/GLContextImpl.java  |  336 ++-
 src/jogl/classes/jogamp/opengl/GLContextLock.java  |  157 --
 .../jogamp/opengl/GLDebugMessageHandler.java       |  316 +++
 .../jogamp/opengl/GLDrawableFactoryImpl.java       |    7 +
 .../classes/jogamp/opengl/GLDrawableHelper.java    |   88 +-
 src/jogl/classes/jogamp/opengl/GLDrawableImpl.java |    1 -
 .../jogamp/opengl/GLDynamicLibraryBundleInfo.java  |    6 +-
 .../opengl/GLGraphicsConfigurationFactory.java     |    4 +-
 .../jogamp/opengl/GLGraphicsConfigurationUtil.java |   14 +
 src/jogl/classes/jogamp/opengl/GLPbufferImpl.java  |   22 +-
 src/jogl/classes/jogamp/opengl/GLRunnableTask.java |    8 +-
 src/jogl/classes/jogamp/opengl/GLStateTracker.java |  106 +-
 .../jogamp/opengl/ListenerSyncedImplStub.java      |   79 +
 src/jogl/classes/jogamp/opengl/MemoryObject.java   |   26 +-
 .../jogamp/opengl/SharedResourceRunner.java        |   73 +-
 .../classes/jogamp/opengl/awt/VersionApplet.java   |  168 ++
 src/jogl/classes/jogamp/opengl/egl/EGLContext.java |   60 +-
 .../classes/jogamp/opengl/egl/EGLDrawable.java     |   37 +-
 .../jogamp/opengl/egl/EGLDrawableFactory.java      |  110 +-
 .../opengl/egl/EGLDynamicLibraryBundleInfo.java    |   48 +-
 .../opengl/egl/EGLES1DynamicLibraryBundleInfo.java |   61 +-
 .../opengl/egl/EGLES2DynamicLibraryBundleInfo.java |   60 +-
 .../jogamp/opengl/egl/EGLExternalContext.java      |    2 +-
 .../jogamp/opengl/egl/EGLGLCapabilities.java       |   84 +-
 .../opengl/egl/EGLGraphicsConfiguration.java       |   99 +-
 .../egl/EGLGraphicsConfigurationFactory.java       |  148 +-
 .../jogamp/opengl/egl/EGLOnscreenDrawable.java     |    7 +-
 .../jogamp/opengl/egl/EGLPbufferDrawable.java      |    7 +-
 .../classes/jogamp/opengl/glu/GLUquadricImpl.java  |   16 +-
 .../opengl/glu/gl2/nurbs/GL2CurveEvaluator.java    |    8 +-
 .../opengl/glu/gl2/nurbs/GL2SurfaceEvaluator.java  |   12 +-
 .../opengl/glu/gl2/nurbs/GLUgl2nurbsImpl.java      |   12 +-
 .../jogamp/opengl/glu/nurbs/ArcSdirSorter.java     |    4 +-
 .../jogamp/opengl/glu/nurbs/ArcTdirSorter.java     |    4 +-
 .../jogamp/opengl/glu/nurbs/ArcTesselator.java     |    4 +-
 .../classes/jogamp/opengl/glu/nurbs/Backend.java   |    2 +-
 .../classes/jogamp/opengl/glu/nurbs/Curve.java     |   14 +-
 .../jogamp/opengl/glu/nurbs/DisplayList.java       |    2 +-
 .../classes/jogamp/opengl/glu/nurbs/Knotspec.java  |   10 +-
 .../jogamp/opengl/glu/nurbs/Knotvector.java        |    2 +-
 .../classes/jogamp/opengl/glu/nurbs/Mapdesc.java   |    6 +-
 .../classes/jogamp/opengl/glu/nurbs/Patch.java     |    2 +-
 .../classes/jogamp/opengl/glu/nurbs/Patchlist.java |   14 +-
 .../classes/jogamp/opengl/glu/nurbs/Quilt.java     |    4 +-
 .../classes/jogamp/opengl/glu/nurbs/README.txt     |  110 +-
 .../jogamp/opengl/glu/nurbs/Subdivider.java        |   52 +-
 .../opengl/glu/tessellator/ActiveRegion.java       |   14 +-
 .../jogamp/opengl/glu/tessellator/GLUface.java     |   14 +-
 .../jogamp/opengl/glu/tessellator/GLUhalfEdge.java |   16 +-
 .../jogamp/opengl/glu/tessellator/GLUmesh.java     |    8 +-
 .../opengl/glu/tessellator/GLUtessellatorImpl.java |   50 +-
 .../jogamp/opengl/glu/tessellator/GLUvertex.java   |   14 +-
 .../jogamp/opengl/glu/tessellator/Mesh.java        |    8 +-
 .../jogamp/opengl/glu/tessellator/Normal.java      |    4 +-
 .../opengl/glu/tessellator/PriorityQHeap.java      |    4 +-
 .../opengl/glu/tessellator/PriorityQSort.java      |    6 +-
 .../jogamp/opengl/glu/tessellator/Render.java      |    6 +-
 .../jogamp/opengl/glu/tessellator/Sweep.java       |   30 +-
 .../jogamp/opengl/macosx/cgl/MacOSXCGLContext.java |   50 +-
 .../macosx/cgl/MacOSXCGLDrawableFactory.java       |   13 +-
 .../cgl/MacOSXCGLDynamicLibraryBundleInfo.java     |   29 +-
 .../macosx/cgl/MacOSXExternalCGLContext.java       |    2 +-
 .../macosx/cgl/MacOSXOffscreenCGLContext.java      |    2 +-
 .../opengl/macosx/cgl/MacOSXPbufferCGLContext.java |    4 +-
 .../macosx/cgl/awt/MacOSXJava2DCGLContext.java     |    2 +-
 .../classes/jogamp/opengl/util/GLArrayHandler.java |   69 +
 .../opengl/util/GLArrayHandlerInterleaved.java     |   92 +
 .../jogamp/opengl/util/GLDataArrayHandler.java     |   78 +
 .../jogamp/opengl/util/GLFixedArrayHandler.java    |   98 +
 .../opengl/util/GLFixedArrayHandlerFlat.java       |   83 +
 .../jogamp/opengl/util/glsl/GLSLArrayHandler.java  |  115 +
 .../opengl/util/glsl/GLSLArrayHandlerFlat.java     |   72 +
 .../opengl/util/glsl/fixedfunc/FixedFuncHook.java  |   55 +-
 .../util/glsl/fixedfunc/FixedFuncPipeline.java     |  175 +-
 .../glsl/fixedfunc/shaders/FixedFuncColorLight.vp  |    4 +-
 .../util/glsl/fixedfunc/shaders/mgl_attribute.glsl |    2 +-
 .../util/glsl/fixedfunc/shaders/mgl_uniform.glsl   |    3 +-
 .../opengl/windows/wgl/WGLGLCapabilities.java      |   15 +-
 .../windows/wgl/WindowsExternalWGLContext.java     |    5 +-
 .../windows/wgl/WindowsExternalWGLDrawable.java    |    2 +-
 .../opengl/windows/wgl/WindowsWGLContext.java      |  146 +-
 .../windows/wgl/WindowsWGLDrawableFactory.java     |   75 +-
 .../wgl/WindowsWGLDynamicLibraryBundleInfo.java    |   21 +-
 .../wgl/WindowsWGLGraphicsConfiguration.java       |  134 +-
 .../WindowsWGLGraphicsConfigurationFactory.java    |  124 +-
 .../opengl/x11/glx/X11ExternalGLXContext.java      |   17 +-
 .../jogamp/opengl/x11/glx/X11GLCapabilities.java   |   10 +-
 .../jogamp/opengl/x11/glx/X11GLXContext.java       |  232 +-
 .../opengl/x11/glx/X11GLXDrawableFactory.java      |   74 +-
 .../x11/glx/X11GLXDynamicLibraryBundleInfo.java    |   34 +-
 .../x11/glx/X11GLXGraphicsConfiguration.java       |   55 +-
 .../glx/X11GLXGraphicsConfigurationFactory.java    |   31 +-
 .../opengl/x11/glx/X11OnscreenGLXDrawable.java     |    6 +-
 .../awt/X11AWTGLXGraphicsConfigurationFactory.java |   22 +-
 src/jogl/native/GLDebugMessageHandler.c            |  206 ++
 src/jogl/native/JoglCommon.c                       |   55 +
 src/jogl/native/JoglCommon.h                       |   15 +
 src/jogl/native/macosx/ContextUpdater.h            |    8 +-
 src/jogl/native/macosx/ContextUpdater.m            |   74 +-
 .../native/macosx/MacOSXWindowSystemInterface.m    |  697 +++---
 src/jogl/native/openmax/omx_tool.c                 |   12 +-
 src/jogl/native/openmax/omx_tool.h                 |   19 +-
 .../javax/media/nativewindow/Capabilities.java     |   66 +-
 .../media/nativewindow/CapabilitiesImmutable.java  |    5 +-
 .../nativewindow/DefaultCapabilitiesChooser.java   |    7 +-
 .../javax/media/nativewindow/NativeSurface.java    |   10 +-
 .../javax/media/nativewindow/NativeWindow.java     |   38 +-
 .../media/nativewindow/NativeWindowFactory.java    |  137 +-
 .../javax/media/nativewindow/ProxySurface.java     |   11 +-
 .../javax/media/nativewindow/util/Dimension.java   |    6 +-
 .../nativewindow/util/DimensionImmutable.java      |   57 +
 .../media/nativewindow/util/DimensionReadOnly.java |   55 -
 .../javax/media/nativewindow/util/Insets.java      |  165 +-
 .../media/nativewindow/util/InsetsImmutable.java   |   66 +
 .../javax/media/nativewindow/util/Point.java       |   10 +-
 .../media/nativewindow/util/PointImmutable.java    |   52 +
 .../media/nativewindow/util/PointReadOnly.java     |   50 -
 .../javax/media/nativewindow/util/Rectangle.java   |   16 +-
 .../nativewindow/util/RectangleImmutable.java      |   56 +
 .../media/nativewindow/util/RectangleReadOnly.java |   54 -
 .../javax/media/nativewindow/util/SurfaceSize.java |   18 +-
 .../jogamp/nativewindow/NWJNILibLoader.java        |   10 +-
 .../nativewindow/NativeWindowFactoryImpl.java      |   11 +-
 .../jogamp/nativewindow/NullToolkitLock.java       |    6 +-
 .../jogamp/nativewindow/jawt/JAWTJNILibLoader.java |    2 +-
 .../classes/jogamp/nativewindow/jawt/JAWTUtil.java |    5 +-
 .../jogamp/nativewindow/jawt/JAWTWindow.java       |   73 +-
 .../nativewindow/jawt/macosx/MacOSXJAWTWindow.java |   13 +-
 .../jogamp/nativewindow/macosx/OSXUtil.java        |   39 +
 .../classes/jogamp/nativewindow/x11/X11Util.java   |  207 +-
 src/nativewindow/native/macosx/OSXmisc.c           |  106 +
 src/nativewindow/native/windows/GDImisc.c          |   18 +-
 src/nativewindow/native/windows/WindowsDWM.c       |   95 +
 src/nativewindow/native/windows/WindowsDWM.h       |   32 +
 src/nativewindow/native/x11/XineramaHelper.c       |   19 +-
 src/nativewindow/native/x11/Xmisc.c                |   83 +-
 src/newt/classes/com/jogamp/newt/Display.java      |   12 +-
 src/newt/classes/com/jogamp/newt/NewtFactory.java  |   22 +-
 src/newt/classes/com/jogamp/newt/Screen.java       |   10 +-
 src/newt/classes/com/jogamp/newt/ScreenMode.java   |   37 +-
 src/newt/classes/com/jogamp/newt/Window.java       |  150 +-
 .../classes/com/jogamp/newt/awt/NewtCanvasAWT.java |   40 +-
 .../com/jogamp/newt/awt/NewtFactoryAWT.java        |   73 -
 .../jogamp/newt/awt/applet/JOGLNewtApplet1Run.java |  177 ++
 .../jogamp/newt/awt/applet/JOGLNewtAppletBase.java |  244 ++
 .../classes/com/jogamp/newt/event/InputEvent.java  |   26 +-
 .../classes/com/jogamp/newt/event/KeyEvent.java    |    4 +-
 .../classes/com/jogamp/newt/event/MouseEvent.java  |  196 +-
 .../classes/com/jogamp/newt/event/NEWTEvent.java   |    6 +-
 .../com/jogamp/newt/event/WindowUpdateEvent.java   |    2 +-
 .../com/jogamp/newt/event/awt/AWTAdapter.java      |    8 +
 .../com/jogamp/newt/event/awt/AWTKeyAdapter.java   |    2 +
 .../com/jogamp/newt/event/awt/AWTMouseAdapter.java |    2 +
 .../jogamp/newt/event/awt/AWTNewtEventFactory.java |  146 --
 .../newt/event/awt/AWTParentWindowAdapter.java     |  130 -
 .../jogamp/newt/event/awt/AWTWindowAdapter.java    |    2 +
 .../classes/com/jogamp/newt/opengl/GLWindow.java   |  247 +-
 .../classes/com/jogamp/newt/util/MainThread.java   |  300 +--
 .../classes/com/jogamp/newt/util/MonitorMode.java  |   18 +-
 .../com/jogamp/newt/util/ScreenModeUtil.java       |  101 +-
 src/newt/classes/jogamp/newt/DefaultEDTUtil.java   |   74 +-
 src/newt/classes/jogamp/newt/DisplayImpl.java      |   79 +-
 src/newt/classes/jogamp/newt/NEWTJNILibLoader.java |   15 +-
 src/newt/classes/jogamp/newt/OffscreenWindow.java  |   32 +-
 src/newt/classes/jogamp/newt/ScreenImpl.java       |  171 +-
 src/newt/classes/jogamp/newt/ScreenModeStatus.java |   39 +-
 src/newt/classes/jogamp/newt/WindowImpl.java       | 1019 ++++----
 src/newt/classes/jogamp/newt/awt/AWTCanvas.java    |  312 ---
 src/newt/classes/jogamp/newt/awt/AWTDisplay.java   |   67 -
 src/newt/classes/jogamp/newt/awt/AWTEDTUtil.java   |  108 -
 src/newt/classes/jogamp/newt/awt/AWTScreen.java    |   65 -
 src/newt/classes/jogamp/newt/awt/AWTWindow.java    |  244 --
 .../jogamp/newt/awt/event/AWTNewtEventFactory.java |  146 ++
 .../newt/awt/event/AWTParentWindowAdapter.java     |  129 +
 .../jogamp/newt/awt/event/NewtFactoryAWT.java      |   73 +
 .../jogamp/newt/awt/opengl/VersionApplet.java      |  174 --
 .../jogamp/newt/driver/android/AndroidDisplay.java |   79 +
 .../jogamp/newt/driver/android/AndroidScreen.java  |  124 +
 .../jogamp/newt/driver/android/AndroidWindow.java  |  412 ++++
 .../classes/jogamp/newt/driver/android/MD.java     |   65 +
 .../newt/driver/android/NewtBaseActivity.java      |  168 ++
 .../newt/driver/android/NewtVersionActivity.java   |   59 +
 .../android/event/AndroidNewtEventFactory.java     |  215 ++
 .../classes/jogamp/newt/driver/awt/AWTCanvas.java  |  312 +++
 .../classes/jogamp/newt/driver/awt/AWTDisplay.java |   67 +
 .../classes/jogamp/newt/driver/awt/AWTEDTUtil.java |  143 ++
 .../classes/jogamp/newt/driver/awt/AWTScreen.java  |   65 +
 .../classes/jogamp/newt/driver/awt/AWTWindow.java  |  245 ++
 .../jogamp/newt/driver/broadcom/egl/Display.java   |   81 +
 .../jogamp/newt/driver/broadcom/egl/Screen.java    |   62 +
 .../jogamp/newt/driver/broadcom/egl/Window.java    |  166 ++
 .../jogamp/newt/driver/intel/gdl/Display.java      |  104 +
 .../jogamp/newt/driver/intel/gdl/Screen.java       |   68 +
 .../jogamp/newt/driver/intel/gdl/Window.java       |  152 ++
 .../classes/jogamp/newt/driver/kd/KDDisplay.java   |   84 +
 .../classes/jogamp/newt/driver/kd/KDScreen.java    |   57 +
 .../classes/jogamp/newt/driver/kd/KDWindow.java    |  156 ++
 .../jogamp/newt/driver/macosx/MacDisplay.java      |   79 +
 .../jogamp/newt/driver/macosx/MacScreen.java       |   57 +
 .../jogamp/newt/driver/macosx/MacWindow.java       |  444 ++++
 .../jogamp/newt/driver/windows/WindowsDisplay.java |   94 +
 .../jogamp/newt/driver/windows/WindowsScreen.java  |  114 +
 .../jogamp/newt/driver/windows/WindowsWindow.java  |  214 ++
 .../classes/jogamp/newt/driver/x11/X11Display.java |  152 ++
 .../classes/jogamp/newt/driver/x11/X11Screen.java  |  301 +++
 .../classes/jogamp/newt/driver/x11/X11Window.java  |  173 ++
 .../classes/jogamp/newt/intel/gdl/Display.java     |  104 -
 src/newt/classes/jogamp/newt/intel/gdl/Screen.java |   68 -
 src/newt/classes/jogamp/newt/intel/gdl/Window.java |  148 --
 .../classes/jogamp/newt/macosx/MacDisplay.java     |  100 -
 src/newt/classes/jogamp/newt/macosx/MacScreen.java |   57 -
 src/newt/classes/jogamp/newt/macosx/MacWindow.java |  439 ----
 .../jogamp/newt/opengl/broadcom/egl/Display.java   |   81 -
 .../jogamp/newt/opengl/broadcom/egl/Screen.java    |   62 -
 .../jogamp/newt/opengl/broadcom/egl/Window.java    |  165 --
 .../classes/jogamp/newt/opengl/kd/KDDisplay.java   |   84 -
 .../classes/jogamp/newt/opengl/kd/KDScreen.java    |   58 -
 .../classes/jogamp/newt/opengl/kd/KDWindow.java    |  148 --
 .../jogamp/newt/windows/WindowsDisplay.java        |   94 -
 .../classes/jogamp/newt/windows/WindowsScreen.java |  114 -
 .../classes/jogamp/newt/windows/WindowsWindow.java |  209 --
 src/newt/classes/jogamp/newt/x11/X11Display.java   |  114 -
 src/newt/classes/jogamp/newt/x11/X11Screen.java    |  270 ---
 src/newt/classes/jogamp/newt/x11/X11Window.java    |  146 --
 src/newt/native/AndroidWindow.c                    |   81 +
 src/newt/native/BroadcomEGL.c                      |   22 +-
 src/newt/native/IntelGDL.c                         |   26 +-
 src/newt/native/KDWindow.c                         |   54 +-
 src/newt/native/MacWindow.m                        |  339 +--
 src/newt/native/NewtCommon.c                       |   31 +-
 src/newt/native/NewtCommon.h                       |    2 +
 src/newt/native/NewtMacWindow.h                    |   24 +-
 src/newt/native/NewtMacWindow.m                    |  237 +-
 src/newt/native/Window.h                           |   30 +
 src/newt/native/WindowsWindow.c                    |  350 ++-
 src/newt/native/X11Window.c                        |  951 +++++---
 .../opengl/test/android/NEWTElektronActivity.java  |   77 +
 .../opengl/test/android/NEWTGearsES1Activity.java  |   73 +
 .../opengl/test/android/NEWTGearsES2Activity.java  |   74 +
 .../test/android/NEWTGearsES2TransActivity.java    |   77 +
 .../opengl/test/android/NEWTGraphUI1pActivity.java |   77 +
 .../opengl/test/android/NEWTGraphUI2pActivity.java |   78 +
 .../test/android/NEWTRedSquareES1Activity.java     |   73 +
 .../test/android/NEWTRedSquareES2Activity.java     |   74 +
 .../opengl/test/bugs/Bug427GLJPanelTest1.java      |    6 +-
 .../com/jogamp/opengl/test/bugs/Issue326Test1.java |   20 +-
 .../com/jogamp/opengl/test/bugs/Issue326Test2.java |   14 +-
 .../com/jogamp/opengl/test/bugs/Issue344Base.java  |    4 +-
 .../test/junit/graph/TestRegionRendererNEWT01.java |  190 ++
 .../test/junit/graph/TestTextRendererNEWT01.java   |  175 ++
 .../junit/graph/demos/GPURegionGLListener01.java   |  126 +
 .../junit/graph/demos/GPURegionGLListener02.java   |  125 +
 .../junit/graph/demos/GPURegionNewtDemo01.java     |   99 +
 .../junit/graph/demos/GPURegionNewtDemo02.java     |   94 +
 .../demos/GPURegionRendererListenerBase01.java     |   52 +
 .../graph/demos/GPURendererListenerBase01.java     |  297 +++
 .../junit/graph/demos/GPUTextGLListener0A.java     |   77 +
 .../test/junit/graph/demos/GPUTextNewtDemo01.java  |   91 +
 .../test/junit/graph/demos/GPUTextNewtDemo02.java  |  100 +
 .../graph/demos/GPUTextRendererListenerBase01.java |  292 +++
 .../junit/graph/demos/GPUUISceneGLListener0A.java  |  408 ++++
 .../junit/graph/demos/GPUUISceneNewtDemo01.java    |   49 +
 .../junit/graph/demos/GPUUISceneNewtDemo02.java    |   50 +
 .../opengl/test/junit/graph/demos/MSAATool.java    |   69 +
 .../opengl/test/junit/graph/demos/ui/Label.java    |  106 +
 .../opengl/test/junit/graph/demos/ui/RIButton.java |  271 +++
 .../junit/graph/demos/ui/SceneUIController.java    |  261 ++
 .../test/junit/graph/demos/ui/UIGLListener01.java  |  123 +
 .../junit/graph/demos/ui/UIListenerBase01.java     |  322 +++
 .../test/junit/graph/demos/ui/UINewtDemo01.java    |   96 +
 .../opengl/test/junit/graph/demos/ui/UIShape.java  |  130 +
 .../test/junit/graph/demos/ui/UITextShape.java     |   37 +
 .../test/junit/graph/demos/ui/opengl/UIRegion.java |   77 +
 .../test/junit/jogl/acore/TestGLDebug00NEWT.java   |  235 ++
 .../test/junit/jogl/acore/TestGLDebug01NEWT.java   |  195 ++
 .../jogl/acore/TestGLExtensionQueryOffscreen.java  |   96 +
 .../test/junit/jogl/acore/TestGLProfile01NEWT.java |   68 +-
 .../test/junit/jogl/acore/TestGPUMemSec01NEWT.java |  324 +++
 .../test/junit/jogl/acore/TestMapBuffer01NEWT.java |  111 +
 .../test/junit/jogl/acore/TestNVSwapGroupNEWT.java |  140 ++
 .../junit/jogl/acore/TestSharedContextListAWT.java |   55 +-
 .../jogl/acore/TestSharedContextListNEWT.java      |   34 +-
 .../jogl/acore/TestSharedContextVBOES1NEWT.java    |  146 ++
 .../jogl/acore/TestSharedContextVBOES2NEWT.java    |  146 ++
 .../opengl/test/junit/jogl/awt/TestAWT01GLn.java   |    5 +-
 .../junit/jogl/awt/TestAWT02WindowClosing.java     |    5 -
 .../jogl/awt/TestAWT03GLCanvasRecreate01.java      |    6 +-
 .../junit/jogl/awt/TestBug460GLCanvasNPEAWT.java   |   56 +
 .../test/junit/jogl/awt/TestSwingAWT01GLn.java     |   10 +-
 .../TestAWTTextRendererUseVertexArrayBug464.java   |   52 +-
 .../awt/text/TextRendererGLEventListener01.java    |   36 +-
 .../jogl/awt/text/TextRendererTraceGL2Mock01.java  |  140 +-
 .../test/junit/jogl/caps/TestMultisampleNEWT.java  |    3 +-
 .../test/junit/jogl/caps/TestTranslucencyNEWT.java |  155 ++
 .../opengl/test/junit/jogl/demos/GearsObject.java  |  275 +++
 .../opengl/test/junit/jogl/demos/es1/GearsES1.java |  266 +++
 .../test/junit/jogl/demos/es1/GearsObjectES1.java  |   80 +
 .../test/junit/jogl/demos/es1/RedSquare.java       |  169 --
 .../test/junit/jogl/demos/es1/RedSquareES1.java    |  162 ++
 .../jogl/demos/es1/newt/TestGearsES1NEWT.java      |  136 ++
 .../jogl/demos/es1/newt/TestRedSquareES1NEWT.java  |  136 ++
 .../jogl/demos/es2/ElektronenMultiplizierer.java   |  538 +++++
 .../opengl/test/junit/jogl/demos/es2/GearsES2.java |  300 +++
 .../test/junit/jogl/demos/es2/GearsObjectES2.java  |  107 +
 .../test/junit/jogl/demos/es2/RedSquare0.java      |  198 --
 .../test/junit/jogl/demos/es2/RedSquareES2.java    |  211 ++
 .../es2/newt/TestElektronenMultipliziererNEWT.java |  151 ++
 .../jogl/demos/es2/newt/TestGearsES2NEWT.java      |  174 ++
 .../jogl/demos/es2/newt/TestRedSquareES2NEWT.java  |  136 ++
 .../junit/jogl/demos/es2/shader/RedSquareShader.fp |   23 +
 .../jogl/demos/es2/shader/RedSquareShader.java     |   27 +-
 .../junit/jogl/demos/es2/shader/RedSquareShader.vp |   27 +
 .../jogl/demos/es2/shader/RedSquareShader2.fp      |   26 +
 .../test/junit/jogl/demos/es2/shader/default.vp    |   19 +
 .../shader/elektronenmultiplizierer_development.fp |  379 +++
 .../es2/shader/elektronenmultiplizierer_port.fp    |  234 ++
 .../test/junit/jogl/demos/es2/shader/fbo-mrt-1.fp  |   11 +
 .../test/junit/jogl/demos/es2/shader/fbo-mrt-1.vp  |   16 +
 .../test/junit/jogl/demos/es2/shader/fbo-mrt-2.fp  |   16 +
 .../test/junit/jogl/demos/es2/shader/fbo-mrt-2.vp  |   18 +
 .../test/junit/jogl/demos/es2/shader/gears.fp      |   47 +
 .../test/junit/jogl/demos/es2/shader/gears.vp      |   44 +
 .../test/junit/jogl/demos/es2/shader/ruler.fp      |   26 +
 .../opengl/test/junit/jogl/demos/gl2/Gears.java    |  387 +++
 .../test/junit/jogl/demos/gl2/OneTriangle.java     |   69 +
 .../junit/jogl/demos/gl2/awt/TestGearsAWT.java     |  124 +
 .../jogl/demos/gl2/awt/TestGearsGLJPanelAWT.java   |  132 ++
 .../demos/gl2/awt/TestGearsGLJPanelAWTBug450.java  |  164 ++
 .../test/junit/jogl/demos/gl2/gears/Gears.java     |  371 ---
 .../junit/jogl/demos/gl2/gears/TestGearsAWT.java   |  122 -
 .../jogl/demos/gl2/gears/TestGearsGLJPanelAWT.java |  130 -
 .../gl2/gears/TestGearsGLJPanelAWTBug450.java      |  163 --
 .../jogl/demos/gl2/gears/newt/TestGearsNEWT.java   |  130 -
 .../gl2/gears/newt/TestGearsNewtAWTWrapper.java    |  112 -
 .../junit/jogl/demos/gl2/newt/TestGearsNEWT.java   |  133 ++
 .../demos/gl2/newt/TestGearsNewtAWTWrapper.java    |  113 +
 .../junit/jogl/drawable/TestDrawable01NEWT.java    |    2 +-
 .../test/junit/jogl/glsl/GLSLMiscHelper.java       |  198 ++
 .../test/junit/jogl/glsl/TestFBOMRTNEWT01.java     |  230 ++
 .../junit/jogl/glsl/TestGLSLShaderState01NEWT.java |  408 ++++
 .../junit/jogl/glsl/TestGLSLShaderState02NEWT.java |  390 +++
 .../test/junit/jogl/glsl/TestGLSLSimple01NEWT.java |    8 +-
 .../test/junit/jogl/glsl/TestRulerNEWT01.java      |  172 ++
 .../jogl/glsl/TestShaderCompilationBug459AWT.java  |   31 +-
 .../TestTransformFeedbackVaryingsBug407NEWT.java   |    6 +-
 .../jogl/glu/TestBug463ScaleImageMemoryAWT.java    |   51 +-
 ...TestSwingAWTRobotUsageBeforeJOGLInitBug411.java |   35 +-
 .../test/junit/jogl/offscreen/ReadBuffer2File.java |    5 +-
 .../junit/jogl/offscreen/ReadBuffer2Screen.java    |   22 +-
 .../test/junit/jogl/offscreen/ReadBufferBase.java  |   11 +-
 .../test/junit/jogl/offscreen/ReadBufferUtil.java  |  107 -
 .../test/junit/jogl/offscreen/Surface2File.java    |   12 +-
 .../offscreen/TestOffscreen01GLPBufferNEWT.java    |   23 +-
 .../jogl/offscreen/TestOffscreen02BitmapNEWT.java  |   18 +-
 .../test/junit/jogl/offscreen/WindowUtilNEWT.java  |    2 +-
 .../opengl/test/junit/jogl/swt/OneTriangle.java    |   71 -
 .../opengl/test/junit/jogl/swt/TestSWT01GLn.java   |    7 +-
 .../opengl/test/junit/jogl/swt/TestSWT02GLn.java   |    7 +-
 .../test/junit/jogl/swt/TestSWTAWT01GLn.java       |   18 +-
 .../texture/TestGrayTextureFromFileAWTBug417.java  |   23 +-
 .../test/junit/jogl/texture/TestTexture01AWT.java  |   24 +-
 .../util/texture/gl2/TextureGL2ListenerDraw1.java  |    8 +-
 .../test/junit/newt/ManualScreenMode03NEWT.java    |  110 +
 .../junit/newt/TestDisplayLifecycle01NEWT.java     |   55 +-
 .../junit/newt/TestDisplayLifecycle02NEWT.java     |   86 +-
 .../test/junit/newt/TestEventSourceNotAWTBug.java  |   11 +-
 .../test/junit/newt/TestFocus01SwingAWTRobot.java  |   65 +-
 .../test/junit/newt/TestFocus02SwingAWTRobot.java  |  137 +-
 .../test/junit/newt/TestGLWindows00NEWT.java       |   11 +-
 .../test/junit/newt/TestGLWindows01NEWT.java       |   27 +-
 .../junit/newt/TestGLWindows02NEWTAnimated.java    |   68 +-
 .../test/junit/newt/TestListenerCom01AWT.java      |   24 +-
 .../test/junit/newt/TestRemoteGLWindows01NEWT.java |   14 +-
 .../test/junit/newt/TestScreenMode00NEWT.java      |   24 +-
 .../test/junit/newt/TestScreenMode00bNEWT.java     |  124 +
 .../test/junit/newt/TestScreenMode01NEWT.java      |  130 +-
 .../test/junit/newt/TestScreenMode01bNEWT.java     |  190 ++
 .../test/junit/newt/TestScreenMode02NEWT.java      |   25 +-
 .../junit/newt/TestWindowClosingProtocol01AWT.java |    9 +-
 .../newt/TestWindowClosingProtocol02NEWT.java      |    7 +-
 .../newt/TestWindowClosingProtocol03NewtAWT.java   |   38 +-
 .../opengl/test/junit/newt/TestWindows01NEWT.java  |  158 +-
 .../test/junit/newt/parenting/GLRunnableDummy.java |   11 +-
 .../parenting/NewtAWTReparentingKeyAdapter.java    |   95 +
 .../junit/newt/parenting/TestParenting01NEWT.java  |  178 +-
 .../junit/newt/parenting/TestParenting01aAWT.java  |   99 +-
 .../junit/newt/parenting/TestParenting01bAWT.java  |   52 +-
 .../junit/newt/parenting/TestParenting01cAWT.java  |   43 +-
 .../newt/parenting/TestParenting01cSwingAWT.java   |  116 +-
 .../junit/newt/parenting/TestParenting02AWT.java   |   76 +-
 .../junit/newt/parenting/TestParenting02NEWT.java  |   23 +-
 .../junit/newt/parenting/TestParenting03AWT.java   |   25 +-
 .../junit/newt/parenting/TestParenting03bAWT.java  |   83 +-
 .../opengl/test/junit/util/AWTFocusAdapter.java    |   17 +-
 .../opengl/test/junit/util/AWTKeyAdapter.java      |   22 +-
 .../opengl/test/junit/util/AWTMouseAdapter.java    |   26 +-
 .../opengl/test/junit/util/AWTRobotUtil.java       |  288 ++-
 .../opengl/test/junit/util/EventCountAdapter.java  |    2 -
 .../test/junit/util/FocusEventCountAdapter.java    |   34 +
 .../opengl/test/junit/util/GLSLSimpleProgram.java  |   10 +
 .../test/junit/util/InputEventCountAdapter.java    |   35 +
 .../opengl/test/junit/util/NEWTFocusAdapter.java   |   27 +-
 .../opengl/test/junit/util/NEWTGLContext.java      |  141 ++
 .../opengl/test/junit/util/NEWTKeyAdapter.java     |   20 +-
 .../opengl/test/junit/util/NEWTMouseAdapter.java   |   20 +-
 .../jogamp/opengl/test/junit/util/QuitAdapter.java |    4 +-
 .../opengl/test/junit/util/SingletonInstance.java  |  143 --
 .../jogamp/opengl/test/junit/util/UITestCase.java  |   42 +-
 tools/jackpotc/.gitignore                          |    1 -
 tools/jackpotc/test/oldgears/.gitignore            |    4 -
 www/index.html                                     |   32 +-
 ...-demoscene-elektronenmultiplizierer01-small.png |  Bin 0 -> 46454 bytes
 ...applet-demoscene-elektronenmultiplizierer01.png |  Bin 0 -> 410998 bytes
 www/media/jogl-applet-gearses2-normal-small.png    |  Bin 0 -> 6523 bytes
 www/media/jogl-applet-gearses2-normal.png          |  Bin 0 -> 69330 bytes
 .../jogl-applet-gearses2-translucent-small.png     |  Bin 0 -> 28387 bytes
 www/media/jogl-applet-gearses2-translucent.png     |  Bin 0 -> 72883 bytes
 www/media/jogl-applet-graph-text01-small.png       |  Bin 0 -> 13499 bytes
 www/media/jogl-applet-graph-text01.png             |  Bin 0 -> 103995 bytes
 www/media/jogl-applet-graph-uiscene01-small.png    |  Bin 0 -> 17151 bytes
 www/media/jogl-applet-graph-uiscene01.png          |  Bin 0 -> 106628 bytes
 www/media/jogl-applet-version-small.png            |  Bin 0 -> 21426 bytes
 www/media/jogl-applet-version.png                  |  Bin 0 -> 121630 bytes
 961 files changed, 64825 insertions(+), 29959 deletions(-)

diff --cc debian/changelog
index 2b37116,0000000..76678e5
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,41 -1,0 +1,52 @@@
++libjogl2-java (2.0-rc3-1) unstable; urgency=low
++
++  * New upstream release
++  * libjogl2-java, libjogl2-jni and libjogl2-java-doc added
++    (better match of the version 1)
++  * Massive cleanup of the package list. Upstream decided to simplify all the
++    jar packages. 
++    See: http://bit.ly/qBNO7V
++
++ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 06 Oct 2011 15:53:38 +0200
++
 +libjogl2-java (2.0-rc2-4) unstable; urgency=low
 +
 +  * Team upload.
 +  * Update dependency libswt-gtk-3.6-java to libswt-gtk-3-java
 +    (Closes: #635656)
 +
 + -- tony mancill <tmancill at debian.org>  Fri, 29 Jul 2011 22:15:33 -0700
 +
 +libjogl2-java (2.0-rc2-3) unstable; urgency=low
 +
 +  * Support of the other debian arch. Should fix the various FTBFS
 +    (otherArchsoswin.diff)
 +  * Update dependency libswt-gtk-3.5-java to libswt-gtk-3.6-java
 +    (Closes: #629777)
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 21 Jun 2011 21:54:41 +0200
 +
 +libjogl2-java (2.0-rc2-2) unstable; urgency=low
 +
 +  * cg-common.cfg.diff, build-java.diff, build.diff & defaultDebianPath.diff
 +    removed (deprecated patches)
 +  * libjogl2-core-java depended on libjogl2-core-jni which does not exist
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 08 May 2011 23:30:49 +0200
 +
 +libjogl2-java (2.0-rc2-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Standards-Version updated to version 3.9.2
 +  * needless-dependency-on-jre removed
 +  * swt-debug.jar removed from the archive. Update the dep list.
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 17 Apr 2011 14:41:20 +0200
 +
 +libjogl2-java (2.0-rc1-1) unstable; urgency=low
 +
 +  * New upstream release (Closes: #614819)
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 01 Mar 2011 14:12:56 +0100
 +
 +
diff --cc debian/control
index b2acae1,0000000..fb0a0fa
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,419 -1,0 +1,326 @@@
 +Source: libjogl2-java
 +Section: java
 +Priority: optional
 +Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 +Uploaders: Sylvestre Ledru <sylvestre at debian.org>
 +Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk,
 + ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev, 
 + x11proto-xf86vidmode-dev, libxt-dev, libgluegen2-build-java, ant-contrib,
 + ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev, libgluegen2-rt-java,
 + junit4, libswt-gtk-3-java
 +Standards-Version: 3.9.2
 +Homepage: http://jogamp.org/
 +Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjogl2-java
 +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjogl2-java/
 +
- Package: libjogl2-core-java
++Package: libjogl2-java
 +Architecture: all
 +Depends:  ${misc:Depends}, 
-  libgluegen2-rt-java
- Description: Java bindings for OpenGL API
-  The JOGL project hosts the development version of the Java Bindings for 
-  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
-  to applications written in Java. JOGL is not the official reference 
-  implementation of the JSR, but an evolving workspace; snapshots are taken 
-  from this workspace which become the official reference implementations of 
-  the JSR. 
-  .
-  JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3, 
-  >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
-  extensions. It integrates with the AWT and Swing widget sets, as well with
-  custom windowing toolkits using the NativeWindow API. It is part of a
-  suite of open-source technologies initiated by the Game Technology Group at
-  Sun Microsystems. 
- 
- # Package: libjogl2-core-jni
- # Depends: ${misc:Depends}
- # Architecture: any
- # Description: Java bindings for OpenGL API (JNI lib)
- #  The JOGL project hosts the development version of the Java Bindings for 
- #  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
- #  to applications written in Java. JOGL is not the official reference 
- #  implementation of the JSR, but an evolving workspace; snapshots are taken 
- #  from this workspace which become the official reference implementations of 
- #  the JSR. JOGL is part of a suite of open-source technologies initiated by 
- #  the Game Technology Group at Sun Microsystems.
- #  .
- #  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
- #  well as nearly all vendor extensions, and integrates with the AWT and Swing 
- #  widget sets.
- 
- Package: libjogl2-core-newt-java
- Architecture: all
- Depends:  ${misc:Depends}, 
-  libjogl2-core-java
++ libgluegen2-rt-java, libjogl2-jni
++Suggests: libjogl2-java-doc
 +Description: Java bindings for OpenGL API
 + The JOGL project hosts the development version of the Java Bindings for 
 + OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
 + to applications written in Java. JOGL is not the official reference 
 + implementation of the JSR, but an evolving workspace; snapshots are taken 
 + from this workspace which become the official reference implementations of 
 + the JSR. 
 + .
 + JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3, 
 + >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
 + extensions. It integrates with the AWT and Swing widget sets, as well with
 + custom windowing toolkits using the NativeWindow API. It is part of a
 + suite of open-source technologies initiated by the Game Technology Group at
 + Sun Microsystems. 
 +
- 
- Package: libjogl2-core-newt-jni
++Package: libjogl2-jni
++Depends: ${misc:Depends}, ${shlibs:Depends}
 +Architecture: any
- Depends:  ${misc:Depends}, ${shlibs:Depends},
-  libjogl2-core-java
 +Description: Java bindings for OpenGL API (JNI lib)
 + The JOGL project hosts the development version of the Java Bindings for 
 + OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
 + to applications written in Java. JOGL is not the official reference 
 + implementation of the JSR, but an evolving workspace; snapshots are taken 
 + from this workspace which become the official reference implementations of 
 + the JSR. JOGL is part of a suite of open-source technologies initiated by 
 + the Game Technology Group at Sun Microsystems.
 + .
 + JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
 + well as nearly all vendor extensions, and integrates with the AWT and Swing 
 + widget sets.
 +
- Package: libjogl2-platform-java
- Architecture: all
- Depends:  ${misc:Depends}, libjogl2-core-java
- Description: Java bindings for OpenGL API
-  The JOGL project hosts the development version of the Java Bindings for 
-  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
-  to applications written in Java. JOGL is not the official reference 
-  implementation of the JSR, but an evolving workspace; snapshots are taken 
-  from this workspace which become the official reference implementations of 
-  the JSR. 
-  .
-  JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3, 
-  >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
-  extensions. It integrates with the AWT and Swing widget sets, as well with
-  custom windowing toolkits using the NativeWindow API. It is part of a
-  suite of open-source technologies initiated by the Game Technology Group at
-  Sun Microsystems. 
++# Package: libjogl2-core-newt-java
++# Architecture: all
++# Depends:  ${misc:Depends}, 
++#  libjogl2-core-java
++# Description: Java bindings for OpenGL API
++#  The JOGL project hosts the development version of the Java Bindings for 
++#  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
++#  to applications written in Java. JOGL is not the official reference 
++#  implementation of the JSR, but an evolving workspace; snapshots are taken 
++#  from this workspace which become the official reference implementations of 
++#  the JSR. 
++#  .
++#  JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3, 
++#  >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
++#  extensions. It integrates with the AWT and Swing widget sets, as well with
++#  custom windowing toolkits using the NativeWindow API. It is part of a
++#  suite of open-source technologies initiated by the Game Technology Group at
++#  Sun Microsystems. 
 +
- Package: libjogl2-platform-jni
- Architecture: any
- Depends:  ${misc:Depends}, libjogl2-core-java, ${shlibs:Depends}
- Description: Java bindings for OpenGL API (JNI lib)
-  The JOGL project hosts the development version of the Java Bindings for 
-  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
-  to applications written in Java. JOGL is not the official reference 
-  implementation of the JSR, but an evolving workspace; snapshots are taken 
-  from this workspace which become the official reference implementations of 
-  the JSR. JOGL is part of a suite of open-source technologies initiated by 
-  the Game Technology Group at Sun Microsystems.
-  .
-  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
-  well as nearly all vendor extensions, and integrates with the AWT and Swing 
-  widget sets.
 +
- Package: libjogl2-platform-newt-java
- Architecture: all
- Depends:  ${misc:Depends}, libjogl2-core-newt-java
- Description: Java bindings for OpenGL API
-  The JOGL project hosts the development version of the Java Bindings for 
-  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
-  to applications written in Java. JOGL is not the official reference 
-  implementation of the JSR, but an evolving workspace; snapshots are taken 
-  from this workspace which become the official reference implementations of 
-  the JSR. 
-  .
-  JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3, 
-  >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
-  extensions. It integrates with the AWT and Swing widget sets, as well with
-  custom windowing toolkits using the NativeWindow API. It is part of a
-  suite of open-source technologies initiated by the Game Technology Group at
-  Sun Microsystems. 
++# Package: libjogl2-core-newt-jni
++# Architecture: any
++# Depends:  ${misc:Depends}, ${shlibs:Depends},
++#  libjogl2-core-java
++# Description: Java bindings for OpenGL API (JNI lib)
++#  The JOGL project hosts the development version of the Java Bindings for 
++#  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
++#  to applications written in Java. JOGL is not the official reference 
++#  implementation of the JSR, but an evolving workspace; snapshots are taken 
++#  from this workspace which become the official reference implementations of 
++#  the JSR. JOGL is part of a suite of open-source technologies initiated by 
++#  the Game Technology Group at Sun Microsystems.
++#  .
++#  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
++#  well as nearly all vendor extensions, and integrates with the AWT and Swing 
++#  widget sets.
 +
- # nativewindow.core.jar nativewindow.os.x11.jar jogl.core.jar jogl.os.x11.jar
- # newt.core.jar newt.os.x11.jar newt.ogl.jar jogl.util.jar jogl.os.x11.jar
- # jogl.gldesktop.jar jogl.gldesktop.dbg.jar
- Package: libjogl2-desktop-java
- Architecture: all
- Suggests: libjogl2-java-doc
- Depends:  ${misc:Depends}, libjogl2-core-java, libjogl2-platform-java,
-  libjogl2-platform-newt-java
- Description: Java bindings for Desktop OpenGL API (main package)
-  The JOGL project hosts the development version of the Java Bindings for 
-  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
-  to applications written in Java. JOGL is not the official reference 
-  implementation of the JSR, but an evolving workspace; snapshots are taken 
-  from this workspace which become the official reference implementations of 
-  the JSR. 
-  .
-  JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3, 
-  >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
-  extensions. It integrates with the AWT and Swing widget sets, as well with
-  custom windowing toolkits using the NativeWindow API. It is part of a
-  suite of open-source technologies initiated by the Game Technology Group at
-  Sun Microsystems. 
++# Package: libjogl2-platform-java
++# Architecture: all
++# Depends:  ${misc:Depends}, libjogl2-core-java
++# Description: Java bindings for OpenGL API
++#  The JOGL project hosts the development version of the Java Bindings for 
++#  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
++#  to applications written in Java. JOGL is not the official reference 
++#  implementation of the JSR, but an evolving workspace; snapshots are taken 
++#  from this workspace which become the official reference implementations of 
++#  the JSR. 
++#  .
++#  JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3, 
++#  >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
++#  extensions. It integrates with the AWT and Swing widget sets, as well with
++#  custom windowing toolkits using the NativeWindow API. It is part of a
++#  suite of open-source technologies initiated by the Game Technology Group at
++#  Sun Microsystems. 
 +
- Package: libjogl2-es-common-java
- Architecture: all
- Depends:  ${misc:Depends}, libjogl2-core-java, libjogl2-platform-java,
-  libjogl2-platform-newt-java
- Description: Java bindings for Embedded Device OpenGL API (common)
-  The JOGL project hosts the development version of the Java Bindings for 
-  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
-  to applications written in Java. JOGL is not the official reference 
-  implementation of the JSR, but an evolving workspace; snapshots are taken 
-  from this workspace which become the official reference implementations of 
-  the JSR. 
-  .
-  JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3, 
-  >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
-  extensions. It integrates with the AWT and Swing widget sets, as well with
-  custom windowing toolkits using the NativeWindow API. It is part of a
-  suite of open-source technologies initiated by the Game Technology Group at
-  Sun Microsystems. 
++# Package: libjogl2-platform-jni
++# Architecture: any
++# Depends:  ${misc:Depends}, libjogl2-core-java, ${shlibs:Depends}
++# Description: Java bindings for OpenGL API (JNI lib)
++#  The JOGL project hosts the development version of the Java Bindings for 
++#  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
++#  to applications written in Java. JOGL is not the official reference 
++#  implementation of the JSR, but an evolving workspace; snapshots are taken 
++#  from this workspace which become the official reference implementations of 
++#  the JSR. JOGL is part of a suite of open-source technologies initiated by 
++#  the Game Technology Group at Sun Microsystems.
++#  .
++#  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
++#  well as nearly all vendor extensions, and integrates with the AWT and Swing 
++#  widget sets.
 +
- # nativewindow.core.jar nativewindow.os.x11.jar jogl.core.jar jogl.os.x11.jar
- # newt.core.jar newt.os.x11.jar newt.ogl.jar jogl.util.jar jogl.gles1.jar
- # jogl.gles1.dbg.jar jogl.egl.jar
- Package: libjogl2-es1-java
- Architecture: all
- Suggests: libjogl2-java-doc
- Depends:  ${misc:Depends}, libjogl2-core-java, libjogl2-platform-java,
-  libjogl2-platform-newt-java, libjogl2-es-common-java
- Description: Java bindings for Embedded Device OpenGL API
-  The JOGL project hosts the development version of the Java Bindings for 
-  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
-  to applications written in Java. JOGL is not the official reference 
-  implementation of the JSR, but an evolving workspace; snapshots are taken 
-  from this workspace which become the official reference implementations of 
-  the JSR. JOGL is part of a suite of open-source technologies initiated by 
-  the Game Technology Group at Sun Microsystems.
-  .
-  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
-  well as nearly all vendor extensions, and integrates with the AWT and Swing 
-  widget sets.
++# Package: libjogl2-platform-newt-java
++# Architecture: all
++# Depends:  ${misc:Depends}, libjogl2-core-newt-java
++# Description: Java bindings for OpenGL API
++#  The JOGL project hosts the development version of the Java Bindings for 
++#  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
++#  to applications written in Java. JOGL is not the official reference 
++#  implementation of the JSR, but an evolving workspace; snapshots are taken 
++#  from this workspace which become the official reference implementations of 
++#  the JSR. 
++#  .
++#  JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3, 
++#  >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
++#  extensions. It integrates with the AWT and Swing widget sets, as well with
++#  custom windowing toolkits using the NativeWindow API. It is part of a
++#  suite of open-source technologies initiated by the Game Technology Group at
++#  Sun Microsystems. 
 +
- # nativewindow.core.jar nativewindow.os.x11.jar jogl.core.jar jogl.os.x11.jar
- # newt.core.jar newt.os.x11.jar newt.ogl.jar jogl.util.jar jogl.gles2.jar
- # jogl.gles2.dbg.jar jogl.egl.jar jogl.util.fixedfuncemu.jar
- Package: libjogl2-es2-java
- Architecture: all
- Suggests: libjogl2-java-doc
- Depends: ${misc:Depends}, libjogl2-core-java, libjogl2-platform-java,
-  libjogl2-platform-newt-java, libjogl2-es-common-java
- Description: Java bindings for Embedded Device OpenGL API
-  The JOGL project hosts the development version of the Java Bindings for 
-  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
-  to applications written in Java. JOGL is not the official reference 
-  implementation of the JSR, but an evolving workspace; snapshots are taken 
-  from this workspace which become the official reference implementations of 
-  the JSR. 
-  .
-  JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3, 
-  >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
-  extensions. It integrates with the AWT and Swing widget sets, as well with
-  custom windowing toolkits using the NativeWindow API. It is part of a
-  suite of open-source technologies initiated by the Game Technology Group at
-  Sun Microsystems. 
++# # nativewindow.core.jar nativewindow.os.x11.jar jogl.core.jar jogl.os.x11.jar
++# # newt.core.jar newt.os.x11.jar newt.ogl.jar jogl.util.jar jogl.os.x11.jar
++# # jogl.gldesktop.jar jogl.gldesktop.dbg.jar
++# Package: libjogl2-desktop-java
++# Architecture: all
++# Suggests: libjogl2-java-doc
++# Depends:  ${misc:Depends}, libjogl2-core-java, libjogl2-platform-java,
++#  libjogl2-platform-newt-java
++# Description: Java bindings for Desktop OpenGL API (main package)
++#  The JOGL project hosts the development version of the Java Bindings for 
++#  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
++#  to applications written in Java. JOGL is not the official reference 
++#  implementation of the JSR, but an evolving workspace; snapshots are taken 
++#  from this workspace which become the official reference implementations of 
++#  the JSR. 
++#  .
++#  JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3, 
++#  >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
++#  extensions. It integrates with the AWT and Swing widget sets, as well with
++#  custom windowing toolkits using the NativeWindow API. It is part of a
++#  suite of open-source technologies initiated by the Game Technology Group at
++#  Sun Microsystems. 
 +
- Package: libjogl2-desktop-jni
- Architecture: any
- Depends:  ${misc:Depends}, ${shlibs:Depends}
- Description: Java bindings for Desktop OpenGL API (JNI lib)
-  The JOGL project hosts the development version of the Java Bindings for 
-  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
-  to applications written in Java. JOGL is not the official reference 
-  implementation of the JSR, but an evolving workspace; snapshots are taken 
-  from this workspace which become the official reference implementations of 
-  the JSR. JOGL is part of a suite of open-source technologies initiated by 
-  the Game Technology Group at Sun Microsystems.
-  .
-  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
-  well as nearly all vendor extensions, and integrates with the AWT and Swing 
-  widget sets.
 +
- Package: libjogl2-es1-jni
- Architecture: any
- Depends:  ${misc:Depends}, ${shlibs:Depends}
- Description: Java bindings for Embedded Device OpenGL API (JNI lib)
-  The JOGL project hosts the development version of the Java Bindings for 
-  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
-  to applications written in Java. JOGL is not the official reference 
-  implementation of the JSR, but an evolving workspace; snapshots are taken 
-  from this workspace which become the official reference implementations of 
-  the JSR. JOGL is part of a suite of open-source technologies initiated by 
-  the Game Technology Group at Sun Microsystems.
-  .
-  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
-  well as nearly all vendor extensions, and integrates with the AWT and Swing 
-  widget sets.
 +
- Package: libjogl2-es2-jni
- Architecture: any
- Depends:  ${misc:Depends}, ${shlibs:Depends}
- Description: Java bindings for Embedded Device OpenGL API (JNI lib)
-  The JOGL project hosts the development version of the Java Bindings for 
-  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
-  to applications written in Java. JOGL is not the official reference 
-  implementation of the JSR, but an evolving workspace; snapshots are taken 
-  from this workspace which become the official reference implementations of 
-  the JSR. JOGL is part of a suite of open-source technologies initiated by 
-  the Game Technology Group at Sun Microsystems.
-  .
-  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
-  well as nearly all vendor extensions, and integrates with the AWT and Swing 
-  widget sets.
++# Package: libjogl2-desktop-jni
++# Architecture: any
++# Depends:  ${misc:Depends}, ${shlibs:Depends}
++# Description: Java bindings for Desktop OpenGL API (JNI lib)
++#  The JOGL project hosts the development version of the Java Bindings for 
++#  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
++#  to applications written in Java. JOGL is not the official reference 
++#  implementation of the JSR, but an evolving workspace; snapshots are taken 
++#  from this workspace which become the official reference implementations of 
++#  the JSR. JOGL is part of a suite of open-source technologies initiated by 
++#  the Game Technology Group at Sun Microsystems.
++#  .
++#  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
++#  well as nearly all vendor extensions, and integrates with the AWT and Swing 
++#  widget sets.
++
++# # nativewindow.core.jar nativewindow.os.x11.jar jogl.core.jar jogl.os.x11.jar
++# # newt.core.jar newt.os.x11.jar newt.ogl.jar jogl.util.jar jogl.os.x11.jar
++# # jogl.gl2es12.jar jogl.gles1.dbg.jar jogl.gles2.dbg.jar
++# # jogl.util.fixedfuncemu.jar
++# # Package: libjogl2-desktop-gl2es12-java
++# # Architecture: all
++# # Suggests: libjogl2-java-doc
++# # Depends: ${misc:Depends}, libjogl2-core-java, libjogl2-platform-java,
++# #  libjogl2-platform-newt-java, libjogl2-toolkits
++# # Description: Java bindings for desktop ES1/ES2 emulation OpenGL API
++# #  The JOGL project hosts the development version of the Java Bindings for 
++# #  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
++# #  to applications written in Java. JOGL is not the official reference 
++# #  implementation of the JSR, but an evolving workspace; snapshots are taken 
++# #  from this workspace which become the official reference implementations of 
++# #  the JSR. JOGL is part of a suite of open-source technologies initiated by 
++# #  the Game Technology Group at Sun Microsystems.
++# #  .
++# #  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
++# #  well as nearly all vendor extensions, and integrates with the AWT and Swing 
++# #  widget sets.
++
++# # Package: libjogl2-desktop-gl2es12-jni
++# # Architecture: any
++# # Depends:  ${misc:Depends}, ${shlibs:Depends}
++# # Description: Java bindings for desktop ES1/ES2 emulation OpenGL API (JNI lib)
++# #  The JOGL project hosts the development version of the Java Bindings for 
++# #  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
++# #  to applications written in Java. JOGL is not the official reference 
++# #  implementation of the JSR, but an evolving workspace; snapshots are taken 
++# #  from this workspace which become the official reference implementations of 
++# #  the JSR. JOGL is part of a suite of open-source technologies initiated by 
++# #  the Game Technology Group at Sun Microsystems.
++# #  .
++# #  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
++# #  well as nearly all vendor extensions, and integrates with the AWT and Swing 
++# #  widget sets.
++# #  .
++# #  This package includes the architecture specific java native interface.
++
 +
- # nativewindow.core.jar nativewindow.os.x11.jar jogl.core.jar jogl.os.x11.jar
- # newt.core.jar newt.os.x11.jar newt.ogl.jar jogl.util.jar jogl.os.x11.jar
- # jogl.gl2es12.jar jogl.gles1.dbg.jar jogl.gles2.dbg.jar
- # jogl.util.fixedfuncemu.jar
- # Package: libjogl2-desktop-gl2es12-java
++# Package: libjogl2-awt-java
 +# Architecture: all
- # Suggests: libjogl2-java-doc
- # Depends: ${misc:Depends}, libjogl2-core-java, libjogl2-platform-java,
- #  libjogl2-platform-newt-java, libjogl2-toolkits
- # Description: Java bindings for desktop ES1/ES2 emulation OpenGL API
++# Depends:  ${misc:Depends}
++# Description: Java bindings for AWT OpenGL API
 +#  The JOGL project hosts the development version of the Java Bindings for 
 +#  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
 +#  to applications written in Java. JOGL is not the official reference 
 +#  implementation of the JSR, but an evolving workspace; snapshots are taken 
 +#  from this workspace which become the official reference implementations of 
 +#  the JSR. JOGL is part of a suite of open-source technologies initiated by 
 +#  the Game Technology Group at Sun Microsystems.
 +#  .
 +#  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
 +#  well as nearly all vendor extensions, and integrates with the AWT and Swing 
 +#  widget sets.
 +
- # Package: libjogl2-desktop-gl2es12-jni
++# Package: libjogl2-awt-jni
 +# Architecture: any
 +# Depends:  ${misc:Depends}, ${shlibs:Depends}
- # Description: Java bindings for desktop ES1/ES2 emulation OpenGL API (JNI lib)
++# Description: Java bindings for AWT OpenGL API (JNI lib)
 +#  The JOGL project hosts the development version of the Java Bindings for 
 +#  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
 +#  to applications written in Java. JOGL is not the official reference 
 +#  implementation of the JSR, but an evolving workspace; snapshots are taken 
 +#  from this workspace which become the official reference implementations of 
 +#  the JSR. JOGL is part of a suite of open-source technologies initiated by 
 +#  the Game Technology Group at Sun Microsystems.
 +#  .
 +#  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
 +#  well as nearly all vendor extensions, and integrates with the AWT and Swing 
 +#  widget sets.
++
++# Package: libjogl2-awt-newt-java
++# Architecture: all
++# Depends:  ${misc:Depends}
++# Description: Java bindings for AWT NEWT OpenGL API
++#  The JOGL project hosts the development version of the Java Bindings for 
++#  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
++#  to applications written in Java. JOGL is not the official reference 
++#  implementation of the JSR, but an evolving workspace; snapshots are taken 
++#  from this workspace which become the official reference implementations of 
++#  the JSR. JOGL is part of a suite of open-source technologies initiated by 
++#  the Game Technology Group at Sun Microsystems.
 +#  .
- #  This package includes the architecture specific java native interface.
++#  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
++#  well as nearly all vendor extensions, and integrates with the AWT and Swing 
++#  widget sets.
 +
++# Package: libjogl2-glu-java
++# Architecture: all
++# Depends:  ${misc:Depends}
++# Description: Java bindings for GLU OpenGL API
++#  The JOGL project hosts the development version of the Java Bindings for 
++#  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
++#  to applications written in Java. JOGL is not the official reference 
++#  implementation of the JSR, but an evolving workspace; snapshots are taken 
++#  from this workspace which become the official reference implementations of 
++#  the JSR. JOGL is part of a suite of open-source technologies initiated by 
++#  the Game Technology Group at Sun Microsystems.
++#  .
++#  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
++#  well as nearly all vendor extensions, and integrates with the AWT and Swing 
++#  widget sets.
 +
- Package: libjogl2-awt-java
- Architecture: all
- Depends:  ${misc:Depends}
- Description: Java bindings for AWT OpenGL API
-  The JOGL project hosts the development version of the Java Bindings for 
-  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
-  to applications written in Java. JOGL is not the official reference 
-  implementation of the JSR, but an evolving workspace; snapshots are taken 
-  from this workspace which become the official reference implementations of 
-  the JSR. JOGL is part of a suite of open-source technologies initiated by 
-  the Game Technology Group at Sun Microsystems.
-  .
-  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
-  well as nearly all vendor extensions, and integrates with the AWT and Swing 
-  widget sets.
 +
- Package: libjogl2-awt-jni
- Architecture: any
- Depends:  ${misc:Depends}, ${shlibs:Depends}
- Description: Java bindings for AWT OpenGL API (JNI lib)
-  The JOGL project hosts the development version of the Java Bindings for 
-  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
-  to applications written in Java. JOGL is not the official reference 
-  implementation of the JSR, but an evolving workspace; snapshots are taken 
-  from this workspace which become the official reference implementations of 
-  the JSR. JOGL is part of a suite of open-source technologies initiated by 
-  the Game Technology Group at Sun Microsystems.
-  .
-  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
-  well as nearly all vendor extensions, and integrates with the AWT and Swing 
-  widget sets.
- 
- Package: libjogl2-awt-newt-java
++Package: libjogl2-java-doc
 +Architecture: all
- Depends:  ${misc:Depends}
- Description: Java bindings for AWT NEWT OpenGL API
++Section: doc
++Depends: ${misc:Depends}
++Description: Documentation for the Java bindings for OpenGL
 + The JOGL project hosts the development version of the Java Bindings for 
 + OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
 + to applications written in Java. JOGL is not the official reference 
 + implementation of the JSR, but an evolving workspace; snapshots are taken 
 + from this workspace which become the official reference implementations of 
-  the JSR. JOGL is part of a suite of open-source technologies initiated by 
-  the Game Technology Group at Sun Microsystems.
++ the JSR. 
 + .
-  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
-  well as nearly all vendor extensions, and integrates with the AWT and Swing 
++ JOGL provides full access to the APIs in the OpenGL 2.0 specification as
++ well as nearly all vendor extensions, and integrates with the AWT and Swing
 + widget sets.
- 
- Package: libjogl2-glu-java
- Architecture: all
- Depends:  ${misc:Depends}
- Description: Java bindings for GLU OpenGL API
-  The JOGL project hosts the development version of the Java Bindings for 
-  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
-  to applications written in Java. JOGL is not the official reference 
-  implementation of the JSR, but an evolving workspace; snapshots are taken 
-  from this workspace which become the official reference implementations of 
-  the JSR. JOGL is part of a suite of open-source technologies initiated by 
-  the Game Technology Group at Sun Microsystems.
 + .
-  JOGL provides full access to the APIs in the OpenGL 2.0 specification as 
-  well as nearly all vendor extensions, and integrates with the AWT and Swing 
-  widget sets.
- 
- 
- # Package: libjogl2-java-doc
- # Architecture: all
- # Section: doc
- # Depends: ${misc:Depends}
- # Suggests: libjogl2java
- # Description: Documentation for the Java bindings for OpenGL
- #  The JOGL project hosts the development version of the Java Bindings for 
- #  OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
- #  to applications written in Java. JOGL is not the official reference 
- #  implementation of the JSR, but an evolving workspace; snapshots are taken 
- #  from this workspace which become the official reference implementations of 
- #  the JSR. 
- #  .
- #  JOGL provides full access to the APIs in the OpenGL 2.0 specification as
- #  well as nearly all vendor extensions, and integrates with the AWT and Swing
- #  widget sets.
- #  .
- #  This package includes the API documentation for JOGL package.
++ This package includes the API documentation for JOGL package.
 +
 +
 +Package: libjogl2-toolkits
 +Architecture: all
 +Section: doc
 +Depends: ${misc:Depends}
 +Description: Toolkits to play with JOGL2
 + The JOGL project hosts the development version of the Java Bindings for 
 + OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
 + to applications written in Java. JOGL is not the official reference 
 + implementation of the JSR, but an evolving workspace; snapshots are taken 
 + from this workspace which become the official reference implementations of 
 + the JSR. 
 + .
 + JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3, 
 + >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
 + extensions. It integrates with the AWT and Swing widget sets, as well with
 + custom windowing toolkits using the NativeWindow API. It is part of a
 + suite of open-source technologies initiated by the Game Technology Group at
 + Sun Microsystems. 
 + .
 + This package includes JOGL toolkits.
diff --cc debian/libjogl2-java-doc.docs
index 0000000,0000000..1abed77
new file mode 100644
--- /dev/null
+++ b/debian/libjogl2-java-doc.docs
@@@ -1,0 -1,0 +1,1 @@@
++build/javadoc/jogl/
diff --cc debian/libjogl2-java.install
index 0000000,0000000..b8b527f
new file mode 100644
--- /dev/null
+++ b/debian/libjogl2-java.install
@@@ -1,0 -1,0 +1,1 @@@
++build/jar/jogl2.jar /usr/share/java/
diff --cc debian/libjogl2-jni.install
index 0000000,0000000..066cf8d
new file mode 100644
--- /dev/null
+++ b/debian/libjogl2-jni.install
@@@ -1,0 -1,0 +1,6 @@@
++build/lib/libjogl_desktop.so /usr/lib/jni/
++build/lib/libjogl_mobile.so /usr/lib/jni/
++build/lib/libnativewindow_awt.so /usr/lib/jni/
++build/lib/libnativewindow_x11.so /usr/lib/jni/
++build/lib/libnewt.so /usr/lib/jni/
++
diff --cc debian/orig-tar.sh
index 398f00f,0000000..c9bf9e3
mode 100755,000000..100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@@ -1,19 -1,0 +1,26 @@@
 +#!/bin/sh -e
++VERSION="2.0-rc3"
 +
- # called by uscan with '--upstream-version' <version> <file>
- DIR=jogl-$2
- TAR=../libjogl-java_$2.orig.tar.gz
++DIR=libjogl2-java-$VERSION
++TAR=libjogl2-java_$VERSION.orig.tar.gz
 +
 +# clean up the upstream tarball
- unzip $3 -d $DIR
- tar -c -z -f $TAR $DIR
- rm -rf $DIR $3
++
++git clone git://jogamp.org/srv/scm/jogl.git $DIR
++cd $DIR
++git checkout $VERSION
++rm $(find . -name .gitignore)
++rm -rf .git .htaccess make/lib/
++cd ..
++tar zcvf $TAR $DIR
++rm -rf $DIR
++mv $TAR ../../
 +
 +# move to directory 'tarballs'
 +if [ -r .svn/deb-layout ]; then
 +    . .svn/deb-layout
 +    mv $TAR $origDir
 +    echo "moved $TAR to $origDir"
 +fi
 +
 +exit 0
diff --cc debian/patches/disable_android.diff
index 0000000,0000000..de77890
new file mode 100644
--- /dev/null
+++ b/debian/patches/disable_android.diff
@@@ -1,0 -1,0 +1,37 @@@
++--- plpo/libjogl2-java-2.0-rc3/make/build-newt.xml	2011-10-06 15:52:37.000000000 +0200
+++++ libjogl2-java-2.0-rc3/make//build-newt.xml	2011-10-06 18:55:54.000000000 +0200
++@@ -139,7 +139,7 @@
++            <isset property="setup.noOpenGL"/>
++         </condition>
++ 
++-        <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.opengl}" />
+++        <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.opengl} jogamp/newt/driver/android/**" />
++         <echo message="java.excludes.all: ${java.excludes.all}" />
++ 
++     </target>
++@@ -575,7 +575,7 @@
++       <javah destdir="${src.generated.c}/X11"         classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Window" />
++       <javah destdir="${src.generated.c}/X11"         classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Screen" />
++       <javah destdir="${src.generated.c}/X11"         classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Display" />
++-      <javah destdir="${src.generated.c}/Android"     classpath="${javah.classpath}:${android.jar}" class="jogamp.newt.driver.android.AndroidWindow" />
+++<!--      <javah destdir="${src.generated.c}/Android"     classpath="${javah.classpath}:${android.jar}" class="jogamp.newt.driver.android.AndroidWindow" />-->
++     </target>
++ 
++     <target name="c.build.newt.windowlib" unless="setup.nonatives">
++--- plpo/libjogl2-java-2.0-rc3/make/build-test.xml	2011-10-06 15:52:37.000000000 +0200
+++++ libjogl2-java-2.0-rc3/make//build-test.xml	2011-10-06 19:02:13.000000000 +0200
++@@ -78,12 +78,14 @@
++     </target>
++ 
++     <target name="test.compile" depends="test.compile.check" unless="test.compile.skip">
+++        <property name="java.excludes.all" value="jogamp/newt/driver/android/** com/jogamp/opengl/test/android/**" />
++         <!-- Perform the junit pass Java compile -->
++         <javac destdir="${classes}"
++                source="${host.sourcelevel}"
++                fork="yes"
++                memoryMaximumSize="${javac.memorymax}"
++                includeAntRuntime="false"
+++               excludes="${java.excludes.all}"
++                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
++             <classpath refid="junit_jogl_newt_android.compile.classpath"/>
++             <src path="${src.test}" />
diff --cc debian/patches/otherArchsoswin.diff
index 0174153,0000000..ffb2697
mode 100644,000000..100644
--- a/debian/patches/otherArchsoswin.diff
+++ b/debian/patches/otherArchsoswin.diff
@@@ -1,55 -1,0 +1,49 @@@
 +Index: libjogl2-java-2.0-rc2/make/build-nativewindow.xml
 +===================================================================
- --- libjogl2-java-2.0-rc2.orig/make/build-nativewindow.xml	2011-06-21 21:45:17.000000000 +0200
- +++ libjogl2-java-2.0-rc2/make/build-nativewindow.xml	2011-06-21 21:50:08.000000000 +0200
- @@ -437,7 +437,49 @@
++--- libjogl2-java-2.0-rc3.orig/make/build-nativewindow.xml	2011-10-06 16:17:29.000000000 +0200
+++++ libjogl2-java-2.0-rc3/make/build-nativewindow.xml	2011-10-06 16:20:23.000000000 +0200
++@@ -465,7 +465,43 @@
 +       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
 +     </target>
 + 
- -    <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux" />
- +    <target name="c.configure.linux.armel" if="isLinuxArmel">
- +      <echo message="Linux.Armel" />
- +      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
- +      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
- +    </target>
- +
++-    <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux" />
 ++    <target name="c.configure.linux.hppa" if="isLinuxHPPA">
 ++      <echo message="Linux.HPPA" />
 ++      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
 ++      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
 ++    </target>
 ++
 ++    <target name="c.configure.linux.mips" if="isLinuxMIPS">
 ++      <echo message="Linux.MIPS" />
 ++      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
 ++      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
 ++    </target>
 ++
 ++    <target name="c.configure.linux.mipsel" if="isLinuxMIPSEL">
 ++      <echo message="Linux.MIPSEL" />
 ++      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
 ++      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
 ++    </target>
 ++
 ++    <target name="c.configure.linux.ppc" if="isLinuxPPC">
 ++      <echo message="Linux.PPC" />
 ++      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
 ++      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
 ++    </target>
 ++
 ++    <target name="c.configure.linux.s390" if="isLinuxS390">
 ++      <echo message="Linux.S390" />
 ++      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
 ++      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
 ++    </target>
 ++
 ++    <target name="c.configure.linux.sparc" if="isLinuxSPARC">
 ++      <echo message="Linux.SPARC" />
 ++      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
 ++      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
 ++    </target>
 ++
- +    <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.armel,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+++    <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
 + 
-      <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit">
-        <echo message="Solaris" />
++     <target name="c.configure.android" if="isAndroid">
++       <echo message="Android" />
diff --cc debian/patches/series
index b687149,0000000..a0dcb9a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,6 @@@
 +variousFixes.diff
- disableOneDir.diff
++#disableOneDir.diff
 +swt.diff
 +otherArchsoswin.diff
++disable_android.diff
 +
diff --cc debian/patches/swt.diff
index 1fbfad8,0000000..3ceef9d
mode 100644,000000..100644
--- a/debian/patches/swt.diff
+++ b/debian/patches/swt.diff
@@@ -1,18 -1,0 +1,21 @@@
 +Index: jogl-v2.0-rc2/make/build-common.xml
 +===================================================================
 +--- jogl-v2.0-rc2.orig/make/build-common.xml	2011-04-19 09:40:43.000000000 +0200
 ++++ jogl-v2.0-rc2/make/build-common.xml	2011-04-19 09:42:06.000000000 +0200
- @@ -99,11 +99,8 @@
++@@ -130,14 +130,8 @@
 +         <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar">
 +           <istrue value="${isWindowsX86}" />
 +         </condition>
 +-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt-debug.jar">
 +-          <istrue value="${isLinuxAMD64}" />
 +-        </condition>
 +-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
 +-          <istrue value="${isLinuxX86}" />
++-        </condition>
++-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
++-          <istrue value="${isLinuxARMv7}" /> <!-- FIXME JAU .. hack -->
 ++        <condition property="swt.jar" value="/usr/share/java/swt.jar">
 ++          <istrue value="${isLinux}" />
 +         </condition>
-          <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar">
-            <and>
++         <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
++           <istrue value="${isAndroid}" /> <!-- FIXME JAU .. hack -->
diff --cc debian/patches/variousFixes.diff
index 261d15b,0000000..eb8223f
mode 100644,000000..100644
--- a/debian/patches/variousFixes.diff
+++ b/debian/patches/variousFixes.diff
@@@ -1,69 -1,0 +1,63 @@@
- diff -ur jogl-v2.0-rc2.orig/make/build-common.xml jogl-v2.0-rc2/make/build-common.xml
- --- jogl-v2.0-rc2.orig/make/build-common.xml	2011-03-02 20:52:40.000000000 +0100
- +++ jogl-v2.0-rc2/make/build-common.xml	2011-04-17 15:28:58.000000000 +0200
- @@ -13,13 +13,11 @@
++Index: libjogl2-java-2.0-rc3/make/build-common.xml
++===================================================================
++--- libjogl2-java-2.0-rc3.orig/make/build-common.xml	2011-10-06 15:52:37.000000000 +0200
+++++ libjogl2-java-2.0-rc3/make/build-common.xml	2011-10-06 16:09:03.000000000 +0200
++@@ -13,13 +13,13 @@
 +     </fail>
 + 
 +     <!-- Pull in GlueGen cpptasks build file -->
 +-    <property name="gluegen.root" value="../../gluegen" />
 ++    <property name="gluegen.root" value="/usr/share/gluegen2/" />
 +     <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
 +     <import file="${gluegen.root}/make/jogamp-archivetasks.xml" />
++     <import file="${gluegen.root}/make/jogamp-androidtasks.xml" />
 +     <import file="${gluegen.root}/make/jogamp-env.xml" />
 + 
 +-    <property name="ant-contrib.jar"  value="${gluegen.root}/make/lib/ant-contrib-1.0b3.jar" />
- -
+++    <property name="ant-contrib.jar"  value="/usr/share/java/ant-contrib.jar" />
++ 
 +     <condition property="rootrel.build" value="build">
 +       <not>
-            <isset property="rootrel.build"/>
- @@ -150,7 +148,7 @@
++@@ -198,7 +192,7 @@
 +         <property name="gluegen.build.xml"          value="${gluegen.make}/build.xml" />
 +         <property name="build.gluegen"              value="${gluegen.root}/${rootrel.build}" />
 +         <property name="obj.gluegen"                value="${build.gluegen}/obj"/>
 +-        <property name="gluegen.jar"                value="${build.gluegen}/gluegen.jar" />
 ++        <property name="gluegen.jar"                value="/usr/share/java/gluegen2.jar" />
 +         <property name="ant.jar"                    value="${ant.home}/lib/ant.jar" />
 +         <property name="ant-junit.jar"              value="${ant.home}/lib/ant-junit.jar" />
 + 
- @@ -192,7 +190,7 @@
++@@ -373,7 +367,7 @@
 +         </path>
 + 
 +         <!-- JavaSE combinations -->
- -        <property name="gluegen-rt.jar"             value="${build.gluegen}/gluegen-rt.jar" />
- +        <property name="gluegen-rt.jar"             value="/usr/share/java/gluegen2-rt.jar" />
-          <property name="jogl.test.jar"              value="${build.jogl}/jogl.test.jar"/>
++-        <property name="gluegen-rt.jar"                 value="${build.gluegen}/gluegen-rt.jar" />
+++        <property name="gluegen-rt.jar"                 value="/usr/share/java/gluegen2-rt.jar" />
++         <property name="jogl.test.jar"                  value="${jar}/jogl.test.jar"/>
 + 
 +         <!-- JavaSE combinations . AWT -->
- @@ -362,7 +360,10 @@
++@@ -494,7 +488,10 @@
 + 
 +         <!-- Run the GlueGen build to ensure that the GlueGen ANT task
 +            - has been built. -->
 +-        <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="base.compile" inheritAll="false"/>
 ++        <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="base.compile" inheritAll="false">
 ++          <property name="build" value="${basedir}/../"/>
 ++          <property name="test.dir" value="${basedir}/../test"/>
 ++        </ant>
 +     </target>
 + 
 + 
- diff -ur jogl-v2.0-rc2.orig/make/build.xml jogl-v2.0-rc2/make/build.xml
- --- jogl-v2.0-rc2.orig/make/build.xml	2011-03-02 20:52:40.000000000 +0100
- +++ jogl-v2.0-rc2/make/build.xml	2011-04-17 15:26:47.000000000 +0200
- @@ -86,7 +86,7 @@
-          <delete includeEmptyDirs="true" quiet="true" dir="${jar}" failonerror="false" />
-          <mkdir dir="${jar}" />
-          <copy todir="${jar}">
- -            <fileset dir="${gluegen.root}/${rootrel.build}" includes="gluegen-rt*.jar" />
- +<!--            <fileset dir="${gluegen.root}/${rootrel.build}" includes="gluegen-rt*.jar" />-->
-              <fileset dir="${build}/jogl" includes="*.jar" />
-              <fileset dir="${build}/nativewindow" includes="*.jar" />
-              <fileset dir="${build}/newt" includes="*.jar" />
- @@ -159,7 +159,7 @@
++Index: libjogl2-java-2.0-rc3/make/build.xml
++===================================================================
++--- libjogl2-java-2.0-rc3.orig/make/build.xml	2011-10-06 15:52:37.000000000 +0200
+++++ libjogl2-java-2.0-rc3/make/build.xml	2011-10-06 16:03:43.000000000 +0200
++@@ -325,7 +325,7 @@
 +     </target>
 + 
 +     <target name="tag.build" depends="init">
 +-        <copy file="${build.gluegen}/artifact.properties" todir="${build}" overwrite="true"/>
 ++        <copy file="/usr/share/gluegen2/artifact.properties" todir="${build}" overwrite="true"/>
 +         <echo message='jogl.build.number=${jogl.build.number}${line.separator}' file="${build}/artifact.properties" append="true"/>
 +         <echo message='jogl.build.id=${jogl.build.id}${line.separator}'         file="${build}/artifact.properties" append="true"/>
 +         <echo message='jogl.build.branch=${jogl.build.branch}${line.separator}' file="${build}/artifact.properties" append="true"/>
diff --cc debian/rules
index dd6eb46,0000000..ea6f805
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,21 -1,0 +1,21 @@@
 +#!/usr/bin/make -f
 +
 +include /usr/share/cdbs/1/rules/debhelper.mk
 +include /usr/share/cdbs/1/class/ant.mk
 +include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 +
 +JAVA_HOME            := /usr/lib/jvm/default-java/
 +DEB_JARS             := ant-contrib ant-contrib-cpptasks ant-nodeps antlr ant-antlr swt
- DEB_ANT_ARGS         := -Dsetup.noCDC=true
++DEB_ANT_ARGS         := -Dsetup.noCDC=true 
 +DEB_ANT_CLEAN_TARGET := clean
- DEB_ANT_BUILD_TARGET := all
++DEB_ANT_BUILD_TARGET := all javadoc.all
 +DEB_ANT_BUILDFILE    := make/build.xml
 +
- install/libjogl-java-doc::
- 	$(DEB_ANT_INVOKE) javadoc
++common-install-prehook-indep::
++	mv build/jar/jogl.all.jar build/jar/jogl2.jar
 +
 +clean::
 +	$(RM) -r gluegen/build
 +
 +get-orig-source::
 +	-uscan --upstream-version 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjogl2-java.git



More information about the pkg-java-commits mailing list