[libjogl2-java] 31/58: Imported Debian patch 2.0-rc10-1~exp1
Tony Mancill
tmancill at moszumanska.debian.org
Thu Sep 4 03:59:16 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 47279723361ebb66d54a70e6fce6a35f57d0bbe9
Merge: 7520573 d2b118b
Author: Sylvestre Ledru <sylvestre at debian.org>
Date: Mon Sep 3 09:34:29 2012 +0200
Imported Debian patch 2.0-rc10-1~exp1
debian/changelog | 6 +
debian/control | 12 +-
debian/libjogl2-toolkits.install | 2 +-
debian/patches/series | 2 +-
debian/patches/variousFixes.diff | 20 +-
debian/rules | 4 +-
doc/Platform.GLES.txt | 4 +-
doc/TODO.txt | 15 +-
etc/profile.jogl | 19 +-
etc/test.bat | 2 +-
etc/test_dbg.bat | 2 +-
jnlp-files/atomic/jogl-awt.jnlp | 54 +-
jnlp-files/atomic/jogl-noawt.jnlp | 50 +-
jnlp-files/atomic/nativewindow-awt.jnlp | 19 +-
jnlp-files/atomic/nativewindow-noawt.jnlp | 30 +-
jnlp-files/atomic/newt-awt-jogl.jnlp | 36 +-
jnlp-files/atomic/newt-awt.jnlp | 34 +-
jnlp-files/atomic/newt-noawt-jogl.jnlp | 36 +-
jnlp-files/atomic/newt-noawt.jnlp | 30 +-
jnlp-files/jogl-all-awt-cg.jnlp | 36 +-
jnlp-files/jogl-all-awt.jnlp | 2 +-
jnlp-files/jogl-all-mobile.jnlp | 2 +-
jnlp-files/jogl-all-noawt.jnlp | 2 +-
...nner-newt-ElektronenMultiplizierer-napplet.html | 8 +-
...pplet-runner-newt-ElektronenMultiplizierer.html | 8 +-
...applet-runner-newt-GraphTextDemo01-napplet.html | 8 +-
.../jogl-applet-runner-newt-GraphTextDemo01.html | 8 +-
...let-runner-newt-GraphUISceneDemo01-napplet.html | 8 +-
...jogl-applet-runner-newt-GraphUISceneDemo01.html | 8 +-
.../jogl-applet-runner-newt-MovieCube-napplet.html | 8 +-
jnlp-files/jogl-applet-runner-newt-MovieCube.html | 8 +-
...plet-runner-newt-gears-normal-launcheronly.html | 16 +-
...gl-applet-runner-newt-gears-normal-napplet.html | 18 +-
...l-applet-runner-newt-gears-normal-napplet2.html | 18 +-
.../jogl-applet-runner-newt-gears-normal.html | 20 +-
...l-applet-runner-newt-gears-special-napplet.html | 8 +-
.../jogl-applet-runner-newt-gears-special.html | 8 +-
jnlp-files/jogl-applet-runner-newt.jnlp | 2 +-
jnlp-files/jogl-applet-version-lancheronly.html | 4 +-
jnlp-files/jogl-applet-version-napplet.html | 8 +-
jnlp-files/jogl-applet-version.html | 4 +-
make/build-common.xml | 291 +--
make/build-jogl.xml | 46 +-
make/build-nativewindow.xml | 10 +-
make/build-newt.xml | 41 +-
make/build-test.xml | 113 +-
make/build.xml | 18 +-
make/config/jogl/gl-common.cfg | 13 +
make/config/jogl/gl-if-CustomJavaCode-gl.java | 26 -
.../config/jogl/gl-impl-CustomJavaCode-common.java | 57 +-
.../jogl/gl-impl-CustomJavaCode-desktop.java | 25 +-
.../jogl/gl-impl-CustomJavaCode-gl2_es2.java | 6 +-
make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java | 74 +-
make/config/jogl/gl-impl-CustomJavaCode-gles1.java | 84 +-
make/config/jogl/gl-impl-CustomJavaCode-gles2.java | 81 +-
make/config/nativewindow/x11-CustomJavaCode.java | 4 +-
make/scripts/adb-install-all-armv7.sh | 6 +-
make/scripts/java-win32-dbg.bat | 15 +-
make/scripts/java-win32.bat | 6 +-
make/scripts/java-win64-dbg.bat | 16 +-
make/scripts/java-win64.bat | 5 +-
make/scripts/setenv-jogl.sh | 10 +-
make/scripts/tests-osx-x64-mainthread.sh | 11 +
make/scripts/tests-x32.bat | 3 +-
make/scripts/tests-x64.bat | 33 +-
make/scripts/tests.sh | 109 +-
make/stub_includes/opengl/macosx-window-system.h | 2 +-
make/stub_includes/win32/wingdi.h | 2 +
.../gluegen/opengl/BuildComposablePipeline.java | 2 +-
.../jogamp/gluegen/opengl/BuildStaticGLInfo.java | 4 +-
.../com/jogamp/gluegen/opengl/GLConfiguration.java | 10 +-
.../com/jogamp/gluegen/opengl/GLEmitter.java | 18 +-
.../{GLExtensionNames.java => GLNameResolver.java} | 3 +-
.../runtime/opengl/GLProcAddressResolver.java | 4 +-
src/jogl/classes/com/jogamp/opengl/FBObject.java | 1943 ++++++++++++++++++++
.../classes/com/jogamp/opengl/GLExtensions.java | 81 +
.../classes/com/jogamp/opengl/JoglVersion.java | 32 +-
.../com/jogamp/opengl/OffscreenAutoDrawable.java | 98 +
.../opengl/cg/CgDynamicLibraryBundleInfo.java | 4 +-
.../classes/com/jogamp/opengl/swt/GLCanvas.java | 586 +++---
.../com/jogamp/opengl/util/AnimatorBase.java | 2 +-
.../classes/com/jogamp/opengl/util/FBObject.java | 483 -----
.../classes/com/jogamp/opengl/util/GLBuffers.java | 179 +-
.../com/jogamp/opengl/util/GLReadBufferUtil.java | 12 +-
.../com/jogamp/opengl/util/ImmModeSink.java | 25 +-
.../com/jogamp/opengl/util/awt/Screenshot.java | 3 +-
.../com/jogamp/opengl/util/awt/TextRenderer.java | 3 +-
.../com/jogamp/opengl/util/texture/Texture.java | 25 +-
.../com/jogamp/opengl/util/texture/TextureIO.java | 8 +
.../opengl/util/texture/TextureSequence.java | 1 -
.../util/texture/spi/NetPbmTextureWriter.java | 6 +-
.../media/opengl/DefaultGLCapabilitiesChooser.java | 17 +-
.../classes/javax/media/opengl/GLAutoDrawable.java | 211 ++-
.../javax/media/opengl/GLAutoDrawableDelegate.java | 144 ++
src/jogl/classes/javax/media/opengl/GLBase.java | 55 +
.../classes/javax/media/opengl/GLCapabilities.java | 198 +-
.../javax/media/opengl/GLCapabilitiesChooser.java | 12 +-
.../media/opengl/GLCapabilitiesImmutable.java | 9 +-
src/jogl/classes/javax/media/opengl/GLContext.java | 585 ++++--
.../classes/javax/media/opengl/GLDrawable.java | 30 +-
.../javax/media/opengl/GLDrawableFactory.java | 68 +-
src/jogl/classes/javax/media/opengl/GLPbuffer.java | 15 +-
src/jogl/classes/javax/media/opengl/GLProfile.java | 171 +-
.../javax/media/opengl/awt/AWTGLAutoDrawable.java | 16 +-
.../classes/javax/media/opengl/awt/GLCanvas.java | 521 ++++--
.../classes/javax/media/opengl/awt/GLJPanel.java | 256 ++-
.../jogamp/graph/curve/opengl/VBORegion2PES2.java | 32 +-
.../classes/jogamp/opengl/GLAutoDrawableBase.java | 532 ++++++
src/jogl/classes/jogamp/opengl/GLContextImpl.java | 638 ++++---
.../jogamp/opengl/GLDebugMessageHandler.java | 22 +-
.../jogamp/opengl/GLDrawableFactoryImpl.java | 245 ++-
.../classes/jogamp/opengl/GLDrawableHelper.java | 174 +-
src/jogl/classes/jogamp/opengl/GLDrawableImpl.java | 127 +-
.../classes/jogamp/opengl/GLFBODrawableImpl.java | 138 ++
.../opengl/GLGraphicsConfigurationFactory.java | 2 +-
.../jogamp/opengl/GLGraphicsConfigurationUtil.java | 75 +-
src/jogl/classes/jogamp/opengl/GLPbufferImpl.java | 292 +--
src/jogl/classes/jogamp/opengl/GLRunnableTask.java | 39 +-
src/jogl/classes/jogamp/opengl/egl/EGLContext.java | 129 +-
.../classes/jogamp/opengl/egl/EGLDisplayUtil.java | 100 +-
.../classes/jogamp/opengl/egl/EGLDrawable.java | 245 +--
.../jogamp/opengl/egl/EGLDrawableFactory.java | 441 ++++-
.../jogamp/opengl/egl/EGLExternalContext.java | 23 +-
.../jogamp/opengl/egl/EGLGLCapabilities.java | 25 +-
.../opengl/egl/EGLGraphicsConfiguration.java | 50 +-
.../egl/EGLGraphicsConfigurationFactory.java | 135 +-
.../jogamp/opengl/egl/EGLOnscreenContext.java | 19 +-
.../jogamp/opengl/egl/EGLOnscreenDrawable.java | 20 +-
.../jogamp/opengl/egl/EGLPbufferContext.java | 20 +-
.../jogamp/opengl/egl/EGLPbufferDrawable.java | 54 +-
.../jogamp/opengl/egl/EGLUpstreamSurfaceHook.java | 56 +
.../jogamp/opengl/macosx/cgl/MacOSXCGLContext.java | 217 ++-
.../opengl/macosx/cgl/MacOSXCGLDrawable.java | 44 +-
.../macosx/cgl/MacOSXCGLDrawableFactory.java | 226 ++-
.../macosx/cgl/MacOSXCGLGraphicsConfiguration.java | 9 +-
.../cgl/MacOSXCGLGraphicsConfigurationFactory.java | 4 +-
.../macosx/cgl/MacOSXExternalCGLContext.java | 30 +-
.../macosx/cgl/MacOSXOffscreenCGLContext.java | 22 +-
.../macosx/cgl/MacOSXOffscreenCGLDrawable.java | 15 +-
.../macosx/cgl/MacOSXOnscreenCGLContext.java | 28 +-
.../macosx/cgl/MacOSXOnscreenCGLDrawable.java | 17 +-
.../opengl/macosx/cgl/MacOSXPbufferCGLContext.java | 21 +-
.../macosx/cgl/MacOSXPbufferCGLDrawable.java | 65 +-
.../MacOSXAWTCGLGraphicsConfigurationFactory.java | 8 +-
.../jogamp/opengl/util/av/EGLMediaPlayerImpl.java | 8 +-
.../opengl/windows/wgl/WGLGLCapabilities.java | 23 +-
.../windows/wgl/WindowsBitmapWGLContext.java | 19 +-
.../windows/wgl/WindowsBitmapWGLDrawable.java | 35 +-
.../windows/wgl/WindowsDummyWGLDrawable.java | 105 --
.../windows/wgl/WindowsExternalWGLContext.java | 27 +-
.../windows/wgl/WindowsExternalWGLDrawable.java | 34 +-
.../windows/wgl/WindowsOnscreenWGLContext.java | 20 +-
.../windows/wgl/WindowsOnscreenWGLDrawable.java | 20 +-
.../windows/wgl/WindowsPbufferWGLContext.java | 24 +-
.../windows/wgl/WindowsPbufferWGLDrawable.java | 90 +-
.../opengl/windows/wgl/WindowsWGLContext.java | 77 +-
.../opengl/windows/wgl/WindowsWGLDrawable.java | 35 +-
.../windows/wgl/WindowsWGLDrawableFactory.java | 261 ++-
.../wgl/WindowsWGLGraphicsConfiguration.java | 46 +-
.../WindowsWGLGraphicsConfigurationFactory.java | 37 +-
.../WindowsAWTWGLGraphicsConfigurationFactory.java | 8 +-
.../jogamp/opengl/x11/glx/X11DummyGLXDrawable.java | 93 -
.../opengl/x11/glx/X11ExternalGLXContext.java | 42 +-
.../opengl/x11/glx/X11ExternalGLXDrawable.java | 21 +-
.../jogamp/opengl/x11/glx/X11GLCapabilities.java | 7 +-
.../jogamp/opengl/x11/glx/X11GLXContext.java | 83 +-
.../jogamp/opengl/x11/glx/X11GLXDrawable.java | 24 +-
.../opengl/x11/glx/X11GLXDrawableFactory.java | 257 ++-
.../x11/glx/X11GLXGraphicsConfiguration.java | 117 +-
.../glx/X11GLXGraphicsConfigurationFactory.java | 134 +-
.../opengl/x11/glx/X11OnscreenGLXContext.java | 14 +-
.../opengl/x11/glx/X11OnscreenGLXDrawable.java | 48 +-
.../opengl/x11/glx/X11PbufferGLXContext.java | 17 +-
.../opengl/x11/glx/X11PbufferGLXDrawable.java | 53 +-
.../jogamp/opengl/x11/glx/X11PixmapGLXContext.java | 19 +-
.../opengl/x11/glx/X11PixmapGLXDrawable.java | 39 +-
.../jogamp_opengl_util_av_impl_FFMPEGMediaPlayer.c | 6 +-
.../macosx/MacOSXWindowSystemInterface-pbuffer.m | 110 +-
.../native/macosx/MacOSXWindowSystemInterface.m | 14 +-
.../com/jogamp/nativewindow/WrappedSurface.java | 48 +-
.../nativewindow/awt/AWTGraphicsConfiguration.java | 4 +-
.../com/jogamp/nativewindow/awt/JAWTWindow.java | 181 +-
.../jogamp/nativewindow/egl/EGLGraphicsDevice.java | 67 +-
.../com/jogamp/nativewindow/swt/SWTAccessor.java | 47 +-
.../jogamp/nativewindow/x11/X11GraphicsDevice.java | 37 +-
.../jogamp/nativewindow/x11/X11GraphicsScreen.java | 8 +-
.../media/nativewindow/AbstractGraphicsDevice.java | 31 +-
.../javax/media/nativewindow/Capabilities.java | 157 +-
.../media/nativewindow/CapabilitiesChooser.java | 2 +-
.../media/nativewindow/CapabilitiesImmutable.java | 4 +-
.../nativewindow/DefaultCapabilitiesChooser.java | 4 +-
.../media/nativewindow/DefaultGraphicsDevice.java | 13 +
.../nativewindow/GraphicsConfigurationFactory.java | 226 ++-
.../javax/media/nativewindow/MutableSurface.java} | 42 +-
.../javax/media/nativewindow/NativeSurface.java | 23 +-
.../javax/media/nativewindow/NativeWindow.java | 60 +-
.../media/nativewindow/NativeWindowFactory.java | 17 +
.../media/nativewindow/OffscreenLayerSurface.java | 9 +-
.../javax/media/nativewindow/ProxySurface.java | 161 +-
.../media/nativewindow/SurfaceChangeable.java | 54 -
.../DefaultGraphicsConfigurationFactoryImpl.java | 2 +-
.../jogamp/nativewindow/NWJNILibLoader.java | 4 +-
.../jogamp/nativewindow/SurfaceUpdatedHelper.java | 4 +-
.../classes/jogamp/nativewindow/jawt/JAWTUtil.java | 16 +-
.../nativewindow/jawt/macosx/MacOSXJAWTWindow.java | 31 +-
.../jogamp/nativewindow/macosx/OSXUtil.java | 76 +-
.../jogamp/nativewindow/windows/GDISurface.java | 67 +-
.../jogamp/nativewindow/x11/X11Capabilities.java | 7 +-
.../x11/X11GraphicsConfigurationFactory.java | 18 +-
.../classes/jogamp/nativewindow/x11/X11Util.java | 37 +-
.../awt/X11AWTGraphicsConfigurationFactory.java | 16 +-
src/nativewindow/native/NativewindowCommon.c | 19 +
src/nativewindow/native/NativewindowCommon.h | 1 +
src/nativewindow/native/macosx/OSXmisc.m | 139 +-
src/nativewindow/native/x11/Xmisc.c | 238 +--
.../native/x11/Xmisc.h} | 38 +-
src/newt/classes/com/jogamp/newt/Display.java | 17 +
src/newt/classes/com/jogamp/newt/Window.java | 134 +-
.../classes/com/jogamp/newt/awt/NewtCanvasAWT.java | 80 +-
.../classes/com/jogamp/newt/event/KeyEvent.java | 2 +-
.../classes/com/jogamp/newt/opengl/GLWindow.java | 590 +++---
.../classes/com/jogamp/newt/swt/NewtCanvasSWT.java | 508 +++++
.../com/jogamp/newt/swt/SWTEDTUtil.java} | 105 +-
src/newt/classes/jogamp/newt/DefaultEDTUtil.java | 2 +-
src/newt/classes/jogamp/newt/DisplayImpl.java | 96 +-
src/newt/classes/jogamp/newt/NEWTJNILibLoader.java | 7 +-
src/newt/classes/jogamp/newt/OffscreenWindow.java | 46 +-
src/newt/classes/jogamp/newt/WindowImpl.java | 175 +-
.../newt/awt/event/AWTParentWindowAdapter.java | 21 +-
.../jogamp/newt/driver/android/AndroidDisplay.java | 16 +-
.../jogamp/newt/driver/android/AndroidWindow.java | 50 +
.../classes/jogamp/newt/driver/android/MD.java | 2 +-
.../classes/jogamp/newt/driver/awt/AWTCanvas.java | 6 +-
.../classes/jogamp/newt/driver/awt/AWTDisplay.java | 11 +-
.../jogamp/newt/driver/broadcom/egl/Display.java | 4 +-
.../jogamp/newt/driver/broadcom/egl/Window.java | 5 +-
.../jogamp/newt/driver/intel/gdl/Window.java | 4 +-
.../classes/jogamp/newt/driver/kd/KDDisplay.java | 15 +-
.../classes/jogamp/newt/driver/kd/KDWindow.java | 15 +-
.../jogamp/newt/driver/macosx/MacWindow.java | 23 +-
.../jogamp/newt/driver/windows/WindowsWindow.java | 25 +-
.../classes/jogamp/newt/driver/x11/X11Display.java | 4 +-
.../classes/jogamp/newt/driver/x11/X11Window.java | 7 +-
.../classes/jogamp/newt/event/NEWTEventTask.java | 13 +-
src/newt/native/KDWindow.c | 21 +-
src/newt/native/MacWindow.m | 56 +-
src/newt/native/NewtCommon.c | 19 +
src/newt/native/NewtCommon.h | 1 +
src/newt/native/NewtMacWindow.m | 6 +-
src/newt/native/X11Common.h | 2 +-
src/newt/native/X11Display.c | 81 +-
src/newt/native/X11Window.c | 12 +-
.../opengl/test/android/MovieCubeActivity0.java | 8 +-
.../opengl/test/android/NEWTGearsES2Activity.java | 8 +-
.../test/android/NEWTGearsES2ActivityLauncher.java | 2 +-
.../test/junit/graph/TestTextRendererNEWT00.java | 2 +-
.../graph/demos/GPURendererListenerBase01.java | 2 +-
.../junit/graph/demos/ui/UIListenerBase01.java | 2 +-
.../test/junit/jogl/acore/TestFBODrawableNEWT.java | 272 +++
.../jogl/{glsl => acore}/TestFBOMRTNEWT01.java | 61 +-
.../junit/jogl/acore/TestFBOMix2DemosES2NEWT.java | 258 +++
.../jogl/acore/TestGLAutoDrawableDelegateNEWT.java | 152 ++
.../acore/TestGLContextDrawableSwitchNEWT.java | 322 ++++
.../jogl/acore/TestGLContextSurfaceLockNEWT.java | 92 +-
.../test/junit/jogl/acore/TestGLProfile01NEWT.java | 2 +-
.../junit/jogl/acore/TestInitConcurrentNEWT.java | 2 +-
.../jogl/acore/TestNEWTCloseX11DisplayBug565.java | 8 +-
.../junit/jogl/acore/TestShutdownCompleteNEWT.java | 19 +-
.../TestAWTCardLayoutAnimatorStartStopBug532.java | 11 +-
.../test/junit/jogl/caps/MultisampleChooser01.java | 7 +-
.../junit/jogl/caps/TestMultisampleES1AWT.java | 42 +-
.../junit/jogl/caps/TestMultisampleES1NEWT.java | 77 +-
...pleES1NEWT.java => TestMultisampleES2NEWT.java} | 78 +-
.../test/junit/jogl/caps/TestTranslucencyAWT.java | 1 -
.../opengl/test/junit/jogl/demos/es1/GearsES1.java | 27 +-
.../{caps => demos/es1}/MultisampleDemoES1.java | 37 +-
.../jogl/demos/es1/newt/TestGearsES1NEWT.java | 4 +-
.../test/junit/jogl/demos/es2/FBOMix2DemosES2.java | 309 ++++
.../opengl/test/junit/jogl/demos/es2/GearsES2.java | 54 +-
.../junit/jogl/demos/es2/MultisampleDemoES2.java | 178 ++
.../test/junit/jogl/demos/es2/RedSquareES2.java | 80 +-
.../jogl/demos/es2/TextureSequenceCubeES2.java | 9 +-
.../test/junit/jogl/demos/es2/av/MovieCube.java | 5 +-
.../test/junit/jogl/demos/es2/av/MovieSimple.java | 5 +-
.../junit/jogl/demos/es2/awt/TestGearsES2AWT.java | 31 +-
.../jogl/demos/es2/newt/TestGearsES2NEWT.java | 20 +-
.../jogl/demos/es2/newt/TestRedSquareES2NEWT.java | 7 +-
.../junit/jogl/demos/es2/shader/mgl_default_xxx.fp | 10 +
.../junit/jogl/demos/es2/shader/mgl_default_xxx.vp | 14 +
.../junit/jogl/demos/es2/shader/texture02_xxx.fp | 20 +
.../opengl/test/junit/jogl/demos/gl2/Gears.java | 35 +-
...elAWTBug450.java => TestGLJPanelAWTBug450.java} | 50 +-
.../junit/jogl/demos/gl2/awt/TestGearsAWT.java | 12 +-
.../jogl/demos/gl2/awt/TestGearsGLJPanelAWT.java | 12 +-
.../junit/jogl/demos/gl2/newt/TestGearsNEWT.java | 4 +-
.../demos/gl2/newt/TestGearsNewtAWTWrapper.java | 4 +-
.../junit/jogl/glsl/TestGLSLShaderState01NEWT.java | 1 -
.../junit/jogl/glsl/TestGLSLShaderState02NEWT.java | 1 -
.../test/junit/jogl/offscreen/ReadBufferBase.java | 4 +-
.../test/junit/jogl/offscreen/Surface2File.java | 27 +-
.../offscreen/TestOffscreen01GLPBufferNEWT.java | 14 +-
.../jogl/offscreen/TestOffscreen02BitmapNEWT.java | 13 +-
.../test/junit/jogl/offscreen/WindowUtilNEWT.java | 31 +-
.../test/junit/jogl/swt/TestNewtCanvasSWTGLn.java | 233 +++
.../test/junit/jogl/swt/TestSWTAccessor02GLn.java | 257 ---
...TAWT01GLn.java => TestSWTAccessor03AWTGLn.java} | 10 +-
.../jogl/swt/TestSWTEclipseGLCanvas01GLn.java | 29 +-
...01GLnAWT.java => TestSWTJOGLGLCanvas01GLn.java} | 89 +-
.../TestGLReadBufferUtilTextureIOWrite01AWT.java | 156 ++
.../TestGLReadBufferUtilTextureIOWrite01NEWT.java | 58 +-
.../TestGLReadBufferUtilTextureIOWrite02AWT.java | 181 ++
.../TestGLReadBufferUtilTextureIOWrite02NEWT.java | 125 +-
.../util/texture/TestPNGTextureFromFileAWT.java | 13 +-
.../util/texture/TestPNGTextureFromFileNEWT.java | 11 +-
.../junit/newt/parenting/TestParenting01aSWT.java | 210 +++
.../newt/parenting/TestParenting01cSwingAWT.java | 161 +-
.../junit/newt/parenting/TestParenting02NEWT.java | 8 +-
.../junit/newt/parenting/TestParenting04AWT.java | 239 +++
.../junit/newt/parenting/TestParenting04SWT.java | 264 +++
.../TestParentingOffscreenLayer01GLCanvasAWT.java | 33 +-
.../parenting/TestTranslucentParentingAWT.java | 1 -
.../opengl/test/junit/util/NEWTGLContext.java | 8 +-
.../jogamp/opengl/test/junit/util/UITestCase.java | 55 +-
www/index.html | 9 +-
324 files changed, 15732 insertions(+), 6795 deletions(-)
diff --cc debian/changelog
index df5eef0,0000000..aa6e3c0
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,158 -1,0 +1,164 @@@
++libjogl2-java (2.0-rc10-1~exp1) experimental; urgency=low
++
++ * New upstream release
++
++ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 03 Sep 2012 09:34:29 +0200
++
+libjogl2-java (2.0-rc9-1~exp1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 02 Jul 2012 03:22:25 +0200
+
+libjogl2-java (2.0-rc8-1) unstable; urgency=low
+
+ * Upload to unstable
+ * Support of armhf & s390x added.
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Wed, 13 Jun 2012 18:34:05 +0200
+
+libjogl2-java (2.0-rc8-1~exp2) experimental; urgency=low
+
+ * Force also the version of gluegen2 in the package themself
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Wed, 13 Jun 2012 13:54:44 +0200
+
+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 e08f804,0000000..f975834
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-rc9-1~), libgluegen2-rt-java (>= 2.0-rc9-1~),
- ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev,
++ libgluegen2-build-java (>= 2.0-rc10-1~), libgluegen2-rt-java (>= 2.0-rc10-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://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 (>= 2.0-rc9), libjogl2-jni (>= ${source:Version})
++ libgluegen2-rt-java (>= 2.0-rc10), 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
++ 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/libjogl2-toolkits.install
index 82aef5d,0000000..9987f9f
mode 100644,000000..100644
--- a/debian/libjogl2-toolkits.install
+++ b/debian/libjogl2-toolkits.install
@@@ -1,1 -1,0 +1,1 @@@
- build/jogl/jogl.util.fixedfuncemu.jar /usr/share/java/
++build/jogl/jogl-util-fixedfuncemu.jar /usr/share/java/
diff --cc debian/patches/series
index 71ac3bf,0000000..13f767a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,15 -1,0 +1,15 @@@
+variousFixes.diff
+#disableOneDir.diff
+swt.diff
+#otherArchsoswin.diff
- disable_android.diff
++#disable_android.diff
+disable_git_call.diff
+disable_android_2.diff
+#arch_naming.diff
+#linker.cfg.id.os.diff
+#otherArchsoswin_2.diff
+#disable_android_3.diff
+TARGET_PLATFORM_LIBS_2.diff
+manifest.diff
+armhfbuild.diff
+s390x.diff
diff --cc debian/patches/variousFixes.diff
index 9c154c9,0000000..f393303
mode 100644,000000..100644
--- a/debian/patches/variousFixes.diff
+++ b/debian/patches/variousFixes.diff
@@@ -1,63 -1,0 +1,63 @@@
- Index: jogl-v2.0-rc9/make/build-common.xml
++Index: jogl-v2.0-rc10/make/build-common.xml
+===================================================================
- --- jogl-v2.0-rc9.orig/make/build-common.xml 2012-06-19 05:23:28.000000000 +0200
- +++ jogl-v2.0-rc9/make/build-common.xml 2012-07-02 03:25:02.878529381 +0200
++--- jogl-v2.0-rc10.orig/make/build-common.xml 2012-08-03 00:38:37.000000000 +0200
+++++ jogl-v2.0-rc10/make/build-common.xml 2012-09-03 09:38:18.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>
+@@ -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" />
+
- @@ -397,7 +397,7 @@
++@@ -400,7 +400,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="gluegen-rt-android.jar" value="${build.gluegen}/gluegen-rt-android.jar" />
- <property name="jogl.test.jar" value="${jar}/jogl.test.jar"/>
- <property name="jogl.test-android.jar" value="${jar}/jogl.test-android.jar"/>
- @@ -552,7 +552,10 @@
++ <property name="jogl-test.jar" value="${jar}/jogl-test.jar"/>
++ <property name="jogl-test-android.jar" value="${jar}/jogl-test-android.jar"/>
++@@ -555,7 +555,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: jogl-v2.0-rc9/make/build.xml
++Index: jogl-v2.0-rc10/make/build.xml
+===================================================================
- --- jogl-v2.0-rc9.orig/make/build.xml 2012-06-19 05:23:28.000000000 +0200
- +++ jogl-v2.0-rc9/make/build.xml 2012-07-02 03:24:29.006530137 +0200
++--- jogl-v2.0-rc10.orig/make/build.xml 2012-08-03 00:38:37.000000000 +0200
+++++ jogl-v2.0-rc10/make/build.xml 2012-09-03 09:38:18.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"/>
diff --cc debian/rules
index b48336e,0000000..068d5d1
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,29 -1,0 +1,29 @@@
+#!/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_BUILDFILE := make/build.xml
+ENABLE_BUILD_HELP_ARCHS := amd64 i386
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+build-indep:
+# Disable the build of the help on slow archs. It takes forever (a few hours)
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(ENABLE_BUILD_HELP_ARCHS)))
+ $(DEB_ANT_INVOKE) javadoc.all
+endif
+
+common-install-prehook-indep::
- mv build/jar/jogl.all.jar build/jar/jogl2.jar
++ 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