This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libjogl2-java.
commit a35e18e47b178f8a0555ab60eafe2308a000d0e4 Author: Emmanuel Bourg <[email protected]> Date: Tue Oct 7 17:12:03 2014 +0200 Refreshed the patches --- debian/changelog | 8 ++++++ debian/patches/add-ports.diff | 18 ++++-------- debian/patches/alpha.diff | 8 +++--- debian/patches/arm-build.diff | 54 ++++++++++++++---------------------- debian/patches/disable_git_call.diff | 8 ++---- debian/patches/s390x.diff | 24 ++++++---------- debian/patches/swt.diff | 8 ++---- debian/patches/variousFixes.diff | 26 ++++++++--------- 8 files changed, 65 insertions(+), 89 deletions(-) diff --git a/debian/changelog b/debian/changelog index 90f304a..d35504e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libjogl2-java (2.2.1-1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release + * Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Tue, 07 Oct 2014 17:11:36 +0200 + libjogl2-java (2.1.5-3) UNRELEASED; urgency=medium * Team upload. diff --git a/debian/patches/add-ports.diff b/debian/patches/add-ports.diff index aa56fbb..4710273 100644 --- a/debian/patches/add-ports.diff +++ b/debian/patches/add-ports.diff @@ -1,8 +1,6 @@ -Index: b/make/build-jogl.xml -=================================================================== --- a/make/build-jogl.xml +++ b/make/build-jogl.xml -@@ -1329,6 +1329,12 @@ +@@ -1330,6 +1330,12 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux.arm.jogl.x11" /> </target> @@ -15,7 +13,7 @@ Index: b/make/build-jogl.xml <target name="c.configure.linux.ia64" if="isLinuxIA64"> <echo message="Linux.IA64" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> -@@ -1359,6 +1365,18 @@ +@@ -1360,6 +1366,18 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> </target> @@ -34,7 +32,7 @@ Index: b/make/build-jogl.xml <target name="c.configure.linux.s390" if="isLinuxs390"> <echo message="Linux.S390" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> -@@ -1377,7 +1395,7 @@ +@@ -1378,7 +1396,7 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> </target> @@ -43,11 +41,9 @@ Index: b/make/build-jogl.xml <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> -Index: b/make/build-nativewindow.xml -=================================================================== --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml -@@ -508,6 +508,12 @@ +@@ -504,6 +504,12 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.arm.nativewindow.x11" /> </target> @@ -60,7 +56,7 @@ Index: b/make/build-nativewindow.xml <target name="c.configure.linux.ia64" if="isLinuxIA64"> <echo message="Linux.IA64" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> -@@ -538,6 +544,18 @@ +@@ -534,6 +540,18 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> </target> @@ -79,7 +75,7 @@ Index: b/make/build-nativewindow.xml <target name="c.configure.linux.s390" if="isLinuxs390"> <echo message="Linux.S390" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> -@@ -556,7 +574,7 @@ +@@ -552,7 +570,7 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> </target> @@ -88,8 +84,6 @@ Index: b/make/build-nativewindow.xml <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> -Index: b/make/build-newt.xml -=================================================================== --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -453,6 +453,16 @@ diff --git a/debian/patches/alpha.diff b/debian/patches/alpha.diff index f0879c6..a8a6fe4 100644 --- a/debian/patches/alpha.diff +++ b/debian/patches/alpha.diff @@ -1,6 +1,6 @@ --- a/make/build-jogl.xml +++ b/make/build-jogl.xml -@@ -1311,6 +1311,12 @@ +@@ -1312,6 +1312,12 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux.x86.jogl.x11" /> </target> @@ -13,7 +13,7 @@ <target name="c.configure.linux.amd64" if="isLinuxAMD64"> <echo message="Linux.AMD64" /> <property name="compiler.cfg.id" value="compiler.cfg.linux.amd64" /> -@@ -1371,7 +1377,7 @@ +@@ -1372,7 +1378,7 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> </target> @@ -24,7 +24,7 @@ <echo message="Android" /> --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml -@@ -490,6 +490,12 @@ +@@ -486,6 +486,12 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.x86.nativewindow.x11" /> </target> @@ -37,7 +37,7 @@ <target name="c.configure.linux.amd64" if="isLinuxAMD64"> <echo message="Linux.AMD64" /> <property name="compiler.cfg.id" value="compiler.cfg.linux.amd64" /> -@@ -550,7 +556,7 @@ +@@ -546,7 +552,7 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> </target> diff --git a/debian/patches/arm-build.diff b/debian/patches/arm-build.diff index cf96fe0..ce63a19 100644 --- a/debian/patches/arm-build.diff +++ b/debian/patches/arm-build.diff @@ -1,8 +1,6 @@ -Index: jogl-v2.1.4/make/build-jogl.xml -=================================================================== ---- jogl-v2.1.4.orig/make/build-jogl.xml 2014-02-11 15:57:15.689427868 +0100 -+++ jogl-v2.1.4/make/build-jogl.xml 2014-02-11 15:57:15.689427868 +0100 -@@ -200,6 +200,19 @@ +--- a/make/build-jogl.xml ++++ b/make/build-jogl.xml +@@ -203,6 +203,19 @@ <isset property="setup.noSWT"/> </condition> @@ -22,7 +20,7 @@ Index: jogl-v2.1.4/make/build-jogl.xml <property name="java.excludes.javadoc.packagenames" value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/> -@@ -1187,7 +1200,7 @@ +@@ -1188,7 +1201,7 @@ <includepath path="/usr/local/include" /> </compiler> @@ -31,7 +29,7 @@ Index: jogl-v2.1.4/make/build-jogl.xml <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage --> <compilerarg value="-idirafter" /> <compilerarg value="/usr/include" /> -@@ -1215,8 +1228,8 @@ +@@ -1216,8 +1229,8 @@ <syslibset libs="X11"/> </linker> @@ -42,7 +40,7 @@ Index: jogl-v2.1.4/make/build-jogl.xml </linker> <linker id="linker.cfg.android.jogl" extends="linker.cfg.android"> -@@ -1304,10 +1317,10 @@ +@@ -1305,10 +1318,10 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux.amd64.jogl.x11" /> </target> @@ -57,7 +55,7 @@ Index: jogl-v2.1.4/make/build-jogl.xml </target> <target name="c.configure.linux.ia64" if="isLinuxIA64"> -@@ -1358,7 +1371,7 @@ +@@ -1359,7 +1372,7 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> </target> @@ -66,10 +64,8 @@ Index: jogl-v2.1.4/make/build-jogl.xml <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> -Index: jogl-v2.1.4/make/build-nativewindow.xml -=================================================================== ---- jogl-v2.1.4.orig/make/build-nativewindow.xml 2014-02-11 15:57:15.689427868 +0100 -+++ jogl-v2.1.4/make/build-nativewindow.xml 2014-02-11 15:57:15.689427868 +0100 +--- a/make/build-nativewindow.xml ++++ b/make/build-nativewindow.xml @@ -88,6 +88,19 @@ <isset property="setup.noAWT"/> </condition> @@ -90,7 +86,7 @@ Index: jogl-v2.1.4/make/build-nativewindow.xml <property name="java.excludes.all" value="${java.excludes.awt}" /> <echo message="java.excludes.all: ${java.excludes.all}" /> </target> -@@ -342,7 +355,7 @@ +@@ -338,7 +351,7 @@ <includepath path="/usr/local/include" /> </compiler> @@ -99,7 +95,7 @@ Index: jogl-v2.1.4/make/build-nativewindow.xml <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage --> <compilerarg value="-idirafter" /> <compilerarg value="/usr/include" /> -@@ -395,10 +408,10 @@ +@@ -391,10 +404,10 @@ <syslibset libs="Xrender"/> </linker> @@ -114,7 +110,7 @@ Index: jogl-v2.1.4/make/build-nativewindow.xml </linker> <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris"> -@@ -483,10 +496,10 @@ +@@ -479,10 +492,10 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.nativewindow.x11" /> </target> @@ -129,7 +125,7 @@ Index: jogl-v2.1.4/make/build-nativewindow.xml </target> <target name="c.configure.linux.ia64" if="isLinuxIA64"> -@@ -537,7 +550,7 @@ +@@ -533,7 +546,7 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> </target> @@ -138,10 +134,8 @@ Index: jogl-v2.1.4/make/build-nativewindow.xml <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> -Index: jogl-v2.1.4/make/build-newt.xml -=================================================================== ---- jogl-v2.1.4.orig/make/build-newt.xml 2014-02-11 15:57:15.689427868 +0100 -+++ jogl-v2.1.4/make/build-newt.xml 2014-02-11 15:58:15.169426413 +0100 +--- a/make/build-newt.xml ++++ b/make/build-newt.xml @@ -157,6 +157,19 @@ <isset property="setup.noOpenGL"/> </condition> @@ -217,10 +211,8 @@ Index: jogl-v2.1.4/make/build-newt.xml <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> -Index: jogl-v2.1.4/make/scripts/make.jogl.all.linux-armv7hf.sh -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ jogl-v2.1.4/make/scripts/make.jogl.all.linux-armv7hf.sh 2014-02-11 15:57:15.689427868 +0100 +--- /dev/null ++++ b/make/scripts/make.jogl.all.linux-armv7hf.sh @@ -0,0 +1,27 @@ +#! /bin/sh + @@ -249,10 +241,8 @@ Index: jogl-v2.1.4/make/scripts/make.jogl.all.linux-armv7hf.sh + -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \ + $* 2>&1 | tee make.jogl.all.linux-armv7hf.log + -Index: jogl-v2.1.4/make/scripts/tests-armv7_armhf.sh -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ jogl-v2.1.4/make/scripts/tests-armv7_armhf.sh 2014-02-11 15:57:15.689427868 +0100 +--- /dev/null ++++ b/make/scripts/tests-armv7_armhf.sh @@ -0,0 +1,7 @@ +#! /bin/bash + @@ -261,10 +251,8 @@ Index: jogl-v2.1.4/make/scripts/tests-armv7_armhf.sh +. $spath/tests.sh `which java` -DummyArg ../build-linux-armv7hf $* + + -Index: jogl-v2.1.4/make/scripts/tests-linux-armv7hf.sh -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ jogl-v2.1.4/make/scripts/tests-linux-armv7hf.sh 2014-02-11 15:57:15.689427868 +0100 +--- /dev/null ++++ b/make/scripts/tests-linux-armv7hf.sh @@ -0,0 +1,7 @@ +#! /bin/bash + diff --git a/debian/patches/disable_git_call.diff b/debian/patches/disable_git_call.diff index a8cb872..15a27a1 100644 --- a/debian/patches/disable_git_call.diff +++ b/debian/patches/disable_git_call.diff @@ -1,8 +1,6 @@ -Index: jogl-v2.1.2/make/build-common.xml -=================================================================== ---- jogl-v2.1.2.orig/make/build-common.xml 2013-11-08 10:54:23.000000000 +0100 -+++ jogl-v2.1.2/make/build-common.xml 2013-11-08 10:54:23.000000000 +0100 -@@ -71,19 +71,7 @@ +--- a/make/build-common.xml ++++ b/make/build-common.xml +@@ -72,19 +72,7 @@ <property name="jogl.build.number" value="manual"/> <property name="jogl.build.id" value="${version.timestamp}"/> <mkdir dir="${tempdir}" /> diff --git a/debian/patches/s390x.diff b/debian/patches/s390x.diff index 475c76e..a8f1dff 100644 --- a/debian/patches/s390x.diff +++ b/debian/patches/s390x.diff @@ -1,8 +1,6 @@ -Index: jogl-v2.1.4/make/build-jogl.xml -=================================================================== ---- jogl-v2.1.4.orig/make/build-jogl.xml 2014-02-11 15:57:11.017427982 +0100 -+++ jogl-v2.1.4/make/build-jogl.xml 2014-02-11 15:57:11.013427982 +0100 -@@ -1345,6 +1345,12 @@ +--- a/make/build-jogl.xml ++++ b/make/build-jogl.xml +@@ -1346,6 +1346,12 @@ <property name="compiler.cfg.id" value="compiler.cfg.linux" /> <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> </target> @@ -15,7 +13,7 @@ Index: jogl-v2.1.4/make/build-jogl.xml <target name="c.configure.linux.sparc" if="isLinuxSparc"> <echo message="Linux.SPARC" /> -@@ -1352,7 +1358,7 @@ +@@ -1353,7 +1359,7 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> </target> @@ -24,11 +22,9 @@ Index: jogl-v2.1.4/make/build-jogl.xml <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> -Index: jogl-v2.1.4/make/build-nativewindow.xml -=================================================================== ---- jogl-v2.1.4.orig/make/build-nativewindow.xml 2014-02-11 15:57:11.017427982 +0100 -+++ jogl-v2.1.4/make/build-nativewindow.xml 2014-02-11 15:57:11.013427982 +0100 -@@ -525,13 +525,19 @@ +--- a/make/build-nativewindow.xml ++++ b/make/build-nativewindow.xml +@@ -521,13 +521,19 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> </target> @@ -49,10 +45,8 @@ Index: jogl-v2.1.4/make/build-nativewindow.xml <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> -Index: jogl-v2.1.4/make/build-newt.xml -=================================================================== ---- jogl-v2.1.4.orig/make/build-newt.xml 2014-02-11 15:57:11.017427982 +0100 -+++ jogl-v2.1.4/make/build-newt.xml 2014-02-11 15:57:11.013427982 +0100 +--- a/make/build-newt.xml ++++ b/make/build-newt.xml @@ -481,6 +481,16 @@ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> </target> diff --git a/debian/patches/swt.diff b/debian/patches/swt.diff index d800e0b..13f8d2e 100644 --- a/debian/patches/swt.diff +++ b/debian/patches/swt.diff @@ -1,8 +1,6 @@ -Index: jogl-v2.1.2/make/build-common.xml -=================================================================== ---- jogl-v2.1.2.orig/make/build-common.xml 2013-11-08 10:54:20.000000000 +0100 -+++ jogl-v2.1.2/make/build-common.xml 2013-11-08 10:54:20.000000000 +0100 -@@ -131,15 +131,9 @@ +--- a/make/build-common.xml ++++ b/make/build-common.xml +@@ -132,15 +132,9 @@ <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-freebsd-x86_64/swt.jar"> <istrue value="${isFreeBSDAMD64}" /> </condition> diff --git a/debian/patches/variousFixes.diff b/debian/patches/variousFixes.diff index 91569e0..0a08410 100644 --- a/debian/patches/variousFixes.diff +++ b/debian/patches/variousFixes.diff @@ -1,7 +1,5 @@ -Index: jogl-v2.1.4/make/build-common.xml -=================================================================== ---- jogl-v2.1.4.orig/make/build-common.xml 2014-02-11 15:56:11.681429433 +0100 -+++ jogl-v2.1.4/make/build-common.xml 2014-02-11 15:56:11.677429433 +0100 +--- a/make/build-common.xml ++++ b/make/build-common.xml @@ -13,7 +13,7 @@ </fail> @@ -20,25 +18,25 @@ Index: jogl-v2.1.4/make/build-common.xml <condition property="rootrel.build" value="build"> <not> -@@ -208,7 +208,7 @@ +@@ -209,7 +209,7 @@ <property name="gluegen.build.xml" value="${gluegen.make}/build.xml" /> <property name="build.gluegen" value="${gluegen.root}/${rootrel.build}" /> <property name="obj.gluegen" value="${build.gluegen}/obj"/> - <property name="gluegen.jar" value="${build.gluegen}/gluegen.jar" /> + <property name="gluegen.jar" value="/usr/share/java/gluegen2.jar" /> - <property name="ant.jar" value="${ant.home}/lib/ant.jar" /> - <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" /> -@@ -413,7 +413,7 @@ + <property name="build.joal" value="${joal.root}/${rootrel.build}" /> <!-- optional --> + +@@ -432,7 +432,7 @@ </path> <!-- JavaSE combinations --> - <property name="gluegen-rt.jar" value="${build.gluegen}/gluegen-rt.jar" /> + <property name="gluegen-rt.jar" value="/usr/share/java/gluegen2-rt.jar" /> <property name="gluegen-rt-android.jar" value="${build.gluegen}/gluegen-rt-android.jar" /> + <property name="gluegen-test-util.jar" value="${build.gluegen}/gluegen-test-util.jar" /> <property name="jogl-test.jar" value="${jar}/jogl-test.jar"/> - <property name="jogl-test-android.jar" value="${jar}/jogl-test-android.jar"/> -@@ -585,7 +585,10 @@ +@@ -643,7 +643,10 @@ <!-- Run the GlueGen build to ensure that the GlueGen ANT task - has been built. --> @@ -50,11 +48,9 @@ Index: jogl-v2.1.4/make/build-common.xml </target> -Index: jogl-v2.1.4/make/build.xml -=================================================================== ---- jogl-v2.1.4.orig/make/build.xml 2014-02-11 15:56:11.681429433 +0100 -+++ jogl-v2.1.4/make/build.xml 2014-02-11 15:56:11.677429433 +0100 -@@ -291,7 +291,7 @@ +--- a/make/build.xml ++++ b/make/build.xml +@@ -327,7 +327,7 @@ </target> <target name="tag.build" depends="init"> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjogl2-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
