[pkg-java] r16197 - in trunk/java3d/debian: . patches

[Niels Thykier]

Author: nthykier
Date: 2012-06-23 14:32:29 +0000 (Sat, 23 Jun 2012)
New Revision: 16197

Modified:
   trunk/java3d/debian/changelog
   trunk/java3d/debian/patches/03_fix_ia64_ftbfs.patch
Log:
Remove -G from ia64 compiler flags

Modified: trunk/java3d/debian/changelog
===================================================================
--- trunk/java3d/debian/changelog	2012-06-23 13:16:06 UTC (rev 16196)
+++ trunk/java3d/debian/changelog	2012-06-23 14:32:29 UTC (rev 16197)
@@ -1,3 +1,10 @@
+java3d (1.5.2+dfsg-8) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Remove -G flag from ia64 compiler flags.  (Closes: #650799)
+
+ -- Niels Thykier <niels at thykier.net>  Sat, 23 Jun 2012 16:31:55 +0200
+
 java3d (1.5.2+dfsg-7) unstable; urgency=low
 
   [Miguel Landaeta]

Modified: trunk/java3d/debian/patches/03_fix_ia64_ftbfs.patch
===================================================================
--- trunk/java3d/debian/patches/03_fix_ia64_ftbfs.patch	2012-06-23 13:16:06 UTC (rev 16196)
+++ trunk/java3d/debian/patches/03_fix_ia64_ftbfs.patch	2012-06-23 14:32:29 UTC (rev 16197)
@@ -15,7 +15,7 @@
      <!-- Removed -R/usr/openwin/lib - an ld specific option (should be a filename, not a dir?!?) -->
      <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
 -	<arg line="DrawingSurfaceObjectAWT.o  Canvas3D.o  GraphicsContext3D.o  NativeScreenInfo.o  NativeConfigTemplate3D.o  MasterControl.o  GeometryArrayRetained.o  Attributes.o  CgShaderProgram.o  GLSLShaderProgram.o  Lights.o -G -z defs -shared -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/ia64 -ljawt -L${java.home}/lib/ia64/jrockit -ljvm  -o libj3dcore-ogl.so"/>
-+	<arg line="DrawingSurfaceObjectAWT.o  Canvas3D.o  GraphicsContext3D.o  NativeScreenInfo.o  NativeConfigTemplate3D.o  MasterControl.o  GeometryArrayRetained.o  Attributes.o  CgShaderProgram.o  GLSLShaderProgram.o  Lights.o -G -z defs -shared -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/ia64 -ljawt -L${java.home}/lib/ia64/server -ljvm  -o libj3dcore-ogl.so"/>
++	<arg line="DrawingSurfaceObjectAWT.o  Canvas3D.o  GraphicsContext3D.o  NativeScreenInfo.o  NativeConfigTemplate3D.o  MasterControl.o  GeometryArrayRetained.o  Attributes.o  CgShaderProgram.o  GLSLShaderProgram.o  Lights.o -z defs -shared -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/ia64 -ljawt -L${java.home}/lib/ia64/server -ljvm  -o libj3dcore-ogl.so"/>
      </exec>
  <!-- -L${java.home}/lib/ia64/server -ljvm  -o libj3dcore-ogl.so"/> -->