[libjogl2-java] 52/58: Imported Debian patch 2.1.4-1
Tony Mancill
tmancill at moszumanska.debian.org
Thu Sep 4 03:59:29 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 4be5974bcf281bbfd96985e15f774da39701a748
Merge: e99229f eb302d6
Author: Sylvestre Ledru <sylvestre at debian.org>
Date: Thu Feb 27 23:42:51 2014 +0100
Imported Debian patch 2.1.4-1
.classpath | 1 +
debian/changelog | 16 +-
debian/control | 6 +-
debian/patches/arm-build.diff | 40 +-
debian/patches/disable-applet.diff | 22 +
debian/patches/manifest.diff | 26 +-
debian/patches/s390x.diff | 22 +-
debian/patches/series | 2 +
debian/patches/variousFixes.diff | 18 +-
debian/rules | 2 +-
doc/HowToBuild.html | 5 +
doc/deployment/JOGL-DEPLOYMENT.html | 48 +-
doc/userguide/index.html | 2 +-
jnlp-files/jogl-applet-bug818_gljpanel01.html | 4 +-
...nner-newt-ElektronenMultiplizierer-napplet.html | 5 +-
...pplet-runner-newt-ElektronenMultiplizierer.html | 29 +-
...nner-newt-GraphTextDemo01-applet3-napplet.html} | 14 +-
...applet-runner-newt-GraphTextDemo01-napplet.html | 2 -
.../jogl-applet-runner-newt-GraphTextDemo01.html | 26 +-
...pplet-runner-newt-GraphTextDemo01b-napplet.html | 2 -
...r-newt-GraphUISceneDemo01-applet3-napplet.html} | 17 +-
...let-runner-newt-GraphUISceneDemo01-napplet.html | 5 +-
...jogl-applet-runner-newt-GraphUISceneDemo01.html | 29 +-
...let-runner-newt-MovieCube-applet3-napplet.html} | 17 +-
.../jogl-applet-runner-newt-MovieCube-napplet.html | 5 +-
jnlp-files/jogl-applet-runner-newt-MovieCube.html | 29 +-
...-applet-runner-newt-gears-applet3-napplet.html} | 67 +-
...runner-newt-gears-applet3-special-napplet.html} | 17 +-
.../jogl-applet-runner-newt-gears-gl3-napplet.html | 46 +-
...plet-runner-newt-gears-normal-launcheronly.html | 143 ---
...gl-applet-runner-newt-gears-normal-napplet.html | 42 +-
...l-applet-runner-newt-gears-normal-napplet2.html | 42 +-
.../jogl-applet-runner-newt-gears-normal.html | 115 +-
...l-applet-runner-newt-gears-special-napplet.html | 5 +-
.../jogl-applet-runner-newt-gears-special.html | 29 +-
jnlp-files/jogl-applet-runner-newt.jnlp | 1 -
...ml => jogl-applet-version-applet3-napplet.html} | 26 +-
jnlp-files/jogl-applet-version-lancheronly.html | 56 -
jnlp-files/jogl-applet-version-napplet.html | 8 +-
jnlp-files/jogl-applet-version.html | 26 +-
jnlp-files/jogl-applet-version.jnlp | 4 +-
jnlp-files/jogl-application-version.jnlp | 4 +-
jnlp-files/jogl-javaws-version.jnlp | 1 -
...l-test-applets.html => jogl-test-applet3s.html} | 111 +-
jnlp-files/jogl-test-applets.html | 28 +-
make/build-common.xml | 7 +-
make/build-jogl.xml | 2 +-
make/build-newt.xml | 14 +-
make/build-test.xml | 1 +
make/config/jogl/gl-common.cfg | 78 +-
make/config/jogl/gl-gl4bc.cfg | 46 +-
make/config/jogl/gl-if-CustomJavaCode-es3.java | 4 +
make/config/jogl/gl-if-CustomJavaCode-gl2.java | 40 +
make/config/jogl/gl-if-es3.cfg | 4 +-
make/config/jogl/gl-if-gl2.cfg | 1 +
make/config/jogl/gl-impl-CustomCCode-gl4bc.c | 91 +-
make/config/jogl/gl-impl-CustomCCode-gles1.c | 35 +
make/config/jogl/gl-impl-CustomCCode-gles3.c | 36 +
.../config/jogl/gl-impl-CustomJavaCode-common.java | 157 ++-
make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java | 238 +++-
make/config/jogl/gl-impl-CustomJavaCode-gles1.java | 59 +-
make/config/jogl/gl-impl-CustomJavaCode-gles3.java | 69 +-
make/joglversion | 2 +
make/joglversion-all | 2 +
make/joglversion-test | 4 +
make/joglversion-test-android | 1 +
make/nativewindowversion | 2 +
make/newtversion | 2 +
make/resources/android/AndroidManifest-jogl.xml | 12 -
make/resources/android/res-jogl/values/strings.xml | 2 -
.../assets-test/crosshair-grey-alpha-64x64.png | Bin 0 -> 424 bytes
.../resources/assets-test/jogamp-pointer-64x64.png | Bin 0 -> 2843 bytes
.../assets/jogl/util/data/av/test-ntsc01-57x32.png | Bin 0 -> 969 bytes
.../assets/newt/data/cross-grey-alpha-16x16.png | Bin 0 -> 286 bytes
make/resources/assets/newt/data/jogamp-16x16.png | Bin 0 -> 549 bytes
make/resources/assets/newt/data/jogamp-32x32.png | Bin 0 -> 1020 bytes
.../assets/newt/data/pointer-grey-alpha-16x24.png | Bin 0 -> 511 bytes
make/resources/misc/jogamp-48x48.png | Bin 0 -> 1278 bytes
make/resources/misc/jogamp-64x64.png | Bin 0 -> 1833 bytes
.../util/data/av => misc}/test-ntsc01-160x90.png | Bin
make/scripts/create-i386-libs-symlinks.sh | 10 +
make/scripts/make.jogl.all.android-armv6-cross.sh | 2 +
make/scripts/setenv-jogl.sh | 2 +-
make/scripts/test-win32-smb_share.bat | 33 +
make/scripts/tests-osx-x64-custom.sh | 2 +-
make/scripts/tests-osx-x64-java6.sh | 2 +-
make/scripts/tests-osx-x64.sh | 2 +-
make/scripts/tests-win.bat | 6 +-
make/scripts/tests-x64-dbg.bat | 3 +-
make/scripts/tests.sh | 105 +-
.../gluegen/opengl/BuildComposablePipeline.java | 19 +-
src/jogl/classes/com/jogamp/opengl/FBObject.java | 33 +-
.../com/jogamp/opengl/GLRendererQuirks.java | 88 +-
.../classes/com/jogamp/opengl/swt/GLCanvas.java | 5 +
.../com/jogamp/opengl/util/FPSAnimator.java | 12 +-
.../com/jogamp/opengl/util/GLArrayDataClient.java | 74 +-
.../com/jogamp/opengl/util/GLArrayDataServer.java | 337 ++++--
.../com/jogamp/opengl/util/GLArrayDataWrapper.java | 122 +-
.../com/jogamp/opengl/util/GLPixelBuffer.java | 100 ++
.../com/jogamp/opengl/util/PNGPixelRect.java | 335 ++++++
.../com/jogamp/opengl/util/av/GLMediaPlayer.java | 20 +-
.../com/jogamp/opengl/util/texture/TextureIO.java | 63 +-
.../jogamp/opengl/util/texture/spi/DDSImage.java | 33 +-
.../jogamp/opengl/util/texture/spi/PNGImage.java | 319 -----
src/jogl/classes/javax/media/opengl/GLBase.java | 89 +-
.../javax/media/opengl/GLBufferStorage.java | 150 +++
src/jogl/classes/javax/media/opengl/GLContext.java | 42 +-
src/jogl/classes/javax/media/opengl/GLProfile.java | 8 +-
.../javax/media/opengl/GLSharedContextSetter.java | 14 +-
.../classes/javax/media/opengl/awt/GLCanvas.java | 35 +-
.../classes/javax/media/opengl/awt/GLJPanel.java | 25 +-
.../classes/jogamp/opengl/GLAutoDrawableBase.java | 5 +
.../jogamp/opengl/GLBufferObjectTracker.java | 520 ++++++++
.../classes/jogamp/opengl/GLBufferSizeTracker.java | 200 ----
.../jogamp/opengl/GLBufferStateTracker.java | 153 ++-
src/jogl/classes/jogamp/opengl/GLContextImpl.java | 138 ++-
.../classes/jogamp/opengl/GLContextShareSet.java | 24 -
.../classes/jogamp/opengl/GLDrawableHelper.java | 36 +-
.../classes/jogamp/opengl/GLFBODrawableImpl.java | 4 +-
src/jogl/classes/jogamp/opengl/MemoryObject.java | 33 +-
src/jogl/classes/jogamp/opengl/egl/EGLContext.java | 35 +-
.../classes/jogamp/opengl/egl/EGLDisplayUtil.java | 219 ++--
.../jogamp/opengl/egl/EGLDrawableFactory.java | 126 +-
.../opengl/egl/EGLDynamicLibraryBundleInfo.java | 3 +
.../opengl/egl/EGLGraphicsConfiguration.java | 27 +-
.../egl/EGLGraphicsConfigurationFactory.java | 13 +-
.../jogamp/opengl/egl/EGLUpstreamSurfaceHook.java | 1 +
.../jogamp/opengl/macosx/cgl/MacOSXCGLContext.java | 2 +-
.../jogamp/opengl/openal/av/ALAudioSink.java | 2 +-
.../jogamp/opengl/util/av/GLMediaPlayerImpl.java | 25 +-
.../jogamp/opengl/util/av/NullGLMediaPlayer.java | 2 +-
.../opengl/util/av/impl/FFMPEGMediaPlayer.java | 16 +-
.../opengl/util/glsl/fixedfunc/FixedFuncHook.java | 24 +-
src/jogl/native/GLContext.c | 2 +-
src/jogl/native/GLDebugMessageHandler.c | 95 +-
src/jogl/native/JoglCommon.c | 97 +-
src/jogl/native/JoglCommon.h | 55 +-
src/jogl/native/libav/ffmpeg_impl_template.c | 4 +-
.../macosx/MacOSXWindowSystemInterface-calayer.m | 1 +
.../jogamp_opengl_util_av_impl_OMXGLMediaPlayer.c | 5 +-
.../UpstreamSurfaceHookMutableSizePos.java | 36 +
.../com/jogamp/nativewindow/awt/JAWTWindow.java | 160 +--
.../jogamp/nativewindow/egl/EGLGraphicsDevice.java | 12 +
.../jogamp/nativewindow/x11/X11GraphicsDevice.java | 15 +
.../media/nativewindow/DefaultGraphicsDevice.java | 2 +-
.../media/nativewindow/NativeWindowFactory.java | 65 +
.../media/nativewindow/OffscreenLayerSurface.java | 18 +
.../javax/media/nativewindow/util/PixelFormat.java | 196 +++
.../media/nativewindow/util/PixelFormatUtil.java | 374 ++++++
.../media/nativewindow/util/PixelRectangle.java | 194 +++
.../jogamp/nativewindow/ProxySurfaceImpl.java | 6 +-
.../classes/jogamp/nativewindow/WrappedWindow.java | 98 ++
.../classes/jogamp/nativewindow/awt/AWTMisc.java | 57 +
.../jogamp/nativewindow/windows/GDIUtil.java | 8 +-
.../windows/RegisteredClassFactory.java | 7 +-
src/nativewindow/native/NativewindowCommon.c | 107 +-
src/nativewindow/native/NativewindowCommon.h | 61 +-
src/nativewindow/native/macosx/OSXmisc.m | 51 +-
src/nativewindow/native/win32/GDImisc.c | 17 +-
src/nativewindow/native/x11/Xmisc.c | 162 ++-
src/newt/classes/com/jogamp/newt/Display.java | 180 ++-
src/newt/classes/com/jogamp/newt/NewtFactory.java | 86 +-
src/newt/classes/com/jogamp/newt/Window.java | 30 +
.../classes/com/jogamp/newt/awt/NewtCanvasAWT.java | 4 +-
.../jogamp/newt/awt/applet/JOGLNewtApplet1Run.java | 1 +
.../classes/com/jogamp/newt/opengl/GLWindow.java | 11 +
.../applet/JOGLNewtApplet3Run.java} | 324 ++---
.../{awt => util}/applet/JOGLNewtAppletBase.java | 108 +-
.../jogamp/newt/util/applet/VersionApplet3.java | 226 ++++
src/newt/classes/jogamp/newt/DefaultEDTUtil.java | 49 +-
src/newt/classes/jogamp/newt/DisplayImpl.java | 196 ++-
src/newt/classes/jogamp/newt/PointerIconImpl.java | 171 +++
src/newt/classes/jogamp/newt/WindowImpl.java | 404 ++++---
.../newt/awt/event/AWTParentWindowAdapter.java | 20 +-
src/newt/classes/jogamp/newt/driver/PNGIcon.java | 80 ++
.../jogamp/newt/driver/android/DisplayDriver.java | 11 +-
.../driver/android/NewtDebugActivityLauncher.java | 21 -
.../newt/driver/android/NewtVersionActivity.java | 88 +-
.../android/NewtVersionActivityLauncher.java | 2 +-
.../driver/android/NewtVersionBaseActivity.java | 120 --
.../jogamp/newt/driver/android/WindowDriver.java | 217 ++--
.../newt/driver/bcm/vc/iv/DisplayDriver.java | 132 +-
.../jogamp/newt/driver/bcm/vc/iv/WindowDriver.java | 134 ++-
.../jogamp/newt/driver/kd/DisplayDriver.java | 1 +
.../newt/driver/linux/LinuxMouseTracker.java | 12 +-
.../jogamp/newt/driver/macosx/DisplayDriver.java | 57 +
.../jogamp/newt/driver/macosx/WindowDriver.java | 30 +-
.../jogamp/newt/driver/opengl/JoglUtilPNGIcon.java | 89 ++
.../jogamp/newt/driver/windows/DisplayDriver.java | 60 +-
.../jogamp/newt/driver/windows/WindowDriver.java | 26 +-
.../jogamp/newt/driver/x11/DisplayDriver.java | 39 +-
.../jogamp/newt/driver/x11/WindowDriver.java | 98 +-
src/newt/native/MacWindow.m | 201 +++-
src/newt/native/NewtCommon.c | 96 +-
src/newt/native/NewtCommon.h | 26 +-
src/newt/native/NewtMacWindow.h | 96 +-
src/newt/native/NewtMacWindow.m | 1257 ++++++++++----------
src/newt/native/WindowsWindow.c | 159 ++-
src/newt/native/X11Display.c | 57 +
src/newt/native/X11Window.c | 173 ++-
src/newt/native/bcm_vc_iv.c | 350 +++++-
src/newt/native/bcm_vc_iv.h | 130 +-
.../junit/jogl/acore/TestGLMesaBug658NEWT.java | 2 +-
.../test/junit/jogl/acore/TestGLProfile01NEWT.java | 322 ++++-
.../junit/jogl/acore/TestInitConcurrent01NEWT.java | 20 +-
.../junit/jogl/acore/TestMapBufferRead01NEWT.java | 90 +-
.../jogl/acore/TestSharedContextVBOES2NEWT0.java | 67 +-
.../jogl/acore/TestSharedContextVBOES2NEWT3.java | 87 +-
.../TestAWTCardLayoutAnimatorStartStopBug532.java | 92 +-
.../awt/TestBug664GLCanvasSetVisibleSwingAWT.java | 96 +-
...estBug816JTabbedPanelVisibilityB849B878AWT.java | 47 +-
.../jogl/awt/TestBug816OSXCALayerPos01AWT.java | 41 +-
.../awt/TestBug816OSXCALayerPos03aB729AWT.java | 6 +-
.../awt/TestBug816OSXCALayerPos03bB849AWT.java | 6 +-
.../awt/TestBug816OSXCALayerPos03cB849AWT.java | 6 +-
.../opengl/test/junit/jogl/demos/GearsObject.java | 59 +-
.../junit/jogl/demos/TextureSequenceDemo01.java | 2 +-
.../opengl/test/junit/jogl/demos/es1/GearsES1.java | 14 +-
.../test/junit/jogl/demos/es1/GearsObjectES1.java | 30 +-
.../opengl/test/junit/jogl/demos/es2/GearsES2.java | 22 +-
.../test/junit/jogl/demos/es2/GearsObjectES2.java | 37 +-
.../junit/jogl/demos/es2/RedSquareMappedES2.java | 281 +++++
.../test/junit/jogl/demos/es2/av/MovieSimple.java | 287 +++--
.../jogl/demos/es2/newt/TestGearsES2NEWT.java | 131 +-
.../jogl/demos/es2/newt/TestRedSquareES2NEWT.java | 46 +-
.../opengl/test/junit/jogl/demos/gl2/Teapot.java | 4 +-
.../test/junit/jogl/glsl/GLSLMiscHelper.java | 4 +-
.../jogl/perf/TestPerf001GLJPanelInit01AWT.java | 15 +-
.../jogl/perf/TestPerf001GLJPanelInit02AWT.java | 15 +-
.../jogl/perf/TestPerf001GLWindowInit03NEWT.java | 15 +-
.../jogl/util/DemoGL2ES1TextureImmModeSink.java | 2 +-
.../test/junit/jogl/util/texture/PNGTstFiles.java} | 36 +-
.../texture/TestBug362DDSImageCreateFromData.java | 98 ++
.../jogl/util/texture/TestPNGImage00NEWT.java | 92 --
.../jogl/util/texture/TestPNGPixelRect00NEWT.java | 226 ++++
...mage01NEWT.java => TestPNGPixelRect01NEWT.java} | 109 +-
.../util/texture/TestPixelFormatUtil00NEWT.java | 364 ++++++
.../util/texture/TestPixelFormatUtil01NEWT.java | 105 ++
.../jogl/util/texture/cross-grey-alpha-16x16.png | Bin 0 -> 286 bytes
.../jogl/util/texture/pointer-grey-alpha-16x24.png | Bin 0 -> 511 bytes
.../junit/jogl/util/texture/test-64x32_DXT1.dds | Bin 0 -> 1512 bytes
.../junit/jogl/util/texture/test-64x32_DXT5.dds | Bin 0 -> 2896 bytes
.../jogl/util/texture/test-64x32_uncompressed.dds | Bin 0 -> 8321 bytes
.../parenting/NewtAWTReparentingKeyAdapter.java | 103 +-
.../junit/newt/parenting/TestParenting01dAWT.java | 5 +-
.../opengl/test/junit/util/AWTRobotUtil.java | 4 +-
.../jogamp/opengl/test/junit/util/QuitAdapter.java | 17 +-
247 files changed, 11532 insertions(+), 4722 deletions(-)
diff --cc debian/changelog
index e1303bd,0000000..9337ede
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,261 -1,0 +1,269 @@@
- libjogl2-java (2.1.3-1+alpha) unreleased; urgency=low
++libjogl2-java (2.1.4-1) unstable; urgency=medium
+
- * Add alpha to build configs to fix FTBFS on alpha.
- * Enable javadoc build on alpha for this upload to unreleased.
++ * New upstream release
++ * Disable the build of com/jogamp/newt/util/applet/
++
++ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 27 Feb 2014 23:42:51 +0100
++
++libjogl2-java (2.1.3-2) UNRELEASED; urgency=medium
++
++ * Team upload.
++ * Add patch (alpha.diff) to allow compilation on alpha. (Closes: #739397)
++ - Thanks to Michael Cree for the patch.
+
- -- Michael Cree <mcree at orcon.net.nz> Sun, 16 Feb 2014 12:21:21 +1300
++ -- tony mancill <tmancill at debian.org> Tue, 18 Feb 2014 21:22:22 -0800
+
+libjogl2-java (2.1.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Repack script updated to remove www/
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 17 Dec 2013 09:26:26 +0100
+
+libjogl2-java (2.1.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Fri, 08 Nov 2013 10:53:16 +0100
+
+libjogl2-java (2.0.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 28 Sep 2013 19:08:07 +0200
+
+libjogl2-java (2.0-rc12-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 01 Jul 2013 14:26:13 +0200
+
+libjogl2-java (2.0-rc11-1) unstable; urgency=low
+
+ * Upload to unstable
+ * Standards-Version updated to 3.9.4
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Wed, 15 May 2013 10:18:59 +0200
+
+libjogl2-java (2.0-rc11-1~exp5) experimental; urgency=low
+
+ [ Colin Watson ]
+ * Define isAbiEabiGnuArmhf=true when building for armhf.
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 03 Mar 2013 13:54:53 +0100
+
+libjogl2-java (2.0-rc11-1~exp4.3) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Search libs in default system paths in make/build-newt.xml
+ * Combine TARGET_PLATFORM_LIBS_2.diff, armhfbuild.diff and armhf-build.diff
+ patches into arm-build.diff patch.
+
+ -- Thomas Preud'homme <robotux at debian.org> Wed, 26 Dec 2012 15:23:17 +0100
+
+libjogl2-java (2.0-rc11-1~exp4.2) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Fix wrong copy/paste in changes made in previous upload.
+
+ -- Thomas Preud'homme <robotux at debian.org> Wed, 26 Dec 2012 10:11:00 +0100
+
+libjogl2-java (2.0-rc11-1~exp4.1) experimental; urgency=low
+
+ * Fix armhf FTBFS by generalizing changes to build-nativewindow.xml to
+ build-jogl.xml and build-newt.xml.
+
+ -- Thomas Preud'homme <robotux at debian.org> Tue, 25 Dec 2012 20:18:58 +0100
+
+libjogl2-java (2.0-rc11-1~exp4) experimental; urgency=low
+
+ * Try again to fix the armhf FTBFS (thanks again to Thomas Preud'homme)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 24 Dec 2012 09:12:34 +0100
+
+libjogl2-java (2.0-rc11-1~exp3) experimental; urgency=low
+
+ * Apply Ubuntu changes introduced in 2.0-rc8-1ubuntu1
+ * Set source and target to 1.5 for OpenJDK 6 compatibility (LP: #1049719).
+ * Try something with Thomas Preud'homme to see if we can fix the armhf
+ build
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 20 Dec 2012 17:04:08 +0100
+
+libjogl2-java (2.0-rc11-1~exp2) experimental; urgency=low
+
+ * Enable the verbose mode to find out the reason of the FTBFS under armhf
+ (libXrender.so uses VFP register arguments, libnativewindow_x11.so does not)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Fri, 30 Nov 2012 17:11:16 +0100
+
+libjogl2-java (2.0-rc11-1~exp1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 08 Nov 2012 16:51:30 +0100
+
+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 c29fdd4,0000000..fe28330
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,92 -1,0 +1,92 @@@
+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.1.3), libgluegen2-rt-java (>= 2.1.3),
++ libgluegen2-build-java (>= 2.1.3), libgluegen2-rt-java (>= 2.1.4),
+ 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)
++ ant (>= 1.8), libxcursor-dev
+Standards-Version: 3.9.5
+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.1.3), libjogl2-jni (>= ${source:Version})
++ libgluegen2-rt-java (>= 2.1.4), 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-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/arm-build.diff
index 85bc2ca,0000000..cf96fe0
mode 100644,000000..100644
--- a/debian/patches/arm-build.diff
+++ b/debian/patches/arm-build.diff
@@@ -1,273 -1,0 +1,275 @@@
- Index: jogl-v2.1.2/make/build-jogl.xml
++Index: jogl-v2.1.4/make/build-jogl.xml
+===================================================================
- --- jogl-v2.1.2.orig/make/build-jogl.xml 2013-11-08 10:54:31.000000000 +0100
- +++ jogl-v2.1.2/make/build-jogl.xml 2013-11-08 10:54:31.000000000 +0100
++--- jogl-v2.1.4.orig/make/build-jogl.xml 2014-02-11 15:57:15.689427868 +0100
+++++ jogl-v2.1.4/make/build-jogl.xml 2014-02-11 15:57:15.689427868 +0100
+@@ -200,6 +200,19 @@
+ <isset property="setup.noSWT"/>
+ </condition>
+
++ <condition property="isLinuxARM">
++ <and>
++ <istrue value="${isLinux}" />
++ <or>
++ <os arch="arm" />
++ <os arch="armv4" />
++ <os arch="armv5" />
++ <os arch="armv6" />
++ <os arch="armv7" />
++ </or>
++ </and>
++ </condition>
++
+ <property name="java.excludes.javadoc.packagenames"
+ value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
+
+@@ -1187,7 +1200,7 @@
+ <includepath path="/usr/local/include" />
+ </compiler>
+
+- <compiler id="compiler.cfg.linux.armv6.jogl.x11" extends="compiler.cfg.linux.armv6">
++ <compiler id="compiler.cfg.linux.arm.jogl.x11" extends="compiler.cfg.linux">
+ <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
+ <compilerarg value="-idirafter" />
+ <compilerarg value="/usr/include" />
+@@ -1215,8 +1228,8 @@
+ <syslibset libs="X11"/>
+ </linker>
+
+- <linker id="linker.cfg.linux.armv6.jogl.x11" extends="linker.cfg.linux.armv6">
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11"/>
++ <linker id="linker.cfg.linux.arm.jogl.x11" extends="linker.cfg.linux">
++ <syslibset libs="X11"/>
+ </linker>
+
+ <linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
+@@ -1304,10 +1317,10 @@
+ <property name="linker.cfg.id.os" value="linker.cfg.linux.amd64.jogl.x11" />
+ </target>
+
+- <target name="c.configure.linux.armv6" if="isLinuxARMv6">
+- <echo message="Linux.armv6" />
+- <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.jogl.x11" />
+- <property name="linker.cfg.id.os" value="linker.cfg.linux.armv6.jogl.x11" />
++ <target name="c.configure.linux.arm" if="isLinuxARM">
++ <echo message="Linux.arm" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.arm.jogl.x11" />
++ <property name="linker.cfg.id.os" value="linker.cfg.linux.arm.jogl.x11" />
+ </target>
+
+ <target name="c.configure.linux.ia64" if="isLinuxIA64">
+@@ -1358,7 +1371,7 @@
+ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
+ </target>
+
+- <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
++ <target name="c.configure.linux" depends="c.configure.linux.arm,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+
+ <target name="c.configure.android" if="isAndroid">
+ <echo message="Android" />
- Index: jogl-v2.1.2/make/build-nativewindow.xml
++Index: jogl-v2.1.4/make/build-nativewindow.xml
+===================================================================
- --- jogl-v2.1.2.orig/make/build-nativewindow.xml 2013-11-08 10:54:31.000000000 +0100
- +++ jogl-v2.1.2/make/build-nativewindow.xml 2013-11-08 10:54:31.000000000 +0100
++--- jogl-v2.1.4.orig/make/build-nativewindow.xml 2014-02-11 15:57:15.689427868 +0100
+++++ jogl-v2.1.4/make/build-nativewindow.xml 2014-02-11 15:57:15.689427868 +0100
+@@ -88,6 +88,19 @@
+ <isset property="setup.noAWT"/>
+ </condition>
+
++ <condition property="isLinuxARM">
++ <and>
++ <istrue value="${isLinux}" />
++ <or>
++ <os arch="arm" />
++ <os arch="armv4" />
++ <os arch="armv5" />
++ <os arch="armv6" />
++ <os arch="armv7" />
++ </or>
++ </and>
++ </condition>
++
+ <property name="java.excludes.all" value="${java.excludes.awt}" />
+ <echo message="java.excludes.all: ${java.excludes.all}" />
+ </target>
+@@ -342,7 +355,7 @@
+ <includepath path="/usr/local/include" />
+ </compiler>
+
+- <compiler id="compiler.cfg.linux.armv6.nativewindow.x11" extends="compiler.cfg.linux.armv6">
++ <compiler id="compiler.cfg.linux.arm.nativewindow.x11" extends="compiler.cfg.linux">
+ <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
+ <compilerarg value="-idirafter" />
+ <compilerarg value="/usr/include" />
+@@ -395,10 +408,10 @@
+ <syslibset libs="Xrender"/>
+ </linker>
+
+- <linker id="linker.cfg.linux.armv6.nativewindow.x11" extends="linker.cfg.linux.armv6">
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" />
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xxf86vm" />
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" />
++ <linker id="linker.cfg.linux.arm.nativewindow.x11" extends="linker.cfg.linux">
++ <syslibset libs="X11" />
++ <syslibset libs="Xxf86vm" />
++ <syslibset libs="Xrender" />
+ </linker>
+
+ <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
+@@ -483,10 +496,10 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.nativewindow.x11" />
+ </target>
+
+- <target name="c.configure.linux.armv6" if="isLinuxARMv6">
+- <echo message="Linux.armv6" />
+- <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.nativewindow.x11" />
+- <property name="linker.cfg.id.oswin" value="linker.cfg.linux.armv6.nativewindow.x11" />
++ <target name="c.configure.linux.arm" if="isLinuxARM">
++ <echo message="Linux.arm" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.arm.nativewindow.x11" />
++ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.arm.nativewindow.x11" />
+ </target>
+
+ <target name="c.configure.linux.ia64" if="isLinuxIA64">
+@@ -537,7 +550,7 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
+ </target>
+
+- <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
++ <target name="c.configure.linux" depends="c.configure.linux.arm,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+
+ <target name="c.configure.android" if="isAndroid">
+ <echo message="Android" />
- Index: jogl-v2.1.2/make/build-newt.xml
++Index: jogl-v2.1.4/make/build-newt.xml
+===================================================================
- --- jogl-v2.1.2.orig/make/build-newt.xml 2013-11-08 10:54:31.000000000 +0100
- +++ jogl-v2.1.2/make/build-newt.xml 2013-11-08 10:54:31.000000000 +0100
++--- jogl-v2.1.4.orig/make/build-newt.xml 2014-02-11 15:57:15.689427868 +0100
+++++ jogl-v2.1.4/make/build-newt.xml 2014-02-11 15:58:15.169426413 +0100
+@@ -157,6 +157,19 @@
+ <isset property="setup.noOpenGL"/>
+ </condition>
+
++ <condition property="isLinuxARM">
++ <and>
++ <istrue value="${isLinux}" />
++ <or>
++ <os arch="arm" />
++ <os arch="armv4" />
++ <os arch="armv5" />
++ <os arch="armv6" />
++ <os arch="armv7" />
++ </or>
++ </and>
++ </condition>
++
+ <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.swt}, ${java.excludes.opengl}" />
+ <echo message="java.excludes.all: ${java.excludes.all}" />
+
+@@ -265,7 +278,7 @@
+ <includepath path="/usr/local/include" />
+ </compiler>
+
+- <compiler id="compiler.cfg.linux.armv6.newt.x11" extends="compiler.cfg.linux.armv6">
++ <compiler id="compiler.cfg.linux.arm.newt.x11" extends="compiler.cfg.linux">
+ <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
+ <compilerarg value="-idirafter" />
+ <compilerarg value="/usr/include" />
- @@ -320,13 +333,13 @@
++@@ -325,14 +338,13 @@
+ <!--syslibset libs="X11-xcb" /-->
+ </linker>
+
+- <linker id="linker.cfg.linux.armv6.newt.x11" extends="linker.cfg.linux.armv6">
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" />
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrandr" />
++- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xcursor" />
++- </linker>
++ <linker id="linker.cfg.linux.arm.newt.x11" extends="linker.cfg.linux">
++ <syslibset libs="X11" />
++ <syslibset libs="Xrandr" />
- </linker>
+++ </linker>
+
+ <linker id="linker.cfg.android.newt" extends="linker.cfg.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">
- @@ -412,11 +425,11 @@
++@@ -421,11 +433,11 @@
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+ </target>
+
+- <target name="c.configure.linux.armv6" if="isLinuxARMv6">
+- <echo message="Linux.armv6" />
+- <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.newt.x11" />
+- <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.armv6.newt.x11"
+- else="linker.cfg.linux.armv6">
++ <target name="c.configure.linux.arm" if="isLinuxARM">
++ <echo message="Linux.arm" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.arm.newt.x11" />
++ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.arm.newt.x11"
++ else="linker.cfg.linux.arm">
+ <isset property="isX11" />
+ </condition>
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
- @@ -498,7 +511,7 @@
++@@ -507,7 +519,7 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" />
+ </target>
+
+- <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
++ <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.arm,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
+
+ <target name="c.configure.android" if="isAndroid">
+ <echo message="Android" />
- Index: jogl-v2.1.2/make/scripts/make.jogl.all.linux-armv7hf.sh
++Index: jogl-v2.1.4/make/scripts/make.jogl.all.linux-armv7hf.sh
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
- +++ jogl-v2.1.2/make/scripts/make.jogl.all.linux-armv7hf.sh 2013-11-08 10:54:31.000000000 +0100
+++++ jogl-v2.1.4/make/scripts/make.jogl.all.linux-armv7hf.sh 2014-02-11 15:57:15.689427868 +0100
+@@ -0,0 +1,27 @@
++#! /bin/sh
++
++# arm-linux-gnueabihf == armhf triplet
++PATH=`pwd`/../../gluegen/make/lib/linux/arm-linux-gnueabihf/bin:$PATH
++export PATH
++
++# -Dc.compiler.debug=true
++# -Dgluegen.cpptasks.detected.os=true \
++# -DisUnix=true \
++# -DisLinux=true \
++# -DisLinuxARMv7=true \
++# -DisX11=false \
++
++export TARGET_PLATFORM_ROOT=/
++export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabihf
++export TARGET_JAVA_LIBS=/usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm
++
++export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv7hf.xml"
++
++ant \
++ -Drootrel.build=build-linux-armv7hf \
++ -Dsetup.addNativeKD=true \
++ -Dsetup.addNativeOpenMAX=true \
++ -Dsetup.addNativeBroadcom=true \
++ -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \
++ $* 2>&1 | tee make.jogl.all.linux-armv7hf.log
++
- Index: jogl-v2.1.2/make/scripts/tests-armv7_armhf.sh
++Index: jogl-v2.1.4/make/scripts/tests-armv7_armhf.sh
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
- +++ jogl-v2.1.2/make/scripts/tests-armv7_armhf.sh 2013-11-08 10:54:31.000000000 +0100
+++++ jogl-v2.1.4/make/scripts/tests-armv7_armhf.sh 2014-02-11 15:57:15.689427868 +0100
+@@ -0,0 +1,7 @@
++#! /bin/bash
++
++spath=`dirname $0`
++
++. $spath/tests.sh `which java` -DummyArg ../build-linux-armv7hf $*
++
++
- Index: jogl-v2.1.2/make/scripts/tests-linux-armv7hf.sh
++Index: jogl-v2.1.4/make/scripts/tests-linux-armv7hf.sh
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
- +++ jogl-v2.1.2/make/scripts/tests-linux-armv7hf.sh 2013-11-08 10:54:31.000000000 +0100
+++++ jogl-v2.1.4/make/scripts/tests-linux-armv7hf.sh 2014-02-11 15:57:15.689427868 +0100
+@@ -0,0 +1,7 @@
++#! /bin/bash
++
++spath=`dirname $0`
++
++. $spath/tests.sh `which java` -DummyArg ../build-linux-armv7hf $*
++
++
diff --cc debian/patches/disable-applet.diff
index 0000000,0000000..ecbd82a
new file mode 100644
--- /dev/null
+++ b/debian/patches/disable-applet.diff
@@@ -1,0 -1,0 +1,22 @@@
++Index: libjogl2-java-2.1.4/make/build-newt.xml
++===================================================================
++--- libjogl2-java-2.1.4.orig/make/build-newt.xml 2014-02-27 23:21:42.000000000 +0100
+++++ libjogl2-java-2.1.4/make/build-newt.xml 2014-02-27 23:32:11.638399263 +0100
++@@ -100,7 +100,7 @@
++ <!-- partitioning -->
++
++ <property name="java.part.core"
++- value="com/jogamp/newt/* com/jogamp/newt/event/* com/jogamp/newt/util/* com/jogamp/newt/util/applet/* jogamp/newt/* jogamp/newt/event/* jogamp/newt/driver/*"/>
+++ value="com/jogamp/newt/* com/jogamp/newt/event/* com/jogamp/newt/util/* jogamp/newt/* jogamp/newt/event/* jogamp/newt/driver/*"/>
++
++ <property name="java.part.opengl"
++ value="com/jogamp/newt/opengl/** jogamp/newt/driver/opengl/**"/>
++@@ -236,7 +236,7 @@
++ -->
++ <target name="java.compile.javase">
++ <javac destdir="${classes}"
++- excludes="${java.excludes.all} ${java.part.driver.android}"
+++ excludes="${java.excludes.all} ${java.part.driver.android} com/jogamp/newt/util/applet/*"
++ fork="yes"
++ includeAntRuntime="false"
++ memoryMaximumSize="${javac.memorymax}"
diff --cc debian/patches/manifest.diff
index 1872276,0000000..ad5c49b
mode 100644,000000..100644
--- a/debian/patches/manifest.diff
+++ b/debian/patches/manifest.diff
@@@ -1,18 -1,0 +1,20 @@@
- Index: jogl-v2.1.2/make/joglversion
++Index: jogl-v2.1.4/make/joglversion
+===================================================================
- --- jogl-v2.1.2.orig/make/joglversion 2013-11-08 10:54:26.000000000 +0100
- +++ jogl-v2.1.2/make/joglversion 2013-11-08 10:54:26.000000000 +0100
- @@ -8,10 +8,12 @@
++--- jogl-v2.1.4.orig/make/joglversion 2014-02-11 15:56:19.285429247 +0100
+++++ jogl-v2.1.4/make/joglversion 2014-02-11 15:57:01.845428206 +0100
++@@ -2,7 +2,7 @@
++ Application-Name: Java Bindings for OpenGL
++ Specification-Title: Java Bindings for OpenGL API Specification
++ Specification-Version: @BASEVERSION@
++-Specification-Vendor: JogAmp Community
+++Specification-Vendor: JogAmp Community - Debian package
++ Implementation-Title: Java Bindings for OpenGL Runtime Environment
++ Implementation-Version: @VERSION@
+ Implementation-Build: @BUILD_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
++@@ -15,5 +15,6 @@
+ Trusted-Library: true
+ Permissions: all-permissions
++ Application-Library-Allowable-Codebase: *
++Class-Path: /usr/share/java/gluegen2-rt.jar
+ @JAR_CODEBASE_TAG@
- +
++
diff --cc debian/patches/s390x.diff
index 3893542,0000000..475c76e
mode 100644,000000..100644
--- a/debian/patches/s390x.diff
+++ b/debian/patches/s390x.diff
@@@ -1,81 -1,0 +1,81 @@@
- Index: jogl-v2.1.2/make/build-jogl.xml
++Index: jogl-v2.1.4/make/build-jogl.xml
+===================================================================
- --- jogl-v2.1.2.orig/make/build-jogl.xml 2013-11-08 10:54:28.000000000 +0100
- +++ jogl-v2.1.2/make/build-jogl.xml 2013-11-08 10:54:28.000000000 +0100
++--- jogl-v2.1.4.orig/make/build-jogl.xml 2014-02-11 15:57:11.017427982 +0100
+++++ jogl-v2.1.4/make/build-jogl.xml 2014-02-11 15:57:11.013427982 +0100
+@@ -1345,6 +1345,12 @@
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
+ </target>
++
++ <target name="c.configure.linux.s390x" if="isLinuxs390x">
++ <echo message="Linux.S390x" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
++ </target>
+
+ <target name="c.configure.linux.sparc" if="isLinuxSparc">
+ <echo message="Linux.SPARC" />
+@@ -1352,7 +1358,7 @@
+ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
+ </target>
+
+- <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
++ <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+
+ <target name="c.configure.android" if="isAndroid">
+ <echo message="Android" />
- Index: jogl-v2.1.2/make/build-nativewindow.xml
++Index: jogl-v2.1.4/make/build-nativewindow.xml
+===================================================================
- --- jogl-v2.1.2.orig/make/build-nativewindow.xml 2013-11-08 10:54:28.000000000 +0100
- +++ jogl-v2.1.2/make/build-nativewindow.xml 2013-11-08 10:54:28.000000000 +0100
++--- jogl-v2.1.4.orig/make/build-nativewindow.xml 2014-02-11 15:57:11.017427982 +0100
+++++ jogl-v2.1.4/make/build-nativewindow.xml 2014-02-11 15:57:11.013427982 +0100
+@@ -525,13 +525,19 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
+ </target>
+
++ <target name="c.configure.linux.s390x" if="isLinuxs390x">
++ <echo message="Linux.S390x" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
++ </target>
++
+ <target name="c.configure.linux.sparc" if="isLinuxSparc">
+ <echo message="Linux.SPARC" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
+ </target>
+
+- <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
++ <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+
+ <target name="c.configure.android" if="isAndroid">
+ <echo message="Android" />
- Index: jogl-v2.1.2/make/build-newt.xml
++Index: jogl-v2.1.4/make/build-newt.xml
+===================================================================
- --- jogl-v2.1.2.orig/make/build-newt.xml 2013-11-08 10:54:28.000000000 +0100
- +++ jogl-v2.1.2/make/build-newt.xml 2013-11-08 10:54:28.000000000 +0100
- @@ -472,6 +472,16 @@
++--- jogl-v2.1.4.orig/make/build-newt.xml 2014-02-11 15:57:11.017427982 +0100
+++++ jogl-v2.1.4/make/build-newt.xml 2014-02-11 15:57:11.013427982 +0100
++@@ -481,6 +481,16 @@
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+ </target>
+
++ <target name="c.configure.linux.s390x" if="isLinuxs390x">
++ <echo message="Linux.S390x" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11"
++ else="linker.cfg.linux">
++ <isset property="isX11" />
++ </condition>
++ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
++ </target>
++
+ <target name="c.configure.linux.sparc" if="isLinuxSparc">
+ <echo message="Linux.sparc" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
- @@ -488,7 +498,7 @@
++@@ -497,7 +507,7 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" />
+ </target>
+
+- <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
++ <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
+
+ <target name="c.configure.android" if="isAndroid">
+ <echo message="Android" />
diff --cc debian/patches/series
index ffd1140,0000000..9bef941
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,15 -1,0 +1,17 @@@
+variousFixes.diff
+#disableOneDir.diff
+swt.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
+#disable_android_3.diff
+manifest.diff
+s390x.diff
+arm-build.diff
++disable-applet.diff
+alpha.diff
++
diff --cc debian/patches/variousFixes.diff
index 14abaf0,0000000..91569e0
mode 100644,000000..100644
--- a/debian/patches/variousFixes.diff
+++ b/debian/patches/variousFixes.diff
@@@ -1,65 -1,0 +1,65 @@@
- Index: jogl-v2.1.2/make/build-common.xml
++Index: jogl-v2.1.4/make/build-common.xml
+===================================================================
- --- jogl-v2.1.2.orig/make/build-common.xml 2013-11-08 10:53:51.000000000 +0100
- +++ jogl-v2.1.2/make/build-common.xml 2013-11-08 10:53:51.000000000 +0100
++--- jogl-v2.1.4.orig/make/build-common.xml 2014-02-11 15:56:11.681429433 +0100
+++++ jogl-v2.1.4/make/build-common.xml 2014-02-11 15:56:11.677429433 +0100
+@@ -13,7 +13,7 @@
+ </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" />
+@@ -22,7 +22,7 @@
+ <!-- Add JOAL (optional) -->
+ <property name="joal.root" value="../../joal" />
+
+- <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>
- @@ -205,7 +205,7 @@
++@@ -208,7 +208,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" />
+
- @@ -410,7 +410,7 @@
++@@ -413,7 +413,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"/>
- @@ -580,7 +580,10 @@
++@@ -585,7 +585,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.1.2/make/build.xml
++Index: jogl-v2.1.4/make/build.xml
+===================================================================
- --- jogl-v2.1.2.orig/make/build.xml 2013-11-08 10:53:51.000000000 +0100
- +++ jogl-v2.1.2/make/build.xml 2013-11-08 10:54:14.000000000 +0100
++--- jogl-v2.1.4.orig/make/build.xml 2014-02-11 15:56:11.681429433 +0100
+++++ jogl-v2.1.4/make/build.xml 2014-02-11 15:56:11.677429433 +0100
+@@ -291,7 +291,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.version=${jogamp.version}${line.separator}' file="${build}/artifact.properties" append="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"/>
diff --cc debian/rules
index 14d707e,0000000..1bc9f40
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,33 -1,0 +1,33 @@@
+#!/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 -verbose -Dcommon.gluegen.build.done=true
+DEB_ANT_CLEAN_TARGET := clean
+DEB_ANT_BUILD_TARGET := all
+DEB_ANT_BUILDFILE := make/build.xml
- ENABLE_BUILD_HELP_ARCHS := amd64 i386 alpha
++ENABLE_BUILD_HELP_ARCHS := amd64 i386
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifeq ($(DEB_HOST_ARCH),armhf)
+DEB_ANT_ARGS += -DisAbiEabiGnuArmhf=true
+endif
+
+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
+
+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