[pkg-java] r18608 - in tags/java3d: . 1.5.2+dfsg-10 1.5.2+dfsg-10/debian 1.5.2+dfsg-10/debian/patches
Tony Mancill
tmancill at moszumanska.debian.org
Sun Nov 23 03:18:30 GMT 2014
Author: tmancill
Date: 2014-11-23 03:18:30 +0000 (Sun, 23 Nov 2014)
New Revision: 18608
Added:
tags/java3d/1.5.2+dfsg-10/
tags/java3d/1.5.2+dfsg-10/debian/changelog
tags/java3d/1.5.2+dfsg-10/debian/control
tags/java3d/1.5.2+dfsg-10/debian/patches/series
tags/java3d/1.5.2+dfsg-10/debian/patches/typedef.patch
Removed:
tags/java3d/1.5.2+dfsg-10/debian/changelog
tags/java3d/1.5.2+dfsg-10/debian/control
tags/java3d/1.5.2+dfsg-10/debian/patches/series
Log:
[svn-buildpackage] Tagging java3d 1.5.2+dfsg-10
Property changes on: tags/java3d/1.5.2+dfsg-10
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: tags/java3d/1.5.2+dfsg-10/debian/changelog
===================================================================
--- trunk/java3d/debian/changelog 2014-11-19 16:30:37 UTC (rev 18606)
+++ tags/java3d/1.5.2+dfsg-10/debian/changelog 2014-11-23 03:18:30 UTC (rev 18608)
@@ -1,162 +0,0 @@
-java3d (1.5.2+dfsg-10) unstable; urgency=medium
-
- * Team upload.
- * Updated Standards-Version to 3.9.5 (no changes)
- * Update Upstream URL in d/control and d/copyright. (Closes: #758413)
- * Use canonical Vcs URLs for packaging repo.
- * Use debhelper 9.
-
- -- tony mancill <tmancill at debian.org> Mon, 18 Aug 2014 22:38:20 -0700
-
-java3d (1.5.2+dfsg-9) unstable; urgency=low
-
- * Team upload.
- * Fixed the watch file
- * Updated Standards-Version to 3.9.4 (no changes)
- * Removed the deprecated DMUA flag
- * Removed the obsolete patching instructions in debian/README.source
- * debian/copyright: Updated to comply with the DEP5 format
-
- -- Emmanuel Bourg <ebourg at apache.org> Sun, 28 Apr 2013 23:35:42 +0200
-
-java3d (1.5.2+dfsg-8) unstable; urgency=low
-
- * Team upload.
- * Remove -G flag from ia64 compiler flags. (Closes: #650799)
- * Replace use of com.sun JPEG library with ImageIO.
-
- -- Niels Thykier <niels at thykier.net> Sun, 24 Jun 2012 22:02:35 +0200
-
-java3d (1.5.2+dfsg-7) unstable; urgency=low
-
- [Miguel Landaeta]
- * Team upload.
- * Switch to default-jdk. (Closes: #640937).
- * Bump Standards-Version to 3.9.2. No changes were required.
-
- [tony mancill]
- * Update Vcs-Svn URL in debian/control.
-
- -- Miguel Landaeta <miguel at miguel.cc> Thu, 08 Sep 2011 19:56:44 -0430
-
-java3d (1.5.2+dfsg-6) unstable; urgency=low
-
- [ Jonny Lamb ]
- * Removed myself from Uploaders.
-
- [ Torsten Werner ]
- * Remove Petter from Uploaders.
- * Switch to debhelper level 7.
- * Switch to source format 3.0.
- * Remove Java runtime from Depends.
- * Update Standards-Version: 3.9.1.
-
- -- Torsten Werner <twerner at debian.org> Tue, 30 Aug 2011 20:03:52 +0200
-
-java3d (1.5.2+dfsg-5) unstable; urgency=low
-
- [ Sylvestre Ledru ]
- * Remove myself from the package
-
- [ Onkar Shinde ]
- * debian/control
- - Change build dependency default-jdk to openjdk-6-jdk. This library uses
- Sun specific APIs.
- This change will put package in DEPWAIT on certain arch. But DEPWAIT is
- better than FTBFS. (Closes: #559768)
- - Change dependency default-jre to openjdk-6-jre.
- - Remove -XS-Autobuild. Not needed anymore.
- - Update standards version to 3.8.3.
- * debian/rules
- - Change JAVA_HOME to correspond to openjdk.
- * debian/patches/02_fix_generic_ftbfs.patch
- - Allow the build to continue on kFreeBSD as well. (Closes: #559766)
-
- -- Onkar Shinde <onkarshinde at ubuntu.com> Sat, 09 Jan 2010 18:19:12 +0530
-
-java3d (1.5.2+dfsg-4) unstable; urgency=low
-
- * Add missing compiler option -fPIC. (hopefully closes: #545840)
-
- -- Torsten Werner <twerner at debian.org> Tue, 15 Sep 2009 12:01:30 +0200
-
-java3d (1.5.2+dfsg-3) unstable; urgency=low
-
- [ Onkar Shinde ]
- * debian/patches/02_fix_generic_ftbfs.patch
- - Improve the patch as per my understanding of the build system.
- (Closes: #541384)
- * debian/patches/03_fix_ia64_ftbfs.patch
- - Add fix for FTBFS on ia64.
-
- [ Torsten Werner ]
- * Add myself to Uploaders.
- * Change patch system to quilt.
- * Add patch 04_no_maxmemory.patch:
- - Do not set maxmemory attribute in ant's javadoc task.
-
- -- Torsten Werner <twerner at debian.org> Sat, 22 Aug 2009 12:14:24 +0200
-
-java3d (1.5.2+dfsg-2) unstable; urgency=low
-
- * debian/control
- - Add myself to uploaders.
- - Move default-jdk to Build-Depends as there is no easy way to split builds
- of arch:all and arch:any packages.
- * debian/rules
- - Include simple patchsys makefile.
- - Add echo target for debugging purpose.
- - Add ant argument to set build type.
- * debian/patches/01_fix_powerpc_ftbfs.patch
- - Add fix for FTBFS on powerpc.
- * debian/patches/02_fix_generic_ftbfs.patch
- - Add fix for FTBFS on architectures not handled by current build system.
- * debian/README.source
- - Add to comply with policy.
-
- -- Onkar Shinde <onkarshinde at ubuntu.com> Thu, 13 Aug 2009 10:23:33 +0530
-
-java3d (1.5.2+dfsg-1) unstable; urgency=low
-
- [ Sylvestre Ledru ]
- * Change version number scheme to match upstream.
- * debian/control: Added me to Uploaders.
- * debian/watch: Added watch file.
-
- [ Jonny Lamb ]
- * debian/rules:
- + Set JAVA_HOME. (Closes: #518775)
- + Update DEB_VER.
- * debian/watch: Added dversionmangle to remove .dfsg from version.
- * debian/control: Changed libjava3d-java's Section to java.
-
- [ Onkar Shinde ]
- * debian/control
- - Use default-jdk build dependency since now default-jdk is openjdk.
- - Remove default-jdk-builddep build dependency since we are not building
- any -gcj package.
- - Change runtime dependency to default-jre | java5-runtime as per the JVM
- target version specified in build.xml.
- - Change standards version to 3.8.2. No change needed.
- * debian/rules
- - Update JAVA_HOME to correspond to default-jdk.
- - Remove unnecessary reference to ant-launcher jar file.
- - Add DEB_ANT_BUILDFILE and set it to the build.xml in j3d-core.
- - Remove DEB_BUILDDIR.
- - Use cvs export instead of checkout. Doesn't need user interaction.
- - Use the release tag instead of getting latest files in cvs.
- Release tag is derived from upstream version.
- - Change directory name where code is checked out from cvs to the usual
- <package>-<version> format.
- * debian/watch
- - Simplify the expression for zip file name. Use uversionmangle for proper
- version matching.
-
- -- Jonny Lamb <jonny at debian.org> Tue, 11 Aug 2009 09:48:38 +0100
-
-java3d (0.0.cvs.20090202.dfsg-1) unstable; urgency=low
-
- * Initial Release.
- * debian/rules: Remove unzipsfx executables from orig.tar.gz.
-
- -- Jonny Lamb <jonny at debian.org> Tue, 03 Feb 2009 11:39:00 +0000
Copied: tags/java3d/1.5.2+dfsg-10/debian/changelog (from rev 18607, trunk/java3d/debian/changelog)
===================================================================
--- tags/java3d/1.5.2+dfsg-10/debian/changelog (rev 0)
+++ tags/java3d/1.5.2+dfsg-10/debian/changelog 2014-11-23 03:18:30 UTC (rev 18608)
@@ -0,0 +1,168 @@
+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 at gambaru.de> Sun, 23 Nov 2014 00:10:37 +0100
+
+java3d (1.5.2+dfsg-9) unstable; urgency=low
+
+ * Team upload.
+ * Fixed the watch file
+ * Updated Standards-Version to 3.9.4 (no changes)
+ * Removed the deprecated DMUA flag
+ * Removed the obsolete patching instructions in debian/README.source
+ * debian/copyright: Updated to comply with the DEP5 format
+
+ -- Emmanuel Bourg <ebourg at apache.org> Sun, 28 Apr 2013 23:35:42 +0200
+
+java3d (1.5.2+dfsg-8) unstable; urgency=low
+
+ * Team upload.
+ * Remove -G flag from ia64 compiler flags. (Closes: #650799)
+ * Replace use of com.sun JPEG library with ImageIO.
+
+ -- Niels Thykier <niels at thykier.net> Sun, 24 Jun 2012 22:02:35 +0200
+
+java3d (1.5.2+dfsg-7) unstable; urgency=low
+
+ [Miguel Landaeta]
+ * Team upload.
+ * Switch to default-jdk. (Closes: #640937).
+ * Bump Standards-Version to 3.9.2. No changes were required.
+
+ [tony mancill]
+ * Update Vcs-Svn URL in debian/control.
+
+ -- Miguel Landaeta <miguel at miguel.cc> Thu, 08 Sep 2011 19:56:44 -0430
+
+java3d (1.5.2+dfsg-6) unstable; urgency=low
+
+ [ Jonny Lamb ]
+ * Removed myself from Uploaders.
+
+ [ Torsten Werner ]
+ * Remove Petter from Uploaders.
+ * Switch to debhelper level 7.
+ * Switch to source format 3.0.
+ * Remove Java runtime from Depends.
+ * Update Standards-Version: 3.9.1.
+
+ -- Torsten Werner <twerner at debian.org> Tue, 30 Aug 2011 20:03:52 +0200
+
+java3d (1.5.2+dfsg-5) unstable; urgency=low
+
+ [ Sylvestre Ledru ]
+ * Remove myself from the package
+
+ [ Onkar Shinde ]
+ * debian/control
+ - Change build dependency default-jdk to openjdk-6-jdk. This library uses
+ Sun specific APIs.
+ This change will put package in DEPWAIT on certain arch. But DEPWAIT is
+ better than FTBFS. (Closes: #559768)
+ - Change dependency default-jre to openjdk-6-jre.
+ - Remove -XS-Autobuild. Not needed anymore.
+ - Update standards version to 3.8.3.
+ * debian/rules
+ - Change JAVA_HOME to correspond to openjdk.
+ * debian/patches/02_fix_generic_ftbfs.patch
+ - Allow the build to continue on kFreeBSD as well. (Closes: #559766)
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Sat, 09 Jan 2010 18:19:12 +0530
+
+java3d (1.5.2+dfsg-4) unstable; urgency=low
+
+ * Add missing compiler option -fPIC. (hopefully closes: #545840)
+
+ -- Torsten Werner <twerner at debian.org> Tue, 15 Sep 2009 12:01:30 +0200
+
+java3d (1.5.2+dfsg-3) unstable; urgency=low
+
+ [ Onkar Shinde ]
+ * debian/patches/02_fix_generic_ftbfs.patch
+ - Improve the patch as per my understanding of the build system.
+ (Closes: #541384)
+ * debian/patches/03_fix_ia64_ftbfs.patch
+ - Add fix for FTBFS on ia64.
+
+ [ Torsten Werner ]
+ * Add myself to Uploaders.
+ * Change patch system to quilt.
+ * Add patch 04_no_maxmemory.patch:
+ - Do not set maxmemory attribute in ant's javadoc task.
+
+ -- Torsten Werner <twerner at debian.org> Sat, 22 Aug 2009 12:14:24 +0200
+
+java3d (1.5.2+dfsg-2) unstable; urgency=low
+
+ * debian/control
+ - Add myself to uploaders.
+ - Move default-jdk to Build-Depends as there is no easy way to split builds
+ of arch:all and arch:any packages.
+ * debian/rules
+ - Include simple patchsys makefile.
+ - Add echo target for debugging purpose.
+ - Add ant argument to set build type.
+ * debian/patches/01_fix_powerpc_ftbfs.patch
+ - Add fix for FTBFS on powerpc.
+ * debian/patches/02_fix_generic_ftbfs.patch
+ - Add fix for FTBFS on architectures not handled by current build system.
+ * debian/README.source
+ - Add to comply with policy.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Thu, 13 Aug 2009 10:23:33 +0530
+
+java3d (1.5.2+dfsg-1) unstable; urgency=low
+
+ [ Sylvestre Ledru ]
+ * Change version number scheme to match upstream.
+ * debian/control: Added me to Uploaders.
+ * debian/watch: Added watch file.
+
+ [ Jonny Lamb ]
+ * debian/rules:
+ + Set JAVA_HOME. (Closes: #518775)
+ + Update DEB_VER.
+ * debian/watch: Added dversionmangle to remove .dfsg from version.
+ * debian/control: Changed libjava3d-java's Section to java.
+
+ [ Onkar Shinde ]
+ * debian/control
+ - Use default-jdk build dependency since now default-jdk is openjdk.
+ - Remove default-jdk-builddep build dependency since we are not building
+ any -gcj package.
+ - Change runtime dependency to default-jre | java5-runtime as per the JVM
+ target version specified in build.xml.
+ - Change standards version to 3.8.2. No change needed.
+ * debian/rules
+ - Update JAVA_HOME to correspond to default-jdk.
+ - Remove unnecessary reference to ant-launcher jar file.
+ - Add DEB_ANT_BUILDFILE and set it to the build.xml in j3d-core.
+ - Remove DEB_BUILDDIR.
+ - Use cvs export instead of checkout. Doesn't need user interaction.
+ - Use the release tag instead of getting latest files in cvs.
+ Release tag is derived from upstream version.
+ - Change directory name where code is checked out from cvs to the usual
+ <package>-<version> format.
+ * debian/watch
+ - Simplify the expression for zip file name. Use uversionmangle for proper
+ version matching.
+
+ -- Jonny Lamb <jonny at debian.org> Tue, 11 Aug 2009 09:48:38 +0100
+
+java3d (0.0.cvs.20090202.dfsg-1) unstable; urgency=low
+
+ * Initial Release.
+ * debian/rules: Remove unzipsfx executables from orig.tar.gz.
+
+ -- Jonny Lamb <jonny at debian.org> Tue, 03 Feb 2009 11:39:00 +0000
Deleted: tags/java3d/1.5.2+dfsg-10/debian/control
===================================================================
--- trunk/java3d/debian/control 2014-11-19 16:30:37 UTC (rev 18606)
+++ tags/java3d/1.5.2+dfsg-10/debian/control 2014-11-23 03:18:30 UTC (rev 18608)
@@ -1,60 +0,0 @@
-Source: java3d
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>,
- Emmanuel Bourg <ebourg at apache.org>,
- Torsten Werner <twerner at debian.org>
-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.5
-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
-Suggests: libjava3d-java-doc
-Depends: ${misc:Depends}, libjava3d-jni (>= ${source:Version}),
- libvecmath-java
-Description: Java 3D API (java library)
- The Java 3D API enables the creation of three-dimensional graphics
- applications and Internet-based 3D applets. It provides high-level
- constructs for creating and manipulation 3D geometry and building the
- structures used in rendering that geometry. With this software, you can
- efficiently define and render very large virtual worlds.
- .
- This package contains the java library.
-
-Package: libjava3d-jni
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Java3D API (java jni library)
- The Java 3D API enables the creation of three-dimensional graphics
- applications and Internet-based 3D applets. It provides high-level
- constructs for creating and manipulation 3D geometry and building the
- structures used in rendering that geometry. With this software, you can
- efficiently define and render very large virtual worlds.
- .
- This package contains the java jni library.
-
-Package: libjava3d-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Suggests: libjava3d-java
-Description: Documentation for the Java3D API
- The Java 3D API enables the creation of three-dimensional graphics
- applications and Internet-based 3D applets. It provides high-level
- constructs for creating and manipulation 3D geometry and building the
- structures used in rendering that geometry. With this software, you can
- efficiently define and render very large virtual worlds.
- .
- This package contains the API documentation.
Copied: tags/java3d/1.5.2+dfsg-10/debian/control (from rev 18607, trunk/java3d/debian/control)
===================================================================
--- tags/java3d/1.5.2+dfsg-10/debian/control (rev 0)
+++ tags/java3d/1.5.2+dfsg-10/debian/control 2014-11-23 03:18:30 UTC (rev 18608)
@@ -0,0 +1,60 @@
+Source: java3d
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>,
+ Emmanuel Bourg <ebourg at apache.org>,
+ Torsten Werner <twerner at debian.org>
+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
+Suggests: libjava3d-java-doc
+Depends: ${misc:Depends}, libjava3d-jni (>= ${source:Version}),
+ libvecmath-java
+Description: Java 3D API (java library)
+ The Java 3D API enables the creation of three-dimensional graphics
+ applications and Internet-based 3D applets. It provides high-level
+ constructs for creating and manipulation 3D geometry and building the
+ structures used in rendering that geometry. With this software, you can
+ efficiently define and render very large virtual worlds.
+ .
+ This package contains the java library.
+
+Package: libjava3d-jni
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Java3D API (java jni library)
+ The Java 3D API enables the creation of three-dimensional graphics
+ applications and Internet-based 3D applets. It provides high-level
+ constructs for creating and manipulation 3D geometry and building the
+ structures used in rendering that geometry. With this software, you can
+ efficiently define and render very large virtual worlds.
+ .
+ This package contains the java jni library.
+
+Package: libjava3d-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: libjava3d-java
+Description: Documentation for the Java3D API
+ The Java 3D API enables the creation of three-dimensional graphics
+ applications and Internet-based 3D applets. It provides high-level
+ constructs for creating and manipulation 3D geometry and building the
+ structures used in rendering that geometry. With this software, you can
+ efficiently define and render very large virtual worlds.
+ .
+ This package contains the API documentation.
Deleted: tags/java3d/1.5.2+dfsg-10/debian/patches/series
===================================================================
--- trunk/java3d/debian/patches/series 2014-11-19 16:30:37 UTC (rev 18606)
+++ tags/java3d/1.5.2+dfsg-10/debian/patches/series 2014-11-23 03:18:30 UTC (rev 18608)
@@ -1,7 +0,0 @@
-01_fix_powerpc_ftbfs.patch
-02_fix_generic_ftbfs.patch
-03_fix_ia64_ftbfs.patch
-04_no_maxmemory.patch
-05_pic_amd64.patch
-05_pic_i586.patch
-06_java-compat.patch
Copied: tags/java3d/1.5.2+dfsg-10/debian/patches/series (from rev 18607, trunk/java3d/debian/patches/series)
===================================================================
--- tags/java3d/1.5.2+dfsg-10/debian/patches/series (rev 0)
+++ tags/java3d/1.5.2+dfsg-10/debian/patches/series 2014-11-23 03:18:30 UTC (rev 18608)
@@ -0,0 +1,8 @@
+01_fix_powerpc_ftbfs.patch
+02_fix_generic_ftbfs.patch
+03_fix_ia64_ftbfs.patch
+04_no_maxmemory.patch
+05_pic_amd64.patch
+05_pic_i586.patch
+06_java-compat.patch
+typedef.patch
Copied: tags/java3d/1.5.2+dfsg-10/debian/patches/typedef.patch (from rev 18607, trunk/java3d/debian/patches/typedef.patch)
===================================================================
--- tags/java3d/1.5.2+dfsg-10/debian/patches/typedef.patch (rev 0)
+++ tags/java3d/1.5.2+dfsg-10/debian/patches/typedef.patch 2014-11-23 03:18:30 UTC (rev 18608)
@@ -0,0 +1,27 @@
+From: Markus Koschany <apo at 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_
More information about the pkg-java-commits
mailing list