[libjogl2-java] 23/58: Imported Debian patch 2.0-rc8-1~exp1

Tony Mancill tmancill at moszumanska.debian.org
Thu Sep 4 03:59:13 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 f5bdc192459cd87b537204adc957fa52e3dd2065
Merge: 03ac8df 8d5d8b6
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Wed May 23 14:23:19 2012 +0200

    Imported Debian patch 2.0-rc8-1~exp1

 .classpath                                         |    3 +-
 .externalToolBuilders/jogl builder.launch          |    5 -
 LICENSE.txt                                        |   27 +-
 debian/changelog                                   |   12 +
 debian/control                                     |    8 +-
 debian/patches/TARGET_PLATFORM_LIBS_2.diff         |   20 +-
 debian/patches/disable_android.diff                |   29 +-
 debian/patches/disable_android_3.diff              |   29 +-
 debian/patches/manifest.diff                       |   15 +
 debian/patches/series                              |    9 +-
 debian/patches/variousFixes.diff                   |   22 +-
 doc/Platform.Applets.txt                           |   23 +
 doc/Platform.GLES.txt                              |  112 +
 doc/Platforms.txt                                  |   62 +
 doc/userguide/index.html                           | 1051 +++--
 etc/profile.jogl                                   |    4 +-
 ...nner-newt-ElektronenMultiplizierer-napplet.html |    2 -
 ...pplet-runner-newt-ElektronenMultiplizierer.html |    2 -
 ...applet-runner-newt-GraphTextDemo01-napplet.html |    2 -
 .../jogl-applet-runner-newt-GraphTextDemo01.html   |    2 -
 ...let-runner-newt-GraphUISceneDemo01-napplet.html |    2 -
 ...jogl-applet-runner-newt-GraphUISceneDemo01.html |    2 -
 ...jogl-applet-runner-newt-MovieCube-napplet.html} |   26 +-
 ...html => jogl-applet-runner-newt-MovieCube.html} |   30 +-
 ...plet-runner-newt-gears-normal-launcheronly.html |    8 +-
 ...gl-applet-runner-newt-gears-normal-napplet.html |    4 -
 ...-applet-runner-newt-gears-normal-napplet2.html} |   11 +-
 .../jogl-applet-runner-newt-gears-normal.html      |    5 -
 ...l-applet-runner-newt-gears-special-napplet.html |    2 -
 .../jogl-applet-runner-newt-gears-special.html     |    2 -
 jnlp-files/jogl-applet-runner-newt.jnlp            |    1 -
 jnlp-files/jogl-test-applets.html                  |   17 +-
 make/build-common.xml                              |   39 +-
 make/build-jogl.xml                                |  223 +-
 make/build-nativewindow.xml                        |  119 +-
 make/build-newt.xml                                |   86 +-
 make/build-staticglgen.xml                         |   12 +-
 make/build-test.xml                                |  474 +-
 make/build.xml                                     |   73 +-
 make/config/jogl/cg-common.cfg                     |    1 +
 make/config/jogl/egl-common.cfg                    |    8 +-
 make/config/jogl/gl-common-extensions.cfg          |   34 +-
 make/config/jogl/gl-common.cfg                     |   74 +-
 make/config/jogl/gl-es1.cfg                        |    6 +-
 make/config/jogl/gl-es2.cfg                        |    4 +-
 make/config/jogl/gl-gl4bc.cfg                      |   14 +-
 make/config/jogl/gl-if-CustomJavaCode-gl2_es2.java |    2 +
 make/config/jogl/gl-if-CustomJavaCode-gl2_gl3.java |    2 +
 make/config/jogl/gl-if-gl-ignores.cfg              |  133 +-
 make/config/jogl/gl-if-gl.cfg                      |    5 +-
 make/config/jogl/gl-if-gl2.cfg                     |   16 +-
 make/config/jogl/gl-if-gl2_es1.cfg                 |    9 +-
 make/config/jogl/gl-if-gl2_es2.cfg                 |    9 +-
 make/config/jogl/gl-if-gl2_gl3.cfg                 |   11 +-
 make/config/jogl/gl-if-gl3-ignores.cfg             |    2 +-
 make/config/jogl/gl-if-gl3-subset.cfg              |    2 +
 make/config/jogl/gl-if-gl3.cfg                     |   11 +-
 make/config/jogl/gl-if-gl3bc.cfg                   |   13 +-
 make/config/jogl/gl-if-gl4.cfg                     |   11 +-
 .../config/jogl/gl-impl-CustomJavaCode-common.java |   11 +-
 .../jogl/gl-impl-CustomJavaCode-desktop.java       |    3 +
 make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java |    2 +-
 make/config/jogl/gl-impl-CustomJavaCode-gles1.java |    6 +-
 make/config/jogl/gl-impl-CustomJavaCode-gles2.java |    6 +-
 make/config/jogl/glu-common.cfg                    |    1 +
 make/config/jogl/wgl-win32.cfg                     |    5 +
 make/config/nativewindow/jawt-CustomJavaCode.java  |   35 +-
 .../jawt-DrawingSurfaceInfo-CustomJavaCode.java    |    2 +-
 make/config/nativewindow/x11-CustomJavaCode.java   |    2 +-
 make/config/nativewindow/x11-lib.cfg               |    2 +
 .../resources/android/AndroidManifest-launcher.xml |  130 -
 make/resources/android/AndroidManifest-test.xml    |  143 +
 .../{res-launcher => res-jogl}/values/colors.xml   |    0
 .../{res-launcher => res-jogl}/values/styles.xml   |    0
 .../drawable-hdpi/icon.png                         |  Bin
 .../drawable-ldpi/icon.png                         |  Bin
 .../drawable-mdpi/icon.png                         |  Bin
 .../{res-launcher => res-test}/layout/main.xml     |    0
 .../{res-launcher => res-test}/values/strings.xml  |   14 +-
 make/resources/assets-test/placeholder.txt         |    1 +
 .../jogl/util/data/av/test-ntsc01-160x90.png       |  Bin 0 -> 2785 bytes
 ...adb-install-all.sh => adb-install-all-armv7.sh} |    2 +-
 make/scripts/adb-launch-activity.sh                |   11 +
 make/scripts/adb-launch-main.sh                    |   69 +
 make/scripts/adb-power-alwayson.sh                 |    3 +
 ...reinstall-all.sh => adb-reinstall-all-armv7.sh} |    2 +-
 make/scripts/adb-uninstall-all.sh                  |    2 +-
 make/scripts/check-java-major-version.sh           |   27 +
 make/scripts/crosstest-java-android-armv7-rel.sh   |   69 -
 make/scripts/crosstest-launch-android-activity.sh  |   17 -
 make/scripts/gluegen-gl.sh                         |   93 +
 make/scripts/java-win32-dbg.bat                    |   24 +-
 make/scripts/java-win32.bat                        |   16 +-
 make/scripts/java-win64-dbg.bat                    |   28 +-
 make/scripts/java-win64.bat                        |    9 +-
 make/scripts/make.jogl.all.android-armv7-cross.sh  |  104 +-
 make/scripts/make.jogl.all.linux-armv7-cross.sh    |   32 +-
 make/scripts/make.jogl.all.linux-armv7.sh          |   27 +
 make/scripts/make.jogl.all.linux-armv7hf-cross.sh  |   51 +
 make/scripts/make.jogl.all.linux-x86_64.sh         |    8 +
 make/scripts/make.jogl.all.macosx.sh               |   12 +-
 make/scripts/make.jogl.all.win32.bat               |    4 +-
 make/scripts/make.jogl.all.win64.bat               |    4 +-
 make/scripts/targetcommand-awt.sh                  |   59 +
 make/scripts/targetcommand-newt.sh                 |  124 +
 make/scripts/tests-javaws-x64.bat                  |    2 +-
 make/scripts/tests-linux-armv7.sh                  |    7 +
 make/scripts/tests-linux-armv7hf.sh                |    7 +
 make/scripts/tests-osx-x32.sh                      |    7 +
 make/scripts/tests-osx-x64.sh                      |    2 +
 make/scripts/tests-x32.bat                         |   78 +-
 make/scripts/tests-x64.bat                         |   46 +-
 make/scripts/tests-x64.sh                          |    2 +
 make/scripts/tests.sh                              |  112 +-
 make/stub_includes/egl/EGL/egl.h                   |    8 +-
 make/stub_includes/egl/EGL/eglext.h                |   76 +-
 make/stub_includes/egl/EGL/eglplatform.h           |    6 +-
 make/stub_includes/libav/libavcodec/avcodec.h      | 4761 ++++++++++++++++++++
 make/stub_includes/libav/libavcodec/avfft.h        |   99 +
 make/stub_includes/libav/libavcodec/dxva2.h        |   71 +
 make/stub_includes/libav/libavcodec/opt.h          |   34 +
 make/stub_includes/libav/libavcodec/vaapi.h        |  167 +
 make/stub_includes/libav/libavcodec/vda.h          |  144 +
 make/stub_includes/libav/libavcodec/vdpau.h        |   88 +
 make/stub_includes/libav/libavcodec/version.h      |  126 +
 make/stub_includes/libav/libavcodec/xvmc.h         |  151 +
 make/stub_includes/libav/libavformat/avformat.h    | 2026 +++++++++
 make/stub_includes/libav/libavformat/avio.h        |  688 +++
 make/stub_includes/libav/libavformat/version.h     |  126 +
 make/stub_includes/libav/libavutil/adler32.h       |   43 +
 make/stub_includes/libav/libavutil/aes.h           |   57 +
 make/stub_includes/libav/libavutil/attributes.h    |  136 +
 make/stub_includes/libav/libavutil/audioconvert.h  |  130 +
 make/stub_includes/libav/libavutil/avassert.h      |   66 +
 make/stub_includes/libav/libavutil/avconfig.h      |    6 +
 make/stub_includes/libav/libavutil/avstring.h      |  175 +
 make/stub_includes/libav/libavutil/avutil.h        |  326 ++
 make/stub_includes/libav/libavutil/base64.h        |   65 +
 make/stub_includes/libav/libavutil/bswap.h         |  109 +
 make/stub_includes/libav/libavutil/common.h        |  398 ++
 make/stub_includes/libav/libavutil/cpu.h           |   56 +
 make/stub_includes/libav/libavutil/crc.h           |   44 +
 make/stub_includes/libav/libavutil/dict.h          |  121 +
 make/stub_includes/libav/libavutil/error.h         |   81 +
 make/stub_includes/libav/libavutil/eval.h          |  113 +
 make/stub_includes/libav/libavutil/fifo.h          |  141 +
 make/stub_includes/libav/libavutil/file.h          |   52 +
 make/stub_includes/libav/libavutil/imgutils.h      |  138 +
 make/stub_includes/libav/libavutil/intfloat.h      |   73 +
 .../libav/libavutil/intfloat_readwrite.h           |   40 +
 make/stub_includes/libav/libavutil/intreadwrite.h  |  522 +++
 make/stub_includes/libav/libavutil/lfg.h           |   62 +
 make/stub_includes/libav/libavutil/log.h           |  172 +
 make/stub_includes/libav/libavutil/lzo.h           |   77 +
 make/stub_includes/libav/libavutil/mathematics.h   |  122 +
 make/stub_includes/libav/libavutil/md5.h           |   46 +
 make/stub_includes/libav/libavutil/mem.h           |  136 +
 make/stub_includes/libav/libavutil/opt.h           |  591 +++
 make/stub_includes/libav/libavutil/parseutils.h    |  124 +
 make/stub_includes/libav/libavutil/pixdesc.h       |  177 +
 make/stub_includes/libav/libavutil/pixfmt.h        |  198 +
 make/stub_includes/libav/libavutil/random_seed.h   |   44 +
 make/stub_includes/libav/libavutil/rational.h      |  144 +
 make/stub_includes/libav/libavutil/samplefmt.h     |  148 +
 make/stub_includes/libav/libavutil/sha.h           |   66 +
 make/stub_includes/opengl/GL/glext.h               |  523 ++-
 make/stub_includes/opengl/GL3/gl3.h                |  385 +-
 make/stub_includes/opengl/GL3/gl3ext.h             |  236 +-
 make/stub_includes/opengl/GLES/glext.h             |  129 +-
 make/stub_includes/opengl/GLES2/gl2.h              |    2 +-
 make/stub_includes/opengl/GLES2/gl2ext.h           |  591 ++-
 make/stub_includes/opengl/macosx-window-system.h   |    5 +-
 make/stub_includes/win32/windows.h                 |   10 -
 make/stub_includes/win32/wingdi.h                  |  165 +-
 .../win32/{wingdi.h => wingdi_types.h}             |   73 +-
 make/stub_includes/win32/winwgl.h                  |   11 +-
 make/stub_includes/x11/window-lib.c                |    5 +-
 .../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    |    6 +-
 .../jogamp/gluegen/opengl/BuildStaticGLInfo.java   |   24 +-
 .../com/jogamp/gluegen/opengl/GLConfiguration.java |   22 +-
 .../com/jogamp/gluegen/opengl/GLEmitter.java       |   84 +-
 .../gluegen/opengl/GLJavaMethodBindingEmitter.java |    5 +-
 .../opengl/nativesig/NativeSignatureEmitter.java   |    2 +
 .../NativeSignatureJavaMethodBindingEmitter.java   |   17 +-
 .../com/jogamp/graph/curve/opengl/GLRegion.java    |   10 +-
 .../jogamp/graph/curve/opengl/RegionRenderer.java  |   11 +-
 .../jogamp/graph/curve/opengl/TextRenderer.java    |    5 +-
 .../classes/com/jogamp/graph/font/FontFactory.java |   14 +-
 .../classes/com/jogamp/graph/font/FontSet.java     |    6 +-
 src/jogl/classes/com/jogamp/opengl/FloatUtil.java  |  289 ++
 .../classes/com/jogamp/opengl/JoglVersion.java     |   77 +-
 .../opengl/cg/CgDynamicLibraryBundleInfo.java      |   14 +
 .../classes/com/jogamp/opengl/swt/GLCanvas.java    |  563 +++
 .../classes/com/jogamp/opengl/util/Animator.java   |   15 +-
 .../com/jogamp/opengl/util/AnimatorBase.java       |    4 +-
 .../classes/com/jogamp/opengl/util/FBObject.java   |   27 +-
 .../com/jogamp/opengl/util/GLArrayDataClient.java  |   51 +-
 .../com/jogamp/opengl/util/GLArrayDataServer.java  |   61 +-
 .../com/jogamp/opengl/util/GLArrayDataWrapper.java |   28 +-
 .../classes/com/jogamp/opengl/util/GLBuffers.java  |    2 +-
 .../com/jogamp/opengl/util/GLReadBufferUtil.java   |   57 +-
 .../com/jogamp/opengl/util/ImmModeSink.java        |   70 +-
 .../classes/com/jogamp/opengl/util/PMVMatrix.java  |  233 +-
 .../com/jogamp/opengl/util/av/GLMediaPlayer.java   |  248 +
 .../opengl/util/av/GLMediaPlayerFactory.java}      |   54 +-
 .../classes/com/jogamp/opengl/util/av/package.html |   25 +
 .../com/jogamp/opengl/util/awt/TextRenderer.java   |   10 +-
 .../com/jogamp/opengl/util/glsl/ShaderCode.java    |  659 ++-
 .../com/jogamp/opengl/util/glsl/ShaderProgram.java |   25 +-
 .../com/jogamp/opengl/util/glsl/ShaderState.java   |   78 +-
 .../com/jogamp/opengl/util/glsl/ShaderUtil.java    |  618 ++-
 .../jogamp/opengl/util/glsl/sdk/CompileShader.java |    9 +-
 .../com/jogamp/opengl/util/texture/Texture.java    |   39 +-
 .../jogamp/opengl/util/texture/TextureCoords.java  |   18 +
 .../jogamp/opengl/util/texture/TextureData.java    |    2 +-
 .../com/jogamp/opengl/util/texture/TextureIO.java  |  187 +-
 .../opengl/util/texture/TextureSequence.java       |  221 +
 .../opengl/util/texture/awt/AWTTextureData.java    |    6 +-
 .../jogamp/opengl/util/texture/spi/DDSImage.java   |   26 +-
 .../util/texture/spi/NetPbmTextureWriter.java      |   80 +-
 .../jogamp/opengl/util/texture/spi/PNGImage.java   |  172 +
 .../jogamp/opengl/util/texture/spi/SGIImage.java   |    5 +-
 .../jogamp/opengl/util/texture/spi/TGAImage.java   |   40 +-
 .../com/jogamp/openmax/OMXEventListener.java       |   14 -
 .../classes/com/jogamp/openmax/OMXInstance.java    |  509 ---
 .../media/opengl/DefaultGLCapabilitiesChooser.java |   36 +-
 .../classes/javax/media/opengl/GLArrayData.java    |    7 +-
 .../classes/javax/media/opengl/GLAutoDrawable.java |   11 +-
 src/jogl/classes/javax/media/opengl/GLBase.java    |   73 +-
 .../classes/javax/media/opengl/GLCapabilities.java |    6 +-
 src/jogl/classes/javax/media/opengl/GLContext.java |  441 +-
 .../javax/media/opengl/GLDrawableFactory.java      |   38 +-
 .../javax/media/opengl/GLPipelineFactory.java      |    2 +-
 src/jogl/classes/javax/media/opengl/GLProfile.java |  596 ++-
 .../classes/javax/media/opengl/GLRunnable.java     |   14 +-
 .../classes/javax/media/opengl/GLUniformData.java  |    6 +-
 src/jogl/classes/javax/media/opengl/Threading.java |   60 +-
 .../classes/javax/media/opengl/awt/GLCanvas.java   |  386 +-
 .../classes/javax/media/opengl/awt/GLJPanel.java   |  318 +-
 .../graph/curve/opengl/RegionRendererImpl01.java   |   12 +-
 .../graph/curve/opengl/TextRendererImpl01.java     |   13 +-
 .../jogamp/graph/curve/opengl/VBORegion2PES2.java  |   42 +-
 .../jogamp/graph/curve/opengl/VBORegionSPES2.java  |   10 +-
 .../jogamp/graph/curve/text/GlyphString.java       |   13 +-
 .../classes/jogamp/graph/font/FontConstructor.java |    4 +-
 .../classes/jogamp/graph/font/JavaFontLoader.java  |   10 +-
 .../jogamp/graph/font/UbuntuFontLoader.java        |   19 +-
 .../font/typecast/TypecastFontConstructor.java     |   26 +-
 .../graph/font/typecast/ot/Disassembler.java       |    2 +-
 .../graph/font/typecast/ot/OTFontCollection.java   |    2 +-
 .../graph/font/typecast/ot/mac/ResourceType.java   |    2 +-
 .../graph/font/typecast/ot/table/BaseTable.java    |   10 +-
 .../graph/font/typecast/ot/table/CffTable.java     |   18 +-
 .../font/typecast/ot/table/CharstringType2.java    |    4 +-
 .../graph/font/typecast/ot/table/CmapFormat.java   |    2 +-
 .../graph/font/typecast/ot/table/CmapFormat4.java  |    2 +-
 .../font/typecast/ot/table/CmapIndexEntry.java     |    2 +-
 .../graph/font/typecast/ot/table/CmapTable.java    |    2 +-
 .../graph/font/typecast/ot/table/CvtTable.java     |    2 +-
 .../font/typecast/ot/table/DirectoryEntry.java     |    4 +-
 .../graph/font/typecast/ot/table/DsigTable.java    |    2 +-
 .../font/typecast/ot/table/FeatureRecord.java      |    2 +-
 .../graph/font/typecast/ot/table/GaspRange.java    |    2 +-
 .../graph/font/typecast/ot/table/GaspTable.java    |    2 +-
 .../graph/font/typecast/ot/table/GlyfDescript.java |    2 +-
 .../font/typecast/ot/table/GlyfSimpleDescript.java |    2 +-
 .../graph/font/typecast/ot/table/HdmxTable.java    |    2 +-
 .../graph/font/typecast/ot/table/HeadTable.java    |    2 +-
 .../graph/font/typecast/ot/table/HheaTable.java    |    2 +-
 .../graph/font/typecast/ot/table/HmtxTable.java    |    2 +-
 .../font/typecast/ot/table/LangSysRecord.java      |    2 +-
 .../graph/font/typecast/ot/table/LocaTable.java    |    2 +-
 .../graph/font/typecast/ot/table/LtshTable.java    |    2 +-
 .../graph/font/typecast/ot/table/MaxpTable.java    |    2 +-
 .../graph/font/typecast/ot/table/NameRecord.java   |    4 +-
 .../graph/font/typecast/ot/table/Os2Table.java     |    4 +-
 .../graph/font/typecast/ot/table/Panose.java       |    2 +-
 .../graph/font/typecast/ot/table/PcltTable.java    |    2 +-
 .../graph/font/typecast/ot/table/PostTable.java    |    2 +-
 .../graph/font/typecast/ot/table/ScriptRecord.java |    2 +-
 .../font/typecast/ot/table/SignatureBlock.java     |    2 +-
 .../font/typecast/ot/table/TableDirectory.java     |    2 +-
 .../graph/font/typecast/ot/table/VdmxTable.java    |    2 +-
 .../graph/font/typecast/ot/table/VheaTable.java    |    2 +-
 .../graph/font/typecast/ot/table/VmtxTable.java    |    2 +-
 .../graph/font/typecast/t2/T2Interpreter.java      |    6 +-
 .../graph/font/typecast/tt/engine/Parser.java      |    2 +-
 src/jogl/classes/jogamp/opengl/Debug.java          |   82 +-
 .../opengl/DesktopGLDynamicLibraryBundleInfo.java  |    3 +-
 .../jogamp/opengl/ExtensionAvailabilityCache.java  |  196 +-
 src/jogl/classes/jogamp/opengl/GLContextImpl.java  |  575 ++-
 .../jogamp/opengl/GLDrawableFactoryImpl.java       |    3 +-
 .../classes/jogamp/opengl/GLDrawableHelper.java    |  201 +-
 src/jogl/classes/jogamp/opengl/GLDrawableImpl.java |    8 +-
 .../jogamp/opengl/GLDynamicLibraryBundleInfo.java  |   18 +-
 .../jogamp/opengl/GLGraphicsConfigurationUtil.java |    4 +-
 src/jogl/classes/jogamp/opengl/GLPbufferImpl.java  |   21 +-
 src/jogl/classes/jogamp/opengl/GLWorkerThread.java |   33 +-
 src/jogl/classes/jogamp/opengl/MemoryObject.java   |    4 +-
 src/jogl/classes/jogamp/opengl/ProjectFloat.java   |  496 +-
 .../jogamp/opengl/SharedResourceRunner.java        |    4 +-
 src/jogl/classes/jogamp/opengl/ThreadingImpl.java  |  154 +-
 ...dingPlugin.java => ToolkitThreadingPlugin.java} |   11 +-
 .../android/av/AndroidGLMediaPlayerAPI14.java      |  262 ++
 .../jogamp/opengl/awt/AWTThreadingPlugin.java      |   55 +-
 src/jogl/classes/jogamp/opengl/awt/AWTUtil.java    |   20 +-
 src/jogl/classes/jogamp/opengl/awt/Java2D.java     |   73 +-
 .../DesktopES2DynamicLibraryBundleInfo.java}       |   82 +-
 src/jogl/classes/jogamp/opengl/egl/EGLContext.java |   90 +-
 .../classes/jogamp/opengl/egl/EGLDisplayUtil.java  |  133 +
 .../classes/jogamp/opengl/egl/EGLDrawable.java     |  123 +-
 .../jogamp/opengl/egl/EGLDrawableFactory.java      |  157 +-
 .../opengl/egl/EGLDynamicLibraryBundleInfo.java    |   36 +-
 .../opengl/egl/EGLES1DynamicLibraryBundleInfo.java |    7 +-
 .../opengl/egl/EGLES2DynamicLibraryBundleInfo.java |    7 +-
 .../jogamp/opengl/egl/EGLExternalContext.java      |    2 +-
 .../jogamp/opengl/egl/EGLGLCapabilities.java       |   61 +-
 .../opengl/egl/EGLGraphicsConfiguration.java       |   72 +-
 .../egl/EGLGraphicsConfigurationFactory.java       |  255 +-
 src/jogl/classes/jogamp/opengl/gl2/Util.java       |  244 -
 .../classes/jogamp/opengl/glu/mipmap/Mipmap.java   |    8 +-
 .../jogamp/opengl/macosx/cgl/MacOSXCGLContext.java |   71 +-
 .../opengl/macosx/cgl/MacOSXCGLDrawable.java       |    4 +-
 .../macosx/cgl/MacOSXCGLDrawableFactory.java       |   50 +-
 .../cgl/MacOSXCGLDynamicLibraryBundleInfo.java     |    3 +
 .../macosx/cgl/MacOSXCGLGraphicsConfiguration.java |   27 +-
 .../cgl/MacOSXCGLGraphicsConfigurationFactory.java |    4 +-
 .../macosx/cgl/MacOSXExternalCGLContext.java       |    5 +-
 .../macosx/cgl/MacOSXPbufferCGLDrawable.java       |    8 +-
 .../MacOSXAWTCGLGraphicsConfigurationFactory.java  |   13 +-
 .../macosx/cgl/awt/MacOSXJava2DCGLContext.java     |    2 +-
 .../jogamp/opengl/util/av/EGLMediaPlayerImpl.java  |  169 +
 .../jogamp/opengl/util/av/GLMediaPlayerImpl.java   |  575 +++
 .../jogamp/opengl/util/av/NullGLMediaPlayer.java   |  173 +
 .../av/impl/FFMPEGDynamicLibraryBundleInfo.java    |  270 ++
 .../opengl/util/av/impl/FFMPEGMediaPlayer.java     |  544 +++
 .../opengl/util/av/impl/OMXGLMediaPlayer.java      |  228 +
 .../opengl/util/glsl/fixedfunc/FixedFuncHook.java  |   15 +-
 .../util/glsl/fixedfunc/FixedFuncPipeline.java     |   27 +-
 .../jogamp/opengl/util/pngj/FilterType.java        |   94 +
 .../opengl/util/pngj/FilterWriteStrategy.java      |   97 +
 .../classes/jogamp/opengl/util/pngj/ImageInfo.java |  208 +
 .../classes/jogamp/opengl/util/pngj/ImageLine.java |  175 +
 .../classes/jogamp/opengl/util/pngj/PngHelper.java |  213 +
 .../opengl/util/pngj/PngIDatChunkInputStream.java  |  153 +
 .../opengl/util/pngj/PngIDatChunkOutputStream.java |   31 +
 .../classes/jogamp/opengl/util/pngj/PngReader.java |  415 ++
 .../classes/jogamp/opengl/util/pngj/PngWriter.java |  462 ++
 .../opengl/util/pngj/PngjBadCrcException.java      |   20 +
 .../jogamp/opengl/util/pngj/PngjException.java     |   23 +
 .../opengl/util/pngj/PngjInputException.java       |   20 +
 .../opengl/util/pngj/PngjOutputException.java      |   20 +
 .../opengl/util/pngj/PngjUnsupportedException.java |   24 +
 .../opengl/util/pngj/ProgressiveOutputStream.java  |   71 +
 .../util/pngj/chunks/ChunkCopyBehaviour.java       |   24 +
 .../opengl/util/pngj/chunks/ChunkHelper.java       |  134 +
 .../jogamp/opengl/util/pngj/chunks/ChunkList.java  |  282 ++
 .../util/pngj/chunks/ChunkLoadBehaviour.java       |   10 +
 .../jogamp/opengl/util/pngj/chunks/ChunkRaw.java   |   83 +
 .../jogamp/opengl/util/pngj/chunks/PngChunk.java   |  152 +
 .../opengl/util/pngj/chunks/PngChunkBKGD.java      |  122 +
 .../opengl/util/pngj/chunks/PngChunkCHRM.java      |   88 +
 .../opengl/util/pngj/chunks/PngChunkGAMA.java      |   56 +
 .../opengl/util/pngj/chunks/PngChunkHIST.java      |   67 +
 .../opengl/util/pngj/chunks/PngChunkICCP.java      |   85 +
 .../opengl/util/pngj/chunks/PngChunkIDAT.java      |   25 +
 .../opengl/util/pngj/chunks/PngChunkIEND.java      |   26 +
 .../opengl/util/pngj/chunks/PngChunkIHDR.java      |  126 +
 .../opengl/util/pngj/chunks/PngChunkITXT.java      |  119 +
 .../opengl/util/pngj/chunks/PngChunkPHYS.java      |  108 +
 .../opengl/util/pngj/chunks/PngChunkPLTE.java      |   93 +
 .../opengl/util/pngj/chunks/PngChunkSBIT.java      |  124 +
 .../opengl/util/pngj/chunks/PngChunkSPLT.java      |  139 +
 .../opengl/util/pngj/chunks/PngChunkSRGB.java      |   61 +
 .../opengl/util/pngj/chunks/PngChunkTEXT.java      |   34 +
 .../opengl/util/pngj/chunks/PngChunkTIME.java      |   83 +
 .../opengl/util/pngj/chunks/PngChunkTRNS.java      |  129 +
 .../opengl/util/pngj/chunks/PngChunkTextVar.java   |   61 +
 .../opengl/util/pngj/chunks/PngChunkUNKNOWN.java   |   51 +
 .../opengl/util/pngj/chunks/PngChunkZTXT.java      |   62 +
 .../opengl/util/pngj/chunks/PngMetadata.java       |  135 +
 .../jogamp/opengl/util/pngj/chunks/package.html    |    9 +
 .../classes/jogamp/opengl/util/pngj/package.html   |   11 +
 .../opengl/windows/wgl/WGLGLCapabilities.java      |   56 +-
 .../classes/jogamp/opengl/windows/wgl/WGLUtil.java |   95 +
 .../windows/wgl/WindowsDummyWGLDrawable.java       |    2 +-
 .../windows/wgl/WindowsExternalWGLContext.java     |    9 +-
 .../windows/wgl/WindowsExternalWGLDrawable.java    |    5 +-
 .../windows/wgl/WindowsOnscreenWGLDrawable.java    |    1 -
 .../opengl/windows/wgl/WindowsWGLContext.java      |   36 +-
 .../opengl/windows/wgl/WindowsWGLDrawable.java     |   28 +-
 .../windows/wgl/WindowsWGLDrawableFactory.java     |   47 +-
 .../wgl/WindowsWGLDynamicLibraryBundleInfo.java    |    3 +
 .../wgl/WindowsWGLGraphicsConfiguration.java       |   36 +-
 .../WindowsWGLGraphicsConfigurationFactory.java    |   32 +-
 .../WindowsAWTWGLGraphicsConfigurationFactory.java |  115 +-
 .../classes/jogamp/opengl/x11/glx/GLXUtil.java     |   35 +-
 .../jogamp/opengl/x11/glx/X11DummyGLXDrawable.java |    7 +-
 .../opengl/x11/glx/X11ExternalGLXContext.java      |   19 +-
 .../opengl/x11/glx/X11ExternalGLXDrawable.java     |   13 +-
 .../jogamp/opengl/x11/glx/X11GLCapabilities.java   |   69 +-
 .../jogamp/opengl/x11/glx/X11GLXContext.java       |   98 +-
 .../jogamp/opengl/x11/glx/X11GLXDrawable.java      |    2 +-
 .../opengl/x11/glx/X11GLXDrawableFactory.java      |   57 +-
 .../x11/glx/X11GLXDynamicLibraryBundleInfo.java    |    4 +
 .../x11/glx/X11GLXGraphicsConfiguration.java       |   25 +-
 .../glx/X11GLXGraphicsConfigurationFactory.java    |   49 +-
 .../opengl/x11/glx/X11OnscreenGLXDrawable.java     |    4 +-
 src/jogl/native/JoglCommon.c                       |  124 +-
 src/jogl/native/JoglCommon.h                       |   36 +
 src/jogl/native/libav/ffmpeg_tool.h                |  106 +
 .../jogamp_opengl_util_av_impl_FFMPEGMediaPlayer.c |  717 +++
 .../macosx/MacOSXWindowSystemInterface-pbuffer.m   |  112 +-
 .../native/macosx/MacOSXWindowSystemInterface.m    |   65 +-
 .../native/openmax/com_sun_openmax_OMXInstance.c   |  255 --
 .../jogamp_opengl_util_av_impl_OMXGLMediaPlayer.c  |  208 +
 src/jogl/native/openmax/omx_tool.c                 |  152 +-
 src/jogl/native/openmax/omx_tool.h                 |   26 +-
 src/jogl/native/timespec.c                         |   14 +
 src/jogl/native/timespec.h                         |    1 +
 .../nativewindow/MutableGraphicsConfiguration.java |    2 +-
 .../jogamp/nativewindow/WrappedSurface.java        |   16 +-
 .../nativewindow/awt/AWTGraphicsConfiguration.java |    2 +-
 .../nativewindow/awt/AWTGraphicsDevice.java        |    2 +-
 .../nativewindow/awt/AWTGraphicsScreen.java        |    4 +-
 .../nativewindow/awt/AWTWindowClosingProtocol.java |   23 +-
 .../jogamp/nativewindow/awt}/JAWTWindow.java       |   34 +-
 .../nativewindow/egl/EGLGraphicsDevice.java        |    2 +-
 .../nativewindow/macosx/MacOSXGraphicsDevice.java  |    2 +-
 .../jogamp/nativewindow/swt/SWTAccessor.java       |    8 +-
 .../windows/WindowsGraphicsDevice.java             |    2 +-
 .../nativewindow/x11/X11GraphicsConfiguration.java |   15 +-
 .../nativewindow/x11/X11GraphicsDevice.java        |    3 +-
 .../nativewindow/x11/X11GraphicsScreen.java        |    5 +-
 .../AbstractGraphicsConfiguration.java             |    2 +-
 .../media/nativewindow/AbstractGraphicsDevice.java |    4 +-
 .../javax/media/nativewindow/Capabilities.java     |   20 +-
 .../media/nativewindow/CapabilitiesImmutable.java  |    4 +-
 .../nativewindow/DefaultCapabilitiesChooser.java   |    3 +-
 .../nativewindow/DefaultGraphicsConfiguration.java |   26 +-
 .../nativewindow/GraphicsConfigurationFactory.java |   99 +-
 .../javax/media/nativewindow/NativeSurface.java    |   38 +-
 .../media/nativewindow/NativeWindowFactory.java    |   83 +-
 .../javax/media/nativewindow/ProxySurface.java     |   14 +
 .../javax/media/nativewindow/ToolkitLock.java      |    3 +-
 .../javax/media/nativewindow/VisualIDHolder.java   |  135 +
 .../media/nativewindow/WindowClosingProtocol.java  |   39 +-
 .../classes/jogamp/nativewindow/Debug.java         |   83 +-
 .../jogamp/nativewindow/NWJNILibLoader.java        |   11 +-
 .../nativewindow/NativeWindowFactoryImpl.java      |    5 +-
 .../classes/jogamp/nativewindow/awt/AWTMisc.java   |   12 +-
 .../jogamp/nativewindow/jawt/JAWTToolkitLock.java  |   54 -
 .../classes/jogamp/nativewindow/jawt/JAWTUtil.java |  100 +-
 .../nativewindow/jawt/macosx/MacOSXJAWTWindow.java |   31 +-
 .../jawt/windows/Win32SunJDKReflection.java        |    4 +-
 .../jawt/windows/WindowsJAWTWindow.java            |    4 +-
 .../nativewindow/jawt/x11/X11JAWTWindow.java       |    3 +-
 .../nativewindow/jawt/x11/X11SunJDKReflection.java |    4 +-
 .../jogamp/nativewindow/macosx/OSXUtil.java        |    4 +-
 .../jogamp/nativewindow/windows/GDISurface.java    |   13 +-
 .../jogamp/nativewindow/windows/GDIUtil.java       |    4 +-
 .../jogamp/nativewindow/x11/X11Capabilities.java   |   87 +
 .../x11/X11GraphicsConfigurationFactory.java       |   14 +-
 .../classes/jogamp/nativewindow/x11/X11Util.java   |   39 +-
 .../awt/X11AWTGraphicsConfigurationFactory.java    |   88 +-
 src/nativewindow/native/macosx/OSXmisc.m           |   63 +-
 .../native/{windows => win32}/GDImisc.c            |    0
 .../native/{windows => win32}/WindowsDWM.c         |    0
 .../native/{windows => win32}/WindowsDWM.h         |    0
 src/nativewindow/native/x11/XineramaHelper.c       |  202 +-
 .../native/x11/XineramaHelper.h}                   |   27 +-
 src/nativewindow/native/x11/Xmisc.c                |   13 +-
 src/newt/classes/com/jogamp/newt/NewtFactory.java  |    2 -
 src/newt/classes/com/jogamp/newt/Screen.java       |   14 +-
 src/newt/classes/com/jogamp/newt/Window.java       |   18 +-
 .../classes/com/jogamp/newt/awt/NewtCanvasAWT.java |   86 +-
 .../jogamp/newt/awt/applet/JOGLNewtApplet1Run.java |    9 +-
 .../jogamp/newt/awt/applet/JOGLNewtAppletBase.java |   25 +-
 .../classes/com/jogamp/newt/event/InputEvent.java  |   48 +-
 .../classes/com/jogamp/newt/event/MouseEvent.java  |    9 +-
 .../com/jogamp/newt/event/awt/AWTMouseAdapter.java |   15 +-
 .../classes/com/jogamp/newt/opengl/GLWindow.java   |   55 +-
 .../classes/com/jogamp/newt/util/MainThread.java   |  131 +-
 .../classes/com/jogamp/newt/util/MonitorMode.java  |    5 +-
 src/newt/classes/jogamp/newt/Debug.java            |   82 +-
 src/newt/classes/jogamp/newt/DisplayImpl.java      |   12 +-
 src/newt/classes/jogamp/newt/ScreenImpl.java       |  218 +-
 src/newt/classes/jogamp/newt/WindowImpl.java       |  743 +--
 .../classes/jogamp/newt/awt/NewtFactoryAWT.java    |    6 +-
 .../jogamp/newt/awt/event/AWTNewtEventFactory.java |    3 +-
 .../newt/awt/event/AWTParentWindowAdapter.java     |   19 +-
 .../jogamp/newt/driver/android/AndroidDisplay.java |   11 +-
 .../jogamp/newt/driver/android/AndroidScreen.java  |   16 +-
 .../jogamp/newt/driver/android/AndroidWindow.java  |  261 +-
 .../classes/jogamp/newt/driver/android/MD.java     |   20 +-
 .../newt/driver/android/NewtBaseActivity.java      |  223 +-
 .../android/event/AndroidNewtEventFactory.java     |  156 +-
 .../classes/jogamp/newt/driver/awt/AWTCanvas.java  |   20 +-
 .../classes/jogamp/newt/driver/awt/AWTDisplay.java |    3 +-
 .../classes/jogamp/newt/driver/awt/AWTEDTUtil.java |   68 +-
 .../classes/jogamp/newt/driver/awt/AWTScreen.java  |   36 +-
 .../classes/jogamp/newt/driver/awt/AWTWindow.java  |   42 +-
 .../jogamp/newt/driver/broadcom/egl/Display.java   |    3 +-
 .../jogamp/newt/driver/broadcom/egl/Screen.java    |   18 +-
 .../jogamp/newt/driver/broadcom/egl/Window.java    |   12 +-
 .../jogamp/newt/driver/intel/gdl/Screen.java       |   23 +-
 .../jogamp/newt/driver/intel/gdl/Window.java       |   13 +-
 .../classes/jogamp/newt/driver/kd/KDDisplay.java   |    9 +-
 .../classes/jogamp/newt/driver/kd/KDScreen.java    |   22 +-
 .../classes/jogamp/newt/driver/kd/KDWindow.java    |    9 +-
 .../jogamp/newt/driver/macosx/MacDisplay.java      |   10 +-
 .../jogamp/newt/driver/macosx/MacScreen.java       |   92 +-
 .../jogamp/newt/driver/macosx/MacWindow.java       |   71 +-
 .../jogamp/newt/driver/windows/WindowsDisplay.java |    3 +-
 .../jogamp/newt/driver/windows/WindowsScreen.java  |   25 +-
 .../jogamp/newt/driver/windows/WindowsWindow.java  |   37 +-
 .../classes/jogamp/newt/driver/x11/X11Display.java |    3 +-
 .../classes/jogamp/newt/driver/x11/X11Screen.java  |  155 +-
 .../classes/jogamp/newt/driver/x11/X11Window.java  |   27 +-
 src/newt/native/KDWindow.c                         |   10 +-
 src/newt/native/KeyEvent.h                         |   27 +
 src/newt/native/MacWindow.m                        |  319 +-
 src/newt/native/MouseEvent.h                       |   27 +
 src/newt/native/NewtCommon.h                       |   63 +
 src/newt/native/NewtMacWindow.h                    |   39 +-
 src/newt/native/NewtMacWindow.m                    |  328 +-
 src/newt/native/ScreenMode.h                       |   28 +
 src/newt/native/Window.h                           |   27 +
 src/newt/native/WindowEvent.h                      |   27 +
 src/newt/native/WindowsWindow.c                    |   80 +-
 .../driver/android/MD.java => native/X11Common.h}  |   83 +-
 src/newt/native/X11Display.c                       |  663 +++
 src/newt/native/X11Screen.c                        |  491 ++
 src/newt/native/X11Window.c                        | 1322 +-----
 .../native => test-native}/displayMultiple01.c     |    0
 .../native => test-native}/displayMultiple02.c     |    0
 src/test-native/ffmpeg/api-example.c               |  479 ++
 src/test-native/ffmpeg/avcodec_sample.c            |  203 +
 src/test-native/ffmpeg/avcodec_sample.sh           |    6 +
 .../native => test-native}/glExtensionsListGL2.c   |    0
 .../native => test-native}/glExtensionsListGL3.c   |    0
 src/test-native/gst/helloworld-auto.c              |  112 +
 src/test-native/gst/helloworld-playbin.c           |   75 +
 src/test-native/gst/helloworld-playbin2.c          |   75 +
 src/test-native/gst/helloworld.c                   |  142 +
 src/test-native/gst/make.sh                        |    5 +
 src/{test/native => test-native}/make.sh           |    0
 .../test-native/mesa-demos-patched}/EGL/egl.h      |   15 +-
 .../test-native/mesa-demos-patched}/EGL/eglext.h   |  172 +-
 .../mesa-demos-patched}/EGL/eglplatform.h          |   39 +-
 src/test-native/mesa-demos-patched/eglut/eglut.c   |  400 ++
 src/test-native/mesa-demos-patched/eglut/eglut.h   |   96 +
 .../mesa-demos-patched/eglut/eglut_screen.c        |  180 +
 .../mesa-demos-patched/eglut/eglut_x11.c           |  252 ++
 .../mesa-demos-patched/eglut/eglutint.h            |  104 +
 src/test-native/mesa-demos-patched/es2gears.c      |  751 +++
 src/test-native/mesa-demos-patched/es2redsquare.c  |  611 +++
 src/test-native/mesa-demos-patched/loop.sh         |    5 +
 src/test-native/mesa-demos-patched/make.sh         |   17 +
 src/test-native/mesa-demos-patched/shell_loop.sh   |   11 +
 .../jogamp/opengl/test/android/LauncherUtil.java   |  329 ++
 .../opengl/test/android/MovieCubeActivity0.java    |  125 +
 .../test/android/MovieCubeActivityLauncher0.java   |   79 +
 .../opengl/test/android/MovieSimpleActivity0.java  |  119 +
 .../opengl/test/android/MovieSimpleActivity1.java  |  204 +
 .../android/MovieSimpleActivityLauncher00a.java    |   82 +
 .../android/MovieSimpleActivityLauncher00b.java    |   82 +
 .../android/MovieSimpleActivityLauncher01a.java    |   82 +
 .../android/MovieSimpleActivityLauncher01b.java    |   82 +
 .../android/MovieSimpleActivityLauncher02.java     |   82 +
 .../opengl/test/android/NEWTElektronActivity.java  |    9 +-
 .../test/android/NEWTElektronActivityLauncher.java |   45 +
 .../opengl/test/android/NEWTGearsES1Activity.java  |    8 +-
 .../test/android/NEWTGearsES1ActivityLauncher.java |   44 +
 .../opengl/test/android/NEWTGearsES2Activity.java  |   28 +-
 .../test/android/NEWTGearsES2ActivityLauncher.java |   74 +
 .../test/android/NEWTGearsES2TransActivity.java    |   18 +-
 .../android/NEWTGearsES2TransActivityLauncher.java |   50 +
 .../opengl/test/android/NEWTGraphUI1pActivity.java |    5 +-
 .../android/NEWTGraphUI1pActivityLauncher.java     |   44 +
 .../opengl/test/android/NEWTGraphUI2pActivity.java |    5 +-
 .../android/NEWTGraphUI2pActivityLauncher.java     |   44 +
 .../test/android/NEWTRedSquareES1Activity.java     |   11 +-
 .../android/NEWTRedSquareES1ActivityLauncher.java  |   44 +
 .../test/android/NEWTRedSquareES2Activity.java     |   14 +-
 .../android/NEWTRedSquareES2ActivityLauncher.java  |   21 +
 .../opengl/test/bugs/Bug427GLJPanelTest1.java      |    2 +-
 .../test/junit/graph/TestRegionRendererNEWT01.java |   14 +-
 .../test/junit/graph/TestTextRendererNEWT01.java   |  126 +-
 .../junit/graph/demos/GPURegionGLListener01.java   |    1 -
 .../junit/graph/demos/GPURegionGLListener02.java   |    1 -
 .../graph/demos/GPURendererListenerBase01.java     |   24 +-
 .../junit/graph/demos/GPUTextGLListener0A.java     |    1 -
 .../graph/demos/GPUTextRendererListenerBase01.java |   64 +-
 .../junit/graph/demos/GPUUISceneGLListener0A.java  |   34 +-
 .../opengl/test/junit/graph/demos/MSAATool.java    |   26 +-
 .../opengl/test/junit/graph/demos/ui/Label.java    |    3 +-
 .../opengl/test/junit/graph/demos/ui/RIButton.java |    2 +-
 .../junit/graph/demos/ui/SceneUIController.java    |   10 +-
 .../test/junit/graph/demos/ui/UIGLListener01.java  |   47 +-
 .../junit/graph/demos/ui/UIListenerBase01.java     |    7 +-
 .../opengl/test/junit/graph/demos/ui/UIShape.java  |    2 +-
 .../jogl/acore/TestAWTCloseX11DisplayBug565.java   |   89 +
 .../test/junit/jogl/acore/TestGLProfile01NEWT.java |   73 +-
 .../test/junit/jogl/acore/TestGPUMemSec01NEWT.java |   76 +-
 .../junit/jogl/acore/TestInitConcurrentNEWT.java   |   13 +-
 ...fer01NEWT.java => TestMapBufferRead01NEWT.java} |   20 +-
 .../jogl/acore/TestNEWTCloseX11DisplayBug565.java  |  108 +
 .../test/junit/jogl/acore/TestNVSwapGroupNEWT.java |    2 +-
 .../junit/jogl/acore/TestPBufferDeadlockAWT.java   |    4 +-
 .../junit/jogl/acore/TestSharedContextListAWT.java |   24 +-
 .../jogl/acore/TestSharedContextListNEWT.java      |   23 +-
 .../jogl/acore/TestSharedContextListNEWT2.java     |   25 +-
 .../jogl/acore/TestSharedContextNewtAWTBug523.java |   15 +
 .../jogl/acore/TestSharedContextVBOES1NEWT.java    |   23 +-
 .../jogl/acore/TestSharedContextVBOES2NEWT.java    |   23 +-
 .../jogl/acore/TestSharedContextVBOES2NEWT2.java   |   23 +-
 .../junit/jogl/acore/TestShutdownCompleteAWT.java  |    6 +-
 .../junit/jogl/acore/TestShutdownCompleteNEWT.java |    6 +-
 .../junit/jogl/acore/TestShutdownSharedAWT.java    |    6 +-
 .../junit/jogl/acore/TestShutdownSharedNEWT.java   |    6 +-
 .../opengl/test/junit/jogl/awt/TestAWT01GLn.java   |   20 +-
 .../TestAWTCardLayoutAnimatorStartStopBug532.java  |  229 +
 .../TestBug461OffscreenSupersamplingSwingAWT.java  |    4 +-
 .../opengl/test/junit/jogl/awt/TestBug551AWT.java  |  147 +
 .../test/junit/jogl/awt/TestSwingAWT01GLn.java     |   20 +-
 ...tisampleDemo01.java => MultisampleDemoES1.java} |   54 +-
 ...tisampleAWT.java => TestMultisampleES1AWT.java} |   10 +-
 ...sampleNEWT.java => TestMultisampleES1NEWT.java} |   19 +-
 .../test/junit/jogl/demos/TestTextureSequence.java |  120 +
 .../opengl/test/junit/jogl/demos/es1/GearsES1.java |   13 +-
 .../junit/jogl/demos/{gl2 => es1}/OneTriangle.java |   41 +-
 .../jogl/demos/es1/newt/TestGearsES1NEWT.java      |   11 +-
 .../jogl/demos/es1/newt/TestRedSquareES1NEWT.java  |   11 +-
 .../jogl/demos/es2/ElektronenMultiplizierer.java   |   13 +-
 .../opengl/test/junit/jogl/demos/es2/GearsES2.java |   23 +-
 .../test/junit/jogl/demos/es2/RedSquareES2.java    |   13 +-
 .../test/junit/jogl/demos/es2/TexCubeES2.java      |  507 +++
 .../test/junit/jogl/demos/es2/av/MovieCube.java    |  237 +
 .../test/junit/jogl/demos/es2/av/MovieSimple.java  |  559 +++
 .../awt/TestGearsES2AWT.java}                      |   78 +-
 .../es2/newt/TestElektronenMultipliziererNEWT.java |   13 +-
 .../jogl/demos/es2/newt/TestGearsES2NEWT.java      |  178 +-
 .../jogl/demos/es2/newt/TestRedSquareES2NEWT.java  |   60 +-
 .../junit/jogl/demos/es2/shader/texsequence_xxx.fp |   22 +
 .../junit/jogl/demos/es2/shader/texsequence_xxx.vp |   17 +
 .../junit/jogl/demos/gl2/awt/TestGearsAWT.java     |   30 +-
 .../demos/gl2/awt/TestGearsAWTAnalyzeBug455.java   |   12 +-
 .../jogl/demos/gl2/awt/TestGearsGLJPanelAWT.java   |   13 +-
 .../demos/gl2/awt/TestGearsGLJPanelAWTBug450.java  |   12 +-
 .../junit/jogl/demos/gl2/newt/TestGearsNEWT.java   |   17 +-
 .../demos/gl2/newt/TestGearsNewtAWTWrapper.java    |    8 +-
 .../test/junit/jogl/glsl/TestFBOMRTNEWT01.java     |   40 +-
 .../junit/jogl/glsl/TestGLSLShaderState01NEWT.java |   34 +-
 .../junit/jogl/glsl/TestGLSLShaderState02NEWT.java |   47 +-
 .../test/junit/jogl/glsl/TestGLSLSimple01NEWT.java |    3 -
 .../test/junit/jogl/glsl/TestRulerNEWT01.java      |   11 +-
 .../TestTransformFeedbackVaryingsBug407NEWT.java   |  134 +-
 .../jogl/glu/TestBug463ScaleImageMemoryAWT.java    |    2 +-
 ...TestSwingAWTRobotUsageBeforeJOGLInitBug411.java |   11 +-
 .../test/junit/jogl/offscreen/ReadBuffer2File.java |    3 +-
 .../test/junit/jogl/offscreen/Surface2File.java    |   16 +-
 .../jogl/offscreen/TestOffscreen02BitmapNEWT.java  |   38 +-
 .../test/junit/jogl/swt/TestSWTAWT01GLn.java       |   27 +-
 ...TestSWT02GLn.java => TestSWTAccessor02GLn.java} |   33 +-
 ...01GLn.java => TestSWTEclipseGLCanvas01GLn.java} |   31 +-
 ...01GLn.java => TestSWTJOGLGLCanvas01GLnAWT.java} |   97 +-
 .../texture/TestGrayTextureFromFileAWTBug417.java  |    6 +-
 .../test/junit/jogl/texture/TestTexture01AWT.java  |    6 +-
 .../TestGLReadBufferUtilTextureIOWrite01NEWT.java} |   99 +-
 .../TestGLReadBufferUtilTextureIOWrite02NEWT.java  |  146 +
 .../test/junit/jogl/util/TestPNGImage01NEWT.java   |   41 +
 .../test/junit/newt/TestEventSourceNotAWTBug.java  |    2 +-
 .../test/junit/newt/TestFocus01SwingAWTRobot.java  |   13 +-
 .../test/junit/newt/TestFocus02SwingAWTRobot.java  |   20 +-
 .../test/junit/newt/TestScreenMode00NEWT.java      |   34 +-
 .../test/junit/newt/TestScreenMode01NEWT.java      |   12 -
 .../junit/newt/TestWindowClosingProtocol01AWT.java |   20 +-
 .../newt/TestWindowClosingProtocol02NEWT.java      |   16 +-
 .../newt/TestWindowClosingProtocol03NewtAWT.java   |   10 +-
 .../junit/newt/parenting/TestParenting01NEWT.java  |   12 +-
 .../junit/newt/parenting/TestParenting01aAWT.java  |    2 +-
 .../TestParentingFocusTraversal01AWT.java          |    9 +-
 .../TestParentingOffscreenLayer01GLCanvasAWT.java  |   23 +-
 ...TestParentingOffscreenLayer02NewtCanvasAWT.java |   24 +-
 .../opengl/test/junit/util/AWTRobotUtil.java       |   87 +-
 .../opengl/test/junit/util/GLSLSimpleProgram.java  |    6 +-
 .../jogamp/opengl/test/junit/util/MiscUtils.java   |    9 +
 .../jogamp/opengl/test/junit/util/UITestCase.java  |   31 +-
 src/test/jogamp/newt/WindowImplAccess.java         |    2 +-
 www/index.html                                     |  527 ++-
 www/media/EverplanesLogo_160x160.png               |  Bin 0 -> 45282 bytes
 www/media/Frog-Craft3_2.160w.png                   |  Bin 0 -> 27158 bytes
 www/media/Frog-Craft3_2.png                        |  Bin 0 -> 280766 bytes
 www/media/JebGL_logo.160w.png                      |  Bin 0 -> 11378 bytes
 www/media/JebGL_logo.png                           |  Bin 0 -> 31923 bytes
 www/{ => media}/NetBeansOpenGLPackLogo160.png      |  Bin
 www/{ => media}/artofillusion.jpg                  |  Bin
 www/{ => media}/avengina.jpg                       |  Bin
 www/media/c3d-studio.jpg                           |  Bin 0 -> 9860 bytes
 www/{ => media}/chronotext.jpg                     |  Bin
 www/{ => media}/elflightengine-160x122.png         |  Bin
 www/{ => media}/fenggui.jpg                        |  Bin
 www/{ => media}/field.png                          |  Bin
 www/{ => media}/fusion-laboratory.jpg              |  Bin
 www/media/geogebra-screenshot-tangents.png         |  Bin 0 -> 5980 bytes
 www/{ => media}/gephi.jpg                          |  Bin
 www/media/glg2d-demo.png                           |  Bin 0 -> 10295 bytes
 www/{ => media}/glstudio.jpg                       |  Bin
 www/{ => media}/impact.jpg                         |  Bin
 www/{ => media}/insparia.jpg                       |  Bin
 www/{ => media}/jackflowers.jpg                    |  Bin
 www/{ => media}/jake2.jpg                          |  Bin
 www/media/jogl-applet-moviecube01-small.png        |  Bin 0 -> 19167 bytes
 www/media/jogl-applet-moviecube01.png              |  Bin 0 -> 118588 bytes
 www/media/jreality-logo-discreteksurfaces.png      |  Bin 0 -> 28465 bytes
 www/{ => media}/madlix.png                         |  Bin
 www/media/map_of_illarion.png                      |  Bin 0 -> 44172 bytes
 www/{ => media}/mbt.jpg                            |  Bin
 www/media/pebbles.png                              |  Bin 0 -> 31238 bytes
 www/{ => media}/processing.jpg                     |  Bin
 www/{ => media}/raceview.jpg                       |  Bin
 www/{ => media}/scilab.png                         |  Bin
 www/{ => media}/sculpteo_3_robot_72dpi_sm.jpg      |  Bin
 www/{ => media}/specksim.jpg                       |  Bin
 www/{ => media}/strap.jpg                          |  Bin
 www/{ => media}/vehicle.jpg                        |  Bin
 www/{ => media}/vldocking.jpg                      |  Bin
 www/{ => media}/worldwind.jpg                      |  Bin
 www/{ => media}/zg3d.png                           |  Bin
 www/pebbles.png                                    |  Bin 35714 -> 0 bytes
 www/sun-contributor-agreement.pdf                  |  Bin 18368 -> 0 bytes
 www/tck-license.html                               |   39 -
 www/viewerVR.png                                   |  Bin 60130 -> 0 bytes
 745 files changed, 47397 insertions(+), 12040 deletions(-)

diff --cc debian/changelog
index c32db9c,0000000..307b503
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,127 -1,0 +1,139 @@@
++libjogl2-java (2.0-rc8-1~exp1) experimental; urgency=low
++  
++  * New upstream release
++  * Set the exact version of the dependency between libjogl2-java
++    and libjogl2-jni
++
++  [ Miguel Landaeta ]
++  * Use public access URL in Vcs-Svn field. (Closes: #670283).
++  * Fix debian-control-has-unusual-field-spacing lintian warning.
++
++ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 23 May 2012 14:23:19 +0200
++
 +libjogl2-java (2.0-rc5-2) unstable; urgency=low
 +
 +  * Really upload to unstable (oups)
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 13 Mar 2012 09:46:59 +0100
 +
 +libjogl2-java (2.0-rc5-1) experimental; urgency=low
 +
 +  * Upload in unstable
 +  * Standards-Version updated to version 3.9.3
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 12 Mar 2012 20:23:07 +0100
 +
 +libjogl2-java (2.0-rc5-1~exp3) experimental; urgency=low
 +
 +  * Some sbuild still want to build the doc package. Enable it only for amd64
 +    and x86. See build log of ia64 & powerpc of version 2.0-rc5-1~exp2
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 28 Dec 2011 13:59:28 +0100
 +
 +libjogl2-java (2.0-rc5-1~exp2) experimental; urgency=low
 +
 +  * Only build the doc once
 +  * Disable some TARGET_PLATFORM_LIBS variables
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 27 Dec 2011 23:22:05 +0100
 +
 +libjogl2-java (2.0-rc5-1~exp1) experimental; urgency=low
 +
 +  * New upstream release
 +  * watch + repack script added
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 26 Dec 2011 02:06:41 +0100
 +
 +libjogl2-java (2.0-rc3-7) unstable; urgency=low
 +
 +  * Drop patch sparc.diff since it is now managed into gluegen2
 +  * Disable the build of the documentation for arch indep build
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 22 Nov 2011 00:42:13 +0100
 +
 +libjogl2-java (2.0-rc3-6) unstable; urgency=low
 +
 +  * Fix a problem under arm
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 20 Nov 2011 21:43:36 +0100
 +
 +libjogl2-java (2.0-rc3-5) unstable; urgency=low
 +
 +  * Example is now working (Closes: #634996)
 +  * Fix the various FTBFS (Closes: #638431) (LP: #809743)
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 20 Nov 2011 21:43:29 +0100
 +
 +libjogl2-java (2.0-rc3-4) unstable; urgency=low
 +
 +  * Ant to build C code = a lot of uploads ... pfff
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 10 Oct 2011 12:13:14 +0200
 +
 +libjogl2-java (2.0-rc3-3) unstable; urgency=low
 +
 +  * Fix more FTBFS
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 09 Oct 2011 19:26:30 +0200
 +
 +libjogl2-java (2.0-rc3-2) unstable; urgency=low
 +
 +  * Fix various FTBFS:
 +    - disable the android include
 +    - build the documentation as indep package (to avoid the timeout)
 +    - disable the git call
 +
 + -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 08 Oct 2011 11:39:42 +0200
 +
 +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 09fc0eb,0000000..ddcd932
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,327 -1,0 +1,327 @@@
 +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,
-  libgluegen2-build-java (>= 2.0-rc5-1~), libgluegen2-rt-java (>= 2.0-rc5-1~),
++ libgluegen2-build-java (>= 2.0-rc8-1~), libgluegen2-rt-java (>= 2.0-rc8-1~),
 + ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev, 
 + x11proto-xf86vidmode-dev, libxt-dev,  junit4, libswt-gtk-3-java,
 + ant-contrib, ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev,
 + ant (>= 1.8)
 +Standards-Version: 3.9.3
 +Homepage: http://jogamp.org/
- Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjogl2-java
++Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjogl2-java
 +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjogl2-java/
 +
 +Package: libjogl2-java
 +Architecture: all
- Depends:  ${misc:Depends}, 
-  libgluegen2-rt-java, libjogl2-jni
++Depends: ${misc:Depends},
++ libgluegen2-rt-java, libjogl2-jni (>= ${source:Version})
 +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-jni
 +Depends: ${misc:Depends}, ${shlibs: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
 +# 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.
 +
 +# 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-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. 
 +
 +# # 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.
 +
 +# # 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.
 +
 +
 +# 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
 +# 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.
 +#  .
 +#  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}
 +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.
 +
 +
 +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/patches/TARGET_PLATFORM_LIBS_2.diff
index bebe80d,0000000..94a7551
mode 100644,000000..100644
--- a/debian/patches/TARGET_PLATFORM_LIBS_2.diff
+++ b/debian/patches/TARGET_PLATFORM_LIBS_2.diff
@@@ -1,26 -1,0 +1,26 @@@
- Index: libjogl2-java-2.0-rc5/make/build-jogl.xml
++Index: jogl-v2.0-rc8/make/build-jogl.xml
 +===================================================================
- --- libjogl2-java-2.0-rc5.orig/make/build-jogl.xml	2011-12-26 09:54:09.000000000 +0100
- +++ libjogl2-java-2.0-rc5/make/build-jogl.xml	2011-12-27 23:14:19.109596268 +0100
- @@ -1092,7 +1092,7 @@
++--- jogl-v2.0-rc8.orig/make/build-jogl.xml	2012-05-02 03:28:29.000000000 +0200
+++++ jogl-v2.0-rc8/make/build-jogl.xml	2012-05-15 13:53:13.000000000 +0200
++@@ -1155,7 +1155,7 @@
 +       </linker>
 + 
 +       <linker id="linker.cfg.linux.armv7.jogl.x11" extends="linker.cfg.linux.armv7">
- -        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11"/>
++-        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11"/>
 ++        <syslibset libs="X11"/>
 +       </linker>
 + 
 +       <linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
- Index: libjogl2-java-2.0-rc5/make/build-newt.xml
++Index: jogl-v2.0-rc8/make/build-newt.xml
 +===================================================================
- --- libjogl2-java-2.0-rc5.orig/make/build-newt.xml	2011-12-26 09:54:09.000000000 +0100
- +++ libjogl2-java-2.0-rc5/make/build-newt.xml	2011-12-27 23:14:25.001596434 +0100
- @@ -276,7 +276,7 @@
++--- jogl-v2.0-rc8.orig/make/build-newt.xml	2012-05-15 13:48:52.000000000 +0200
+++++ jogl-v2.0-rc8/make/build-newt.xml	2012-05-15 13:52:55.000000000 +0200
++@@ -279,7 +279,7 @@
 +       </linker>
 + 
 +       <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
- -        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="android" />
++-        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="android" />
 ++        <syslibset libs="android" />
 +       </linker>
 + 
 +       <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
diff --cc debian/patches/disable_android.diff
index de77890,0000000..d9bf185
mode 100644,000000..100644
--- a/debian/patches/disable_android.diff
+++ b/debian/patches/disable_android.diff
@@@ -1,37 -1,0 +1,34 @@@
- --- 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
++Index: jogl-v2.0-rc8/make/build-newt.xml
++===================================================================
++--- jogl-v2.0-rc8.orig/make/build-newt.xml	2012-05-02 03:28:29.000000000 +0200
+++++ jogl-v2.0-rc8/make/build-newt.xml	2012-05-15 13:48:52.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 @@
++@@ -644,7 +644,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 -->
++Index: jogl-v2.0-rc8/make/build-test.xml
++===================================================================
++--- jogl-v2.0-rc8.orig/make/build-test.xml	2012-05-02 03:28:29.000000000 +0200
+++++ jogl-v2.0-rc8/make/build-test.xml	2012-05-15 13:49:47.000000000 +0200
++@@ -79,6 +79,7 @@
 +         <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}" />
++                memoryMaximumSize="${javac.memorymax}"
++                encoding="UTF-8"
++                source="${target.sourcelevel}" 
diff --cc debian/patches/disable_android_3.diff
index 53302a3,0000000..dbbe75a
mode 100644,000000..100644
--- a/debian/patches/disable_android_3.diff
+++ b/debian/patches/disable_android_3.diff
@@@ -1,64 -1,0 +1,77 @@@
- Index: libjogl2-java-2.0-rc5/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
++Index: libjogl2-java-2.0-rc8/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
 +===================================================================
- --- libjogl2-java-2.0-rc5.orig/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java	2011-12-19 03:43:56.000000000 +0100
- +++ libjogl2-java-2.0-rc5/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java	2011-12-26 10:06:08.266867194 +0100
- @@ -200,23 +200,23 @@
++--- libjogl2-java-2.0-rc8.orig/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java	2012-05-02 03:28:29.000000000 +0200
+++++ libjogl2-java-2.0-rc8/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java	2012-05-23 16:13:20.000000000 +0200
++@@ -205,23 +205,23 @@
 +         st.uniform(gl, pmvMatrixUniform);
 +         st.useProgram(gl, false);
 +         
 +-        if(useAndroidDebug) {
 ++/*        if(useAndroidDebug) {
 +             try {
 +                 android.os.Debug.startMethodTracing("GearsES2.trace");
 +                 // android.os.Debug.startAllocCounting();
 +                 useAndroidDebug = true;
 +             } catch (NoClassDefFoundError e) { useAndroidDebug=false; }
 +-        }
 ++            }*/
 +         
 +         System.err.println(Thread.currentThread()+" GearsES2.reshape FIN");
 +     }
 +     private boolean useAndroidDebug = false;
 + 
 +     public void dispose(GLAutoDrawable drawable) {
 +-        if(useAndroidDebug) {
 ++/*        if(useAndroidDebug) {
 +             // android.os.Debug.stopAllocCounting();
 +             android.os.Debug.stopMethodTracing();
 +-        }
 ++            }*/
 +         
 +         System.err.println(Thread.currentThread()+" GearsES2.dispose ... ");
 +         if (drawable instanceof Window) {
- Index: libjogl2-java-2.0-rc5/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
++Index: libjogl2-java-2.0-rc8/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
 +===================================================================
- --- libjogl2-java-2.0-rc5.orig/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java	2011-12-19 03:43:56.000000000 +0100
- +++ libjogl2-java-2.0-rc5/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java	2011-12-26 10:01:49.134860058 +0100
- @@ -172,23 +172,23 @@
++--- libjogl2-java-2.0-rc8.orig/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java	2012-05-02 03:28:29.000000000 +0200
+++++ libjogl2-java-2.0-rc8/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java	2012-05-23 16:13:20.000000000 +0200
++@@ -173,23 +173,23 @@
 +         st.uniform(gl, pmvMatrixUniform);
 +         st.useProgram(gl, false);
 +         
 +-        if(useAndroidDebug) {
 ++/*        if(useAndroidDebug) {
 +             try {
 +                 android.os.Debug.startMethodTracing("RedSquareES2.trace");
 +                 // android.os.Debug.startAllocCounting();
 +                 useAndroidDebug = true;
 +             } catch (NoClassDefFoundError e) { useAndroidDebug=false; }
 +-        }
 ++            }*/
 +         
 +         System.err.println(Thread.currentThread()+" RedSquareES2.reshape FIN");
 +     }
 +     private boolean useAndroidDebug = false;
 + 
 +     public void dispose(GLAutoDrawable glad) {
 +-        if(useAndroidDebug) {
 ++/*        if(useAndroidDebug) {
 +             // android.os.Debug.stopAllocCounting();
 +             android.os.Debug.stopMethodTracing();
 +-        }
 ++            }*/
 +         System.err.println(Thread.currentThread()+" RedSquareES2.dispose ... ");
 +         if (null != glWindow) {
 +             glWindow.removeMouseListener(myMouse);
++Index: libjogl2-java-2.0-rc8/make/build-test.xml
++===================================================================
++--- libjogl2-java-2.0-rc8.orig/make/build-test.xml	2012-05-23 16:13:20.000000000 +0200
+++++ libjogl2-java-2.0-rc8/make/build-test.xml	2012-05-23 16:13:53.000000000 +0200
++@@ -79,7 +79,7 @@
++         <javac destdir="${classes}"
++                fork="yes"
++                includeAntRuntime="false"
++-               excludes="${java.excludes.all}"
+++               excludes="${java.excludes.all} com/jogamp/opengl/test/android/**"
++                memoryMaximumSize="${javac.memorymax}"
++                encoding="UTF-8"
++                source="${target.sourcelevel}" 
diff --cc debian/patches/manifest.diff
index 0000000,0000000..eb3c254
new file mode 100644
--- /dev/null
+++ b/debian/patches/manifest.diff
@@@ -1,0 -1,0 +1,15 @@@
++Index: libjogl2-java-2.0-rc8/make/joglversion
++===================================================================
++--- libjogl2-java-2.0-rc8.orig/make/joglversion	2012-05-02 03:28:29.000000000 +0200
+++++ libjogl2-java-2.0-rc8/make/joglversion	2012-05-23 17:49:42.000000000 +0200
++@@ -6,8 +6,9 @@
++ Implementation-Version: @VERSION@
++ Implementation-Branch: @SCM_BRANCH@
++ Implementation-Commit: @SCM_COMMIT@
++-Implementation-Vendor: JogAmp Community
+++Implementation-Vendor: JogAmp Community - Debian package
++ Implementation-URL: http://jogamp.org/
++ Extension-Name: javax.media.opengl
++ Implementation-Vendor-Id: com.jogamp
++ Trusted-Library: true
+++Class-Path: /usr/share/java/gluegen2-rt.jar
diff --cc debian/patches/series
index 91d4788,0000000..608c259
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,12 -1,0 +1,13 @@@
 +variousFixes.diff
 +#disableOneDir.diff
 +swt.diff
- otherArchsoswin.diff
++#otherArchsoswin.diff
 +disable_android.diff
 +disable_git_call.diff
 +disable_android_2.diff
- arch_naming.diff
- linker.cfg.id.os.diff
- otherArchsoswin_2.diff
++#arch_naming.diff
++#linker.cfg.id.os.diff
++#otherArchsoswin_2.diff
 +disable_android_3.diff
 +TARGET_PLATFORM_LIBS_2.diff
++manifest.diff
diff --cc debian/patches/variousFixes.diff
index eb8223f,0000000..06af080
mode 100644,000000..100644
--- a/debian/patches/variousFixes.diff
+++ b/debian/patches/variousFixes.diff
@@@ -1,63 -1,0 +1,63 @@@
- Index: libjogl2-java-2.0-rc3/make/build-common.xml
++Index: jogl-v2.0-rc8/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
++--- jogl-v2.0-rc8.orig/make/build-common.xml	2012-05-15 13:53:25.000000000 +0200
+++++ jogl-v2.0-rc8/make/build-common.xml	2012-05-15 13:53:27.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>
- @@ -198,7 +192,7 @@
++@@ -207,7 +207,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" />
 + 
- @@ -373,7 +367,7 @@
++@@ -397,7 +397,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="${jar}/jogl.test.jar"/>
++         <property name="jogl.test.apk"                  value="${jar}/jogl.test.apk"/>
 + 
-          <!-- JavaSE combinations . AWT -->
- @@ -494,7 +488,10 @@
++@@ -531,7 +531,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>
 + 
 + 
- Index: libjogl2-java-2.0-rc3/make/build.xml
++Index: jogl-v2.0-rc8/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 @@
++--- jogl-v2.0-rc8.orig/make/build.xml	2012-05-15 13:53:25.000000000 +0200
+++++ jogl-v2.0-rc8/make/build.xml	2012-05-15 13:53:27.000000000 +0200
++@@ -276,7 +276,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"/>

-- 
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