[libjogl2-java] 50/58: Imported Debian patch 2.1.3-1+alpha
Tony Mancill
tmancill at moszumanska.debian.org
Thu Sep 4 03:59:28 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 e99229ff93c7a0fb85749287840fe2da6012b64d
Author: Michael Cree <mcree at orcon.net.nz>
Date: Sun Feb 16 12:21:21 2014 +1300
Imported Debian patch 2.1.3-1+alpha
---
debian/changelog | 7 ++++
debian/patches/alpha.diff | 82 +++++++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +-
4 files changed, 91 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 90d4146..e1303bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libjogl2-java (2.1.3-1+alpha) unreleased; urgency=low
+
+ * Add alpha to build configs to fix FTBFS on alpha.
+ * Enable javadoc build on alpha for this upload to unreleased.
+
+ -- Michael Cree <mcree at orcon.net.nz> Sun, 16 Feb 2014 12:21:21 +1300
+
libjogl2-java (2.1.3-1) unstable; urgency=low
* New upstream release
diff --git a/debian/patches/alpha.diff b/debian/patches/alpha.diff
new file mode 100644
index 0000000..9562e59
--- /dev/null
+++ b/debian/patches/alpha.diff
@@ -0,0 +1,82 @@
+Index: libjogl2-java-2.1.3/make/build-jogl.xml
+===================================================================
+--- libjogl2-java-2.1.3.orig/make/build-jogl.xml 2014-02-15 21:14:02.000000000 +1300
++++ libjogl2-java-2.1.3/make/build-jogl.xml 2014-02-15 21:28:46.898257502 +1300
+@@ -1311,6 +1311,12 @@
+ <property name="linker.cfg.id.os" value="linker.cfg.linux.x86.jogl.x11" />
+ </target>
+
++ <target name="c.configure.linux.alpha" if="isLinuxAlpha">
++ <echo message="Linux.ALPHA" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
++ </target>
++
+ <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 @@
+ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
+ </target>
+
+- <target name="c.configure.linux" depends="c.configure.linux.arm,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
++ <target name="c.configure.linux" depends="c.configure.linux.arm,c.configure.linux.x86,c.configure.linux.alpha,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+
+ <target name="c.configure.android" if="isAndroid">
+ <echo message="Android" />
+Index: libjogl2-java-2.1.3/make/build-nativewindow.xml
+===================================================================
+--- libjogl2-java-2.1.3.orig/make/build-nativewindow.xml 2014-02-15 21:14:02.000000000 +1300
++++ libjogl2-java-2.1.3/make/build-nativewindow.xml 2014-02-15 21:27:38.028203781 +1300
+@@ -490,6 +490,12 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.x86.nativewindow.x11" />
+ </target>
+
++ <target name="c.configure.linux.alpha" if="isLinuxAlpha">
++ <echo message="Linux.ALPHA" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
++ </target>
++
+ <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 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
+ </target>
+
+- <target name="c.configure.linux" depends="c.configure.linux.arm,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
++ <target name="c.configure.linux" depends="c.configure.linux.arm,c.configure.linux.x86,c.configure.linux.alpha,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+
+ <target name="c.configure.android" if="isAndroid">
+ <echo message="Android" />
+Index: libjogl2-java-2.1.3/make/build-newt.xml
+===================================================================
+--- libjogl2-java-2.1.3.orig/make/build-newt.xml 2014-02-15 21:14:02.000000000 +1300
++++ libjogl2-java-2.1.3/make/build-newt.xml 2014-02-15 21:27:01.154214324 +1300
+@@ -415,6 +415,16 @@
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+ </target>
+
++ <target name="c.configure.linux.alpha" if="isLinuxAlpha">
++ <echo message="Linux.ALPHA" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11"
++ else="linker.cfg.linux">
++ <isset property="isX11" />
++ </condition>
++ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
++ </target>
++
+ <target name="c.configure.linux.amd64" if="isLinuxAMD64">
+ <echo message="Linux.AMD64" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux.amd64" />
+@@ -511,7 +521,7 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" />
+ </target>
+
+- <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.arm,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
++ <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.alpha,c.configure.linux.amd64,c.configure.linux.arm,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
+
+ <target name="c.configure.android" if="isAndroid">
+ <echo message="Android" />
diff --git a/debian/patches/series b/debian/patches/series
index 4b9b454..ffd1140 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ disable_android_2.diff
manifest.diff
s390x.diff
arm-build.diff
+alpha.diff
diff --git a/debian/rules b/debian/rules
index 1bc9f40..14d707e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ DEB_ANT_ARGS := -Dsetup.noCDC=true -verbose -Dcommon.gluegen.build.done=
DEB_ANT_CLEAN_TARGET := clean
DEB_ANT_BUILD_TARGET := all
DEB_ANT_BUILDFILE := make/build.xml
-ENABLE_BUILD_HELP_ARCHS := amd64 i386
+ENABLE_BUILD_HELP_ARCHS := amd64 i386 alpha
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
ifeq ($(DEB_HOST_ARCH),armhf)
--
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