Bug#770663: unblock: java3d/1.5.2+dfsg-10
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package java3d
Dear Release Team,
Please consider an unblock for java3d/1.5.2+dfsg-10.
This upload resolves FTBFS bug #769301. (I believe it will also resolve
#559767, but will wait to mark that closed once the package builds on
armel.)
It also includes packaging-only updates (that were already in the
packaging repo since August). These don't affect the resulting binary.
The debdiff is attached.
Thank you for considering the unblock.
tony
unblock java3d/1.5.2+dfsg-10
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (900, 'testing'), (300, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru java3d-1.5.2+dfsg/debian/changelog java3d-1.5.2+dfsg/debian/changelog
--- java3d-1.5.2+dfsg/debian/changelog 2013-05-27 05:47:41.000000000 -0700
+++ java3d-1.5.2+dfsg/debian/changelog 2014-11-22 18:29:32.000000000 -0800
@@ -1,3 +1,19 @@
+java3d (1.5.2+dfsg-10) unstable; urgency=medium
+
+ * Team upload.
+
+ [ tony mancill ]
+ * Updated Standards-Version to 3.9.6 (no changes)
+ * Update Upstream URL in d/control and d/copyright. (Closes: #758413)
+ * Use canonical Vcs URLs for packaging repo.
+ * Use debhelper 9.
+
+ [ Markus Koschany ]
+ * Add typedef.patch. Define GLsizeiptr and GLintptr explicitly to
+ prevent a FTBFS. (Closes: #769301)
+
+ -- Markus Koschany <apo@gambaru.de> Sun, 23 Nov 2014 00:10:37 +0100
+
java3d (1.5.2+dfsg-9) unstable; urgency=low
* Team upload.
diff -Nru java3d-1.5.2+dfsg/debian/compat java3d-1.5.2+dfsg/debian/compat
--- java3d-1.5.2+dfsg/debian/compat 2011-12-21 07:09:15.000000000 -0800
+++ java3d-1.5.2+dfsg/debian/compat 2014-08-18 22:28:28.000000000 -0700
@@ -1 +1 @@
-7
+9
diff -Nru java3d-1.5.2+dfsg/debian/control java3d-1.5.2+dfsg/debian/control
--- java3d-1.5.2+dfsg/debian/control 2013-05-27 05:47:41.000000000 -0700
+++ java3d-1.5.2+dfsg/debian/control 2014-11-22 18:29:55.000000000 -0800
@@ -2,14 +2,22 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Onkar Shinde <onkarshinde@ubuntu.com>, Emmanuel Bourg <ebourg@apache.org>,
+Uploaders: Onkar Shinde <onkarshinde@ubuntu.com>,
+ Emmanuel Bourg <ebourg@apache.org>,
Torsten Werner <twerner@debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant-optional, libvecmath-java,
- mesa-common-dev, libgl1-mesa-dev, libxext-dev, libxt-dev
-Standards-Version: 3.9.4
-Homepage: http://java3d.dev.java.net
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java3d/
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/java3d/
+Build-Depends: debhelper (>= 9),
+ cdbs,
+ default-jdk,
+ ant-optional,
+ libvecmath-java,
+ mesa-common-dev,
+ libgl1-mesa-dev,
+ libxext-dev,
+ libxt-dev
+Standards-Version: 3.9.6
+Homepage: http://java3d.java.net
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/java3d/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/java3d/
Package: libjava3d-java
Architecture: all
diff -Nru java3d-1.5.2+dfsg/debian/patches/series java3d-1.5.2+dfsg/debian/patches/series
--- java3d-1.5.2+dfsg/debian/patches/series 2013-05-27 05:47:41.000000000 -0700
+++ java3d-1.5.2+dfsg/debian/patches/series 2014-11-22 18:30:26.000000000 -0800
@@ -5,3 +5,4 @@
05_pic_amd64.patch
05_pic_i586.patch
06_java-compat.patch
+typedef.patch
diff -Nru java3d-1.5.2+dfsg/debian/patches/typedef.patch java3d-1.5.2+dfsg/debian/patches/typedef.patch
--- java3d-1.5.2+dfsg/debian/patches/typedef.patch 1969-12-31 16:00:00.000000000 -0800
+++ java3d-1.5.2+dfsg/debian/patches/typedef.patch 2014-11-22 18:30:26.000000000 -0800
@@ -0,0 +1,27 @@
+From: Markus Koschany <apo@gambaru.de>
+Date: Sat, 22 Nov 2014 23:54:59 +0100
+Subject: typedef
+
+Define GLsizeiptr and GLintptr explicitly to prevent a FTBFS.
+This patch may be removed in the future when
+https://bugs.debian.org/765933 gets fixed.
+
+Bug: https://bugs.debian.org/769301
+Forwarded: no
+---
+ j3d-core/src/native/ogl/gldefs.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/j3d-core/src/native/ogl/gldefs.h b/j3d-core/src/native/ogl/gldefs.h
+index bf4434f..d20de17 100644
+--- a/j3d-core/src/native/ogl/gldefs.h
++++ b/j3d-core/src/native/ogl/gldefs.h
+@@ -65,6 +65,8 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+
++typedef ptrdiff_t GLsizeiptr;
++typedef ptrdiff_t GLintptr;
+ #include <GL/gl.h>
+ #include <GL/glx.h>
+ #ifdef Java3D_undef__glext_h_
diff -Nru java3d-1.5.2+dfsg/debian/rules java3d-1.5.2+dfsg/debian/rules
--- java3d-1.5.2+dfsg/debian/rules 2011-12-21 07:09:15.000000000 -0800
+++ java3d-1.5.2+dfsg/debian/rules 2014-08-18 22:28:28.000000000 -0700
@@ -1,5 +1,8 @@
#!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_CFLAGS_MAINT_APPEND = -Wall
+include /usr/share/dpkg/buildflags.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
File lists identical (after any substitutions)
Control files of package libjava3d-java: lines which differ (wdiff format)
--------------------------------------------------------------------------
Depends: libjava3d-jni (>= [-1.5.2+dfsg-9),-] {+1.5.2+dfsg-10),+} libvecmath-java
Homepage: [-http://java3d.dev.java.net-] {+http://java3d.java.net+}
Installed-Size: [-4398-] {+4399+}
Version: [-1.5.2+dfsg-9-] {+1.5.2+dfsg-10+}
Control files of package libjava3d-java-doc: lines which differ (wdiff format)
------------------------------------------------------------------------------
Homepage: [-http://java3d.dev.java.net-] {+http://java3d.java.net+}
Version: [-1.5.2+dfsg-9-] {+1.5.2+dfsg-10+}
Control files of package libjava3d-jni: lines which differ (wdiff format)
-------------------------------------------------------------------------
Homepage: [-http://java3d.dev.java.net-] {+http://java3d.java.net+}
Installed-Size: [-179-] {+180+}
Version: [-1.5.2+dfsg-9-] {+1.5.2+dfsg-10+}
Reply to: