This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository java3d.
commit 59ab0c61129c16e2e4b564da2623b2b196e323fe Author: Niels Thykier <[email protected]> Date: Sat Jun 23 14:32:29 2012 +0000 Remove -G from ia64 compiler flags --- debian/changelog | 7 +++++++ debian/patches/03_fix_ia64_ftbfs.patch | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8d1c67f..4dcf5a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <[email protected]> Sat, 23 Jun 2012 16:31:55 +0200 + java3d (1.5.2+dfsg-7) unstable; urgency=low [Miguel Landaeta] diff --git a/debian/patches/03_fix_ia64_ftbfs.patch b/debian/patches/03_fix_ia64_ftbfs.patch index ebaa362..edca303 100644 --- a/debian/patches/03_fix_ia64_ftbfs.patch +++ b/debian/patches/03_fix_ia64_ftbfs.patch @@ -15,7 +15,7 @@ Index: java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ia64.xml <!-- 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"/> --> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java3d.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
