[libjogl2-java] 05/58: Imported Debian patch 2.0-rc2-2
Tony Mancill
tmancill at moszumanska.debian.org
Thu Sep 4 03:59:06 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 076b548b333b02aeef45bbe69255e475cb80a34a
Author: Sylvestre Ledru <sylvestre at debian.org>
Date: Sun May 8 23:30:49 2011 +0200
Imported Debian patch 2.0-rc2-2
---
debian/README.source | 3 +
debian/changelog | 9 ++
debian/control | 4 +-
debian/patches/build-java.diff | 85 ----------------
debian/patches/build.diff | 182 ----------------------------------
debian/patches/cg-common.cfg.diff | 10 --
debian/patches/defaultDebianPath.diff | 13 ---
debian/patches/series | 1 +
debian/patches/swt.diff | 18 ++++
debian/rules | 2 +-
10 files changed, 34 insertions(+), 293 deletions(-)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..4b2e43a
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,3 @@
+rm $(find . -iname '*.lib') doc/deployment/lstjars/*.log make/lib/swt/*/swt-debug.jar
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 19 Apr 2011 09:19:54 +0200
diff --git a/debian/changelog b/debian/changelog
index 1db9bb9..b594768 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
+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
diff --git a/debian/control b/debian/control
index 8fef633..763aee0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk,
ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev,
x11proto-xf86vidmode-dev, libxt-dev, libgluegen2-build-java, ant-contrib,
ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev, libgluegen2-rt-java,
- junit4
+ junit4, libswt-gtk-3.5-java
Standards-Version: 3.9.2
Homepage: http://jogamp.org/
Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjogl2-java
@@ -15,7 +15,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjogl2-java/
Package: libjogl2-core-java
Architecture: all
-Depends: ${misc:Depends}, libjogl2-core-jni (>= ${source:Version}),
+Depends: ${misc:Depends},
libgluegen2-rt-java
Description: Java bindings for OpenGL API
The JOGL project hosts the development version of the Java Bindings for
diff --git a/debian/patches/build-java.diff b/debian/patches/build-java.diff
deleted file mode 100644
index b477136..0000000
--- a/debian/patches/build-java.diff
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -ur libjogl-java-1.1.1.orig/gluegen/src/java/com/sun/gluegen/runtime/CPU.java libjogl-java-1.1.1+dak1/gluegen/src/java/com/sun/gluegen/runtime/CPU.java
---- libjogl-java-1.1.1.orig/gluegen/src/java/com/sun/gluegen/runtime/CPU.java 2008-02-23 06:46:44.000000000 +0100
-+++ libjogl-java-1.1.1+dak1/gluegen/src/java/com/sun/gluegen/runtime/CPU.java 2008-10-26 23:56:09.000000000 +0100
-@@ -1,3 +1,4 @@
-+
- /*
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- *
-@@ -44,38 +45,27 @@
- running process. */
-
- public class CPU {
-- private static boolean is32Bit;
-+ private static boolean is32Bit=true;
-+
-+ static {
-+ // We don't seem to need an AccessController.doPrivileged() block
-+ // here as these system properties are visible even to unsigned
-+ // applets
-+ // Note: this code is replicated in StructLayout.java
-+ String os = System.getProperty("os.name").toLowerCase();
-+ String cpu = System.getProperty("os.arch").toLowerCase();
-+
-+ if ((os.startsWith("windows") && cpu.equals("amd64")) ||
-+ (os.startsWith("linux") && cpu.indexOf("64") != -1) ||
-+ (os.startsWith("linux") && cpu.indexOf("alpha") != -1) ||
-+ (os.startsWith("mac os") && cpu.equals("x86_64")) ||
-+ (os.startsWith("sunos") && cpu.equals("sparcv9")) ||
-+ (os.startsWith("sunos") && cpu.equals("amd64"))) {
-+ is32Bit=false;
-+ }
-+ }
-
-- static {
-- // We don't seem to need an AccessController.doPrivileged() block
-- // here as these system properties are visible even to unsigned
-- // applets
-- // Note: this code is replicated in StructLayout.java
-- String os = System.getProperty("os.name").toLowerCase();
-- String cpu = System.getProperty("os.arch").toLowerCase();
-- if ((os.startsWith("windows") && cpu.equals("x86")) ||
-- (os.startsWith("linux") && cpu.equals("i386")) ||
-- (os.startsWith("linux") && cpu.equals("x86")) ||
-- (os.startsWith("mac os") && cpu.equals("ppc")) ||
-- (os.startsWith("mac os") && cpu.equals("i386")) ||
-- (os.startsWith("sunos") && cpu.equals("sparc")) ||
-- (os.startsWith("sunos") && cpu.equals("x86")) ||
-- (os.startsWith("freebsd") && cpu.equals("i386")) ||
-- (os.startsWith("hp-ux") && cpu.equals("pa_risc2.0"))) {
-- is32Bit = true;
-- } else if ((os.startsWith("windows") && cpu.equals("amd64")) ||
-- (os.startsWith("linux") && cpu.equals("amd64")) ||
-- (os.startsWith("linux") && cpu.equals("x86_64")) ||
-- (os.startsWith("linux") && cpu.equals("ia64")) ||
-- (os.startsWith("mac os") && cpu.equals("x86_64")) ||
-- (os.startsWith("sunos") && cpu.equals("sparcv9")) ||
-- (os.startsWith("sunos") && cpu.equals("amd64"))) {
-- } else {
-- throw new RuntimeException("Please port CPU detection (32/64 bit) to your platform (" + os + "/" + cpu + ")");
-- }
-- }
--
-- public static boolean is32Bit() {
-- return is32Bit;
-- }
-+ public static boolean is32Bit() {
-+ return is32Bit;
-+ }
- }
-diff -ur libjogl-java-1.1.1.orig/gluegen/src/java/com/sun/gluegen/StructLayout.java libjogl-java-1.1.1+dak1/gluegen/src/java/com/sun/gluegen/StructLayout.java
---- libjogl-java-1.1.1.orig/gluegen/src/java/com/sun/gluegen/StructLayout.java 2008-02-23 06:46:44.000000000 +0100
-+++ libjogl-java-1.1.1+dak1/gluegen/src/java/com/sun/gluegen/StructLayout.java 2008-10-26 23:43:56.000000000 +0100
-@@ -127,11 +127,7 @@
- // It appears that Windows uses a packing alignment of 4 bytes in 32-bit mode
- return new StructLayout(0, 4);
- } else if ((os.startsWith("windows") && cpu.equals("amd64")) ||
-- (os.startsWith("linux") && cpu.equals("i386")) ||
-- (os.startsWith("linux") && cpu.equals("x86")) ||
-- (os.startsWith("linux") && cpu.equals("amd64")) ||
-- (os.startsWith("linux") && cpu.equals("x86_64")) ||
-- (os.startsWith("linux") && cpu.equals("ia64")) ||
-+ (os.startsWith("linux")) ||
- (os.startsWith("sunos") && cpu.equals("sparc")) ||
- (os.startsWith("sunos") && cpu.equals("sparcv9")) ||
- (os.startsWith("sunos") && cpu.equals("x86")) ||
diff --git a/debian/patches/build.diff b/debian/patches/build.diff
deleted file mode 100644
index d1838bd..0000000
--- a/debian/patches/build.diff
+++ /dev/null
@@ -1,182 +0,0 @@
---- jogl-1.1.1.orig/gluegen/make/build.xml 2008-05-14 18:54:48.000000000 +0200
-+++ jogl-1.1.1/gluegen/make/build.xml 2008-12-29 11:41:54.000000000 +0100
-@@ -222,11 +222,6 @@
- <property name="java.includes.dir.platform" value="${java.includes.dir}/win32" />
- </target>
-
-- <target name="declare.linux.x86" if="isLinuxX86">
-- <echo message="Linux.x86" />
-- <property name="compiler.cfg.id" value="compiler.cfg.linux" />
-- <property name="linker.cfg.id" value="linker.cfg.linux" />
-- </target>
-
- <target name="declare.linux.amd64" if="isLinuxAMD64">
- <echo message="Linux.AMD64" />
-@@ -239,8 +234,17 @@
- <property name="compiler.cfg.id" value="compiler.cfg.linux" />
- <property name="linker.cfg.id" value="linker.cfg.linux" />
- </target>
-+
-+ <target name="declare.linux.ppc" if="isLinuxPPC">
-+ <echo message="Linux.ppc" />
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
-+ <property name="linker.cfg.id" value="linker.cfg.linux" />
-+ </target>
-
-- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64" if="isLinux" >
-+ <target name="declare.linux" if="isLinux" >
-+ <echo message="Linux" />
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
-+ <property name="linker.cfg.id" value="linker.cfg.linux" />
- <property name="c.src.dir" value="unix" />
- <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
- </target>
---- jogl-1.1.1.orig/gluegen/make/gluegen-cpptasks.xml 2008-02-08 20:47:30.000000000 +0100
-+++ jogl-1.1.1/gluegen/make/gluegen-cpptasks.xml 2008-12-29 11:41:54.000000000 +0100
-@@ -36,6 +36,7 @@
- - isLinuxAMD64
- - isLinuxIA64
- - isLinuxX86
-+ - isLinuxPPC
- - isOSX
- - isOSXPPC
- - isOSXUniversal (if macosxfat=true)
-@@ -161,33 +162,6 @@
- <condition property="isHPUX">
- <os name="HP-UX" />
- </condition>
-- <condition property="isLinuxX86">
-- <and>
-- <istrue value="${isLinux}" />
-- <or>
-- <os arch="i386" />
-- <os arch="x86" />
-- </or>
-- </and>
-- </condition>
-- <condition property="isLinuxAMD64">
-- <and>
-- <istrue value="${isLinux}" />
-- <or>
-- <os arch="AMD64" />
-- <os arch="x86_64" />
-- </or>
-- </and>
-- </condition>
-- <condition property="isLinuxIA64">
-- <and>
-- <istrue value="${isLinux}" />
-- <os arch="IA64" />
-- </and>
-- </condition>
-- <condition property="isIA64">
-- <os arch="IA64" />
-- </condition>
- <condition property="isSolaris32Bit">
- <and>
- <istrue value="${isSolaris}" />
-@@ -238,9 +212,7 @@
- <echo message="HPUX=${isHPUX}" />
- <echo message="IA64=${isIA64}" />
- <echo message="Linux=${isLinux}" />
-- <echo message="LinuxAMD64=${isLinuxAMD64}" />
-- <echo message="LinuxIA64=${isLinuxIA64}" />
-- <echo message="LinuxX86=${isLinuxX86}" />
-+ <echo message="Arch=${os.arch}" />
- <echo message="OS X=${isOSX}" />
- <echo message="Solaris=${isSolaris}" />
- <echo message="Solaris32Bit=${isSolaris32Bit}" />
-@@ -261,20 +233,10 @@
- <property name="os.and.arch" value="hpux-hppa" />
- </target>
-
-- <target name="gluegen.cpptasks.detect.os.linux.amd64" unless="gluegen.cpptasks.detected.os" if="isLinuxAMD64">
-- <property name="os.and.arch" value="linux-amd64" />
-+ <target name="gluegen.cpptasks.detect.os.linux" unless="gluegen.cpptasks.detected.os" if="isLinux">
-+ <property name="os.and.arch" value="linux-all" />
- </target>
-
-- <target name="gluegen.cpptasks.detect.os.linux.ia64" unless="gluegen.cpptasks.detected.os" if="isLinuxIA64">
-- <property name="os.and.arch" value="linux-ia64" />
-- </target>
--
-- <target name="gluegen.cpptasks.detect.os.linux.x86" unless="gluegen.cpptasks.detected.os" if="isLinuxX86">
-- <property name="os.and.arch" value="linux-i586" />
-- </target>
--
-- <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86" unless="gluegen.cpptasks.detected.os" />
--
- <target name="gluegen.cpptasks.detect.os.osx.ppc" unless="gluegen.cpptasks.detected.os" if="isOSXPPC">
- <property name="os.and.arch" value="macosx-ppc" />
- </target>
---- jogl-1.1.1.orig/jogl/make/build.xml 2008-04-29 17:18:50.000000000 +0200
-+++ jogl-1.1.1/jogl/make/build.xml 2008-12-29 11:58:59.000000000 +0100
-@@ -210,8 +210,10 @@
- <property name="java.includes.dir.freebsd" value="${java.includes.dir}/freebsd" />
- <property name="java.includes.dir.hpux" value="${java.includes.dir}/hp-ux" />
- <property name="java.lib.dir.win32" value="${java.home.dir}/lib" />
-- <property name="java.lib.dir.linux" value="${java.home.dir}/jre/lib/i386" />
-+ <property name="java.lib.dir.linux" value="${java.home.dir}/jre/lib/${os.arch}/" />
-+<!-- <property name="java.lib.dir.linux" value="${java.home.dir}/jre/lib/i386" />-->
- <property name="java.lib.dir.linux.amd64" value="${java.home.dir}/jre/lib/amd64" />
-+ <property name="java.lib.dir.linux.ppc" value="${java.home.dir}/jre/lib/ppc" />
- <property name="java.lib.dir.linux.ia64" value="${java.home.dir}/jre/lib/ia64" />
- <property name="java.lib.dir.hpux" value="${java.home.dir}/jre/lib/PA_RISC2.0" />
- <condition property="cpu" value="sparc">
-@@ -369,6 +371,15 @@
- <property name="linker.cfg.id.core" value="linker.cfg.linux.amd64.jogl" />
- </target>
-
-+ <target name="declare.linux" if="isLinux">
-+ <echo message="Linux" />
-+ <property name="java.includes.dir.platform" value="${java.includes.dir.linux}" />
-+ <property name="java.lib.dir.platform" value="${java.lib.dir.linux}" />
-+
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
-+ <property name="linker.cfg.id.core" value="linker.cfg.linux.jogl" />
-+ </target>
-+
- <target name="declare.linux.ia64" if="isLinuxIA64">
- <echo message="Linux.IA64" />
- <property name="java.includes.dir.platform" value="${java.includes.dir.linux}" />
-@@ -378,7 +389,6 @@
- <property name="linker.cfg.id.core" value="linker.cfg.linux.jogl" />
- </target>
-
-- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.x11" if="isLinux" />
-
- <target name="declare.solaris32" depends="declare.x11" if="isSolaris32Bit">
- <echo message="Solaris" />
-@@ -727,20 +737,19 @@
- <compiler id="compiler.cfg.freebsd.jogl" extends="compiler.cfg.freebsd">
- <!-- Need to force X11R6 headers on to include path after stub_includes -->
- <includepath path="stub_includes/opengl"/>
-- <includepath path="/usr/X11R6/include" />
- </compiler>
-
- <!-- linker configuration -->
-
- <linker id="linker.cfg.linux.jogl" extends="linker.cfg.linux">
-- <syslibset dir="/usr/X11R6/lib" libs="GL, X11"/>
-- <syslibset dir="/usr/X11R6/lib" libs="Xxf86vm" />
-+ <syslibset libs="GL, X11"/>
-+ <syslibset libs="Xxf86vm" />
- <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
- </linker>
-
- <linker id="linker.cfg.linux.amd64.jogl" name="gcc">
-- <syslibset dir="/usr/X11R6/lib64" libs="GL, X11"/>
-- <syslibset dir="/usr/X11R6/lib64" libs="Xxf86vm" />
-+ <syslibset libs="GL, X11"/>
-+ <syslibset libs="Xxf86vm" />
- <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
- </linker>
-
-@@ -1018,6 +1027,7 @@
- destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
- overview="${javadoc.overview}"
- source="1.4"
-+ classpath="${gluegen.jar}"
- linkoffline="${javadoc.link} 142-packages"
- bottom="${javadoc.bottom}" >
- <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
diff --git a/debian/patches/cg-common.cfg.diff b/debian/patches/cg-common.cfg.diff
deleted file mode 100644
index 8a5d725..0000000
--- a/debian/patches/cg-common.cfg.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- libjogl-java-1.1.1~rc7/jogl/make/cg-common.cfg.orig 2007-12-26 01:28:24.000000000 +0100
-+++ libjogl-java-1.1.1~rc7/jogl/make/cg-common.cfg 2007-12-26 01:28:34.000000000 +0100
-@@ -113,6 +113,6 @@
- #
-
- CustomCCode #include <stdlib.h>
--CustomCCode #include <Cg/cgGL.h>
-+CustomCCode #include <CG/cgGL.h>
-
- IncludeAs CustomJavaCode CgGL cg-common-CustomJavaCode.java
diff --git a/debian/patches/defaultDebianPath.diff b/debian/patches/defaultDebianPath.diff
deleted file mode 100644
index 9341f5e..0000000
--- a/debian/patches/defaultDebianPath.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- jogl-1.1.1.orig/jogl/src/classes/com/sun/opengl/impl/NativeLibLoader.java 2007-07-20 17:06:04.000000000 +0200
-+++ jogl-1.1.1/jogl/src/classes/com/sun/opengl/impl/NativeLibLoader.java 2008-12-29 13:42:13.000000000 +0100
-@@ -186,7 +186,9 @@
- throw (UnsatisfiedLinkError) new UnsatisfiedLinkError().initCause(e);
- }
- } else {
-- System.loadLibrary(libraryName);
-+ String javaLibPath = System.getProperty("java.library.path") + File.pathSeparator + "/usr/lib/jni" + File.pathSeparator + "/usr/lib64/jni";
-+ System.setProperty("java.library.path", javaLibPath);
-+ System.loadLibrary(libraryName);
- }
- }
- }
diff --git a/debian/patches/series b/debian/patches/series
index 6e0226a..ab459a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
variousFixes.diff
disableOneDir.diff
+swt.diff
diff --git a/debian/patches/swt.diff b/debian/patches/swt.diff
new file mode 100644
index 0000000..1fbfad8
--- /dev/null
+++ b/debian/patches/swt.diff
@@ -0,0 +1,18 @@
+Index: jogl-v2.0-rc2/make/build-common.xml
+===================================================================
+--- jogl-v2.0-rc2.orig/make/build-common.xml 2011-04-19 09:40:43.000000000 +0200
++++ jogl-v2.0-rc2/make/build-common.xml 2011-04-19 09:42:06.000000000 +0200
+@@ -99,11 +99,8 @@
+ <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar">
+ <istrue value="${isWindowsX86}" />
+ </condition>
+- <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt-debug.jar">
+- <istrue value="${isLinuxAMD64}" />
+- </condition>
+- <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
+- <istrue value="${isLinuxX86}" />
++ <condition property="swt.jar" value="/usr/share/java/swt.jar">
++ <istrue value="${isLinux}" />
+ </condition>
+ <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar">
+ <and>
diff --git a/debian/rules b/debian/rules
index dc29e84..dd6eb46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ 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
+DEB_JARS := ant-contrib ant-contrib-cpptasks ant-nodeps antlr ant-antlr swt
DEB_ANT_ARGS := -Dsetup.noCDC=true
DEB_ANT_CLEAN_TARGET := clean
DEB_ANT_BUILD_TARGET := all
--
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