[pkg-java] r17397 - in trunk/gluegen2/debian: . patches
Tony Mancill
tmancill at alioth.debian.org
Mon Nov 4 05:22:41 UTC 2013
Author: tmancill
Date: 2013-11-04 05:22:41 +0000 (Mon, 04 Nov 2013)
New Revision: 17397
Added:
trunk/gluegen2/debian/patches/fix-alpha-build-config.patch
trunk/gluegen2/debian/patches/fix-ppc64-build-config.patch
Modified:
trunk/gluegen2/debian/changelog
trunk/gluegen2/debian/compat
trunk/gluegen2/debian/control
trunk/gluegen2/debian/patches/series
Log:
apply changes for 2.0.2-2
Modified: trunk/gluegen2/debian/changelog
===================================================================
--- trunk/gluegen2/debian/changelog 2013-11-02 15:28:12 UTC (rev 17396)
+++ trunk/gluegen2/debian/changelog 2013-11-04 05:22:41 UTC (rev 17397)
@@ -1,3 +1,15 @@
+gluegen2 (2.0.2-2) unstable; urgency=low
+
+ * Team upload.
+ * Apply patch to build config for FTBFS on alpha
+ - Thank you to Michael Cree. (Closes: #728571)
+ * Freshen and apply patch to build config for FTBFS on ppc64
+ - Thank you to Hiroyuki Yamamoto. (Closes: #694070)
+ * Update Standards-Version to 3.9.5.
+ * Change debhelper version from 7 to 9; update debian/compat from 5 to 9.
+
+ -- tony mancill <tmancill at debian.org> Sun, 03 Nov 2013 21:11:45 -0800
+
gluegen2 (2.0.2-1) unstable; urgency=low
* New upstream release
Modified: trunk/gluegen2/debian/compat
===================================================================
--- trunk/gluegen2/debian/compat 2013-11-02 15:28:12 UTC (rev 17396)
+++ trunk/gluegen2/debian/compat 2013-11-04 05:22:41 UTC (rev 17397)
@@ -1 +1 @@
-5
+9
Modified: trunk/gluegen2/debian/control
===================================================================
--- trunk/gluegen2/debian/control 2013-11-02 15:28:12 UTC (rev 17396)
+++ trunk/gluegen2/debian/control 2013-11-04 05:22:41 UTC (rev 17397)
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, quilt, default-jdk,
+Build-Depends: debhelper (>= 9), cdbs, quilt, default-jdk,
ant, junit4, ant-contrib-cpptasks, ant-optional, libantlr-java
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://jogamp.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/gluegen2/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/gluegen2/
Added: trunk/gluegen2/debian/patches/fix-alpha-build-config.patch
===================================================================
--- trunk/gluegen2/debian/patches/fix-alpha-build-config.patch (rev 0)
+++ trunk/gluegen2/debian/patches/fix-alpha-build-config.patch 2013-11-04 05:22:41 UTC (rev 17397)
@@ -0,0 +1,12 @@
+diff -Nurd gluegen2-2.0.2.orig/make/build.xml gluegen2-2.0.2/make/build.xml
+--- gluegen2-2.0.2.orig/make/build.xml 2013-11-03 20:08:03.000000000 +1300
++++ gluegen2-2.0.2/make/build.xml 2013-11-03 20:01:00.000000000 +1300
+@@ -349,7 +349,7 @@
+ <property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
+ </target>
+
+- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
++ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
+ <property name="c.src.dir.os" value="unix" />
+ <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
+ </target>
Added: trunk/gluegen2/debian/patches/fix-ppc64-build-config.patch
===================================================================
--- trunk/gluegen2/debian/patches/fix-ppc64-build-config.patch (rev 0)
+++ trunk/gluegen2/debian/patches/fix-ppc64-build-config.patch 2013-11-04 05:22:41 UTC (rev 17397)
@@ -0,0 +1,119 @@
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -331,6 +331,12 @@
+ <property name="linker.cfg.id" value="linker.cfg.linux.ppc" />
+ </target>
+
++ <target name="declare.linux.ppc64" if="isLinuxPpc64">
++ <echo message="Linux.ppc64" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <property name="linker.cfg.id" value="linker.cfg.linux.ppc64" />
++ </target>
++
+ <target name="declare.linux.s390" if="isLinuxs390">
+ <echo message="Linux.s390" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+@@ -349,7 +355,7 @@
+ <property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
+ </target>
+
+- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
++ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
+ <property name="c.src.dir.os" value="unix" />
+ <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
+ </target>
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
+@@ -46,6 +46,7 @@
+ - isLinuxMips
+ - isLinuxMipsel
+ - isLinuxPpc
++ - isLinuxPpc64
+ - isLinuxs390
+ - isLinuxs390x
+ - isLinuxSparc
+@@ -128,6 +129,7 @@
+ - compiler.cfg.linux.mips
+ - compiler.cfg.linux.mipsel
+ - compiler.cfg.linux.ppc
++ - compiler.cfg.linux.ppc64
+ - compiler.cfg.linux.s390
+ - compiler.cfg.linux.s390x
+ - compiler.cfg.linux.sparc
+@@ -386,6 +388,15 @@
+ <condition property="ppc">
+ <os arch="ppc" />
+ </condition>
++ <condition property="isLinuxPpc64">
++ <and>
++ <istrue value="${isLinux}" />
++ <os arch="ppc64" />
++ </and>
++ </condition>
++ <condition property="ppc64">
++ <os arch="ppc64" />
++ </condition>
+ <condition property="isLinuxs390">
+ <and>
+ <istrue value="${isLinux}" />
+@@ -568,6 +579,7 @@
+ <echo message="LinuxMips=${isLinuxMips}" />
+ <echo message="LinuxMipsel=${isLinuxMipsel}" />
+ <echo message="LinuxPpc=${isLinuxPpc}" />
++ <echo message="LinuxPpc64=${isLinuxPpc64}" />
+ <echo message="Linuxs390=${isLinuxs390}" />
+ <echo message="Linuxs390x=${isLinuxs390x}" />
+ <echo message="LinuxSparc=${isLinuxSparc}" />
+@@ -644,6 +656,10 @@
+ <property name="os.and.arch" value="linux-ppc" />
+ </target>
+
++ <target name="gluegen.cpptasks.detect.os.linux.ppc64" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc64">
++ <property name="os.and.arch" value="linux-ppc64" />
++ </target>
++
+ <target name="gluegen.cpptasks.detect.os.linux.s390" unless="gluegen.cpptasks.detected.os.2" if="isLinuxs390">
+ <property name="os.and.arch" value="linux-s390" />
+ </target>
+@@ -664,7 +680,7 @@
+ <property name="os.and.arch" value="android-armv6hf" />
+ </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,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
++ <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,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.ppc64,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
+
+ <target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
+ <property name="native.library.suffix" value="*lib" />
+@@ -1168,6 +1184,9 @@
+ <linker id="linker.cfg.linux.ppc" name="gcc">
+ </linker>
+
++ <linker id="linker.cfg.linux.ppc64" name="gcc">
++ </linker>
++
+ <linker id="linker.cfg.linux.s390" name="gcc">
+ </linker>
+
+@@ -1411,6 +1430,13 @@
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc" />
+ </target>
+
++ <target name="gluegen.cpptasks.declare.compiler.linux.ppc64" if="isLinuxPpc64">
++ <echo message="Linux.Ppc64" />
++ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
++ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
++ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc64" />
++ </target>
++
+ <target name="gluegen.cpptasks.declare.compiler.linux.s390" if="isLinuxs390">
+ <echo message="Linux.s390" />
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
+@@ -1432,7 +1458,7 @@
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/sparc" />
+ </target>
+
+- <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
++ <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.ppc64,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
+ <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
+ </target>
+
Modified: trunk/gluegen2/debian/patches/series
===================================================================
--- trunk/gluegen2/debian/patches/series 2013-11-02 15:28:12 UTC (rev 17396)
+++ trunk/gluegen2/debian/patches/series 2013-11-04 05:22:41 UTC (rev 17397)
@@ -15,3 +15,5 @@
#duplicatedeclaration.diff
#disable_android2.diff
armhf.diff
+fix-alpha-build-config.patch
+fix-ppc64-build-config.patch
More information about the pkg-java-commits
mailing list