[pkg-java] r15169 - in trunk/gluegen2/debian: . patches
Sylvestre Ledru
sylvestre at alioth.debian.org
Sat Oct 8 11:59:46 UTC 2011
Author: sylvestre
Date: 2011-10-08 11:59:46 +0000 (Sat, 08 Oct 2011)
New Revision: 15169
Added:
trunk/gluegen2/debian/patches/disable_git_call.diff
Modified:
trunk/gluegen2/debian/changelog
trunk/gluegen2/debian/patches/other-archs.diff
trunk/gluegen2/debian/patches/series
Log:
gluegen2 (2.0-rc3-2) unstable; urgency=low
* Fix some FTBFS on various archs
Modified: trunk/gluegen2/debian/changelog
===================================================================
--- trunk/gluegen2/debian/changelog 2011-10-08 11:20:44 UTC (rev 15168)
+++ trunk/gluegen2/debian/changelog 2011-10-08 11:59:46 UTC (rev 15169)
@@ -1,3 +1,9 @@
+gluegen2 (2.0-rc3-2) unstable; urgency=low
+
+ * Fix some FTBFS on various archs
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 08 Oct 2011 13:50:08 +0200
+
gluegen2 (2.0-rc3-1) unstable; urgency=low
* New upstream release
Added: trunk/gluegen2/debian/patches/disable_git_call.diff
===================================================================
--- trunk/gluegen2/debian/patches/disable_git_call.diff (rev 0)
+++ trunk/gluegen2/debian/patches/disable_git_call.diff 2011-10-08 11:59:46 UTC (rev 15169)
@@ -0,0 +1,19 @@
+Index: gluegen2-2.0-rc3/make/build.xml
+===================================================================
+--- gluegen2-2.0-rc3.orig/make/build.xml 2011-10-08 13:24:22.000000000 +0200
++++ gluegen2-2.0-rc3/make/build.xml 2011-10-08 13:24:29.000000000 +0200
+@@ -62,14 +62,6 @@
+ <property name="gluegen.build.number" value="manual"/>
+ <property name="gluegen.build.id" value="${version.timestamp}"/>
+ <mkdir dir="${build}" />
+- <exec dir="." executable="git" logError="true" failonerror="false" failifexecutionfails="false"
+- output="${build}/localbranch.raw">
+- <arg line="branch --no-color"/>
+- </exec>
+- <exec dir="." executable="sed" logError="true" failonerror="false" failifexecutionfails="false"
+- outputproperty="gluegen.build.branch">
+- <arg line="-e '/^[^*]/d' -e 's/* \(.*\)/\1/' ${build}/localbranch.raw"/>
+- </exec>
+ <property name="gluegen.build.branch" value="manual"/> <!-- fallback -->
+ <exec dir="${project.root}" executable="git" logError="true" failonerror="false" failifexecutionfails="false"
+ outputproperty="gluegen.build.commit">
Modified: trunk/gluegen2/debian/patches/other-archs.diff
===================================================================
--- trunk/gluegen2/debian/patches/other-archs.diff 2011-10-08 11:20:44 UTC (rev 15168)
+++ trunk/gluegen2/debian/patches/other-archs.diff 2011-10-08 11:59:46 UTC (rev 15169)
@@ -1,26 +1,24 @@
---- gluegen2-2.0-rc3.orig/make/gluegen-cpptasks-base.xml 2011-10-06 13:22:16.000000000 +0200
-+++ gluegen2-2.0-rc3/make/gluegen-cpptasks-base.xml 2011-10-06 13:54:22.000000000 +0200
-@@ -29,6 +29,14 @@
+--- plop/gluegen-2.0-rc3/make/gluegen-cpptasks-base.xml 2011-10-06 13:22:16.000000000 +0200
++++ gluegen2-2.0-rc3/make/gluegen-cpptasks-base.xml 2011-10-08 13:53:57.000000000 +0200
+@@ -29,6 +29,13 @@
- isLinuxIA64
- isLinuxX86
- isLinuxARMv7
+ - isLinuxAlpha
-+ - isLinuxArmel
-+ - isLinuxHPPA
-+ - isLinuxMIPS
-+ - isLinuxMIPSEL
-+ - isLinuxPPC
-+ - isLinuxS390
++ - isLinuxHppa
++ - isLinuxMips
++ - isLinuxMipsel
++ - isLinuxPpc
++ - isLinuxs390
+ - isLinuxSparc
- isOSX
- isOSXPPC
- isSolaris
-@@ -98,6 +106,14 @@
+@@ -98,6 +105,13 @@
- compiler.cfg.linux.x86
- compiler.cfg.linux.amd64
- compiler.cfg.linux.armv7
+ - compiler.cfg.linux.alpha
-+ - compiler.cfg.linux.armel
+ - compiler.cfg.linux.hppa
+ - compiler.cfg.linux.mips
+ - compiler.cfg.linux.mipsel
@@ -30,12 +28,11 @@
- compiler.cfg.solaris
- compiler.cfg.solaris.sparcv9
- compiler.cfg.solaris.amd64
-@@ -111,6 +127,14 @@
+@@ -111,6 +125,13 @@
- linker.cfg.linux.x86
- linker.cfg.linux.amd64
- linker.cfg.linux.armv7
+ - linker.cfg.linux.alpha
-+ - linker.cfg.linux.armel
+ - linker.cfg.linux.hppa
+ - linker.cfg.linux.mips
+ - linker.cfg.linux.mipsel
@@ -45,7 +42,7 @@
- linker.cfg.freebsd.x86
- linker.cfg.freebsd.amd64
- linker.cfg.solaris
-@@ -247,6 +271,79 @@
+@@ -247,6 +268,73 @@
</or>
</and>
</condition>
@@ -58,16 +55,10 @@
+ <condition property="alpha">
+ <os arch="alpha" />
+ </condition>
-+ <condition property="isLinuxArmel">
-+ <and>
-+ <istrue value="${isLinux}" />
-+ <os arch="arm" />
-+ </and>
-+ </condition>
+ <condition property="arm">
+ <os arch="arm" />
+ </condition>
-+ <condition property="isLinuxHPPA">
++ <condition property="isLinuxHppa">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="hppa" />
@@ -76,7 +67,7 @@
+ <condition property="hppa">
+ <os arch="hppa" />
+ </condition>
-+ <condition property="isLinuxMIPS">
++ <condition property="isLinuxMips">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="mips" />
@@ -85,7 +76,7 @@
+ <condition property="mips">
+ <os arch="mips" />
+ </condition>
-+ <condition property="isLinuxMIPSEL">
++ <condition property="isLinuxMipsel">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="mipsel" />
@@ -94,7 +85,7 @@
+ <condition property="mipsel">
+ <os arch="mipsel" />
+ </condition>
-+ <condition property="isLinuxPPC">
++ <condition property="isLinuxPpc">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="ppc" />
@@ -103,7 +94,7 @@
+ <condition property="ppc">
+ <os arch="ppc" />
+ </condition>
-+ <condition property="isLinuxS390">
++ <condition property="isLinuxs390">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="s390" />
@@ -125,22 +116,21 @@
<condition property="isLinuxX86">
<and>
<istrue value="${isLinux}" />
-@@ -347,6 +444,14 @@
+@@ -347,6 +435,13 @@
<echo message="LinuxIA64=${isLinuxIA64}" />
<echo message="LinuxX86=${isLinuxX86}" />
<echo message="LinuxARMv7=${isLinuxARMv7}" />
+ <echo message="LinuxAlpha=${isLinuxAlpha}" />
-+ <echo message="LinuxArmel=${isLinuxArmel}" />
-+ <echo message="LinuxHPPA=${isLinuxHPPA}" />
-+ <echo message="LinuxMIPS=${isLinuxMIPS}" />
-+ <echo message="LinuxMIPSEL=${isLinuxMIPSEL}" />
-+ <echo message="LinuxPPC=${isLinuxPPC}" />
-+ <echo message="LinuxS390=${isLinuxS390}" />
++ <echo message="LinuxHppa=${isLinuxHppa}" />
++ <echo message="LinuxMips=${isLinuxMips}" />
++ <echo message="LinuxMipsel=${isLinuxMipsel}" />
++ <echo message="LinuxPpc=${isLinuxPpc}" />
++ <echo message="Linuxs390=${isLinuxs390}" />
+ <echo message="LinuxSparc=${isLinuxSparc}" />
<echo message="OS X=${isOSX}" />
<echo message="OS X PPC=${use.macosppc}" />
<echo message="OS X x32=${use.macosx32}" />
-@@ -360,7 +465,10 @@
+@@ -360,7 +455,10 @@
<echo message="Unix=${isUnix}" />
<echo message="Windows=${isWindows}" />
<echo message="X11=${isX11}" />
@@ -152,7 +142,7 @@
<target name="gluegen.cpptasks.detect.os.freebsd.x86" unless="gluegen.cpptasks.detected.os.2" if="isFreeBSDX86">
<property name="os.and.arch" value="freebsd-i586" />
-@@ -392,11 +500,44 @@
+@@ -392,11 +490,40 @@
<property name="os.and.arch" value="linux-armv7" />
</target>
@@ -160,27 +150,23 @@
+ <property name="os.and.arch" value="linux-alpha" />
+ </target>
+
-+ <target name="gluegen.cpptasks.detect.os.linux.armel" unless="gluegen.cpptasks.detected.os.2" if="isLinuxArmel">
-+ <property name="os.and.arch" value="linux-armel" />
-+ </target>
-+
-+ <target name="gluegen.cpptasks.detect.os.linux.hppa" unless="gluegen.cpptasks.detected.os.2" if="isLinuxHPPA">
++ <target name="gluegen.cpptasks.detect.os.linux.hppa" unless="gluegen.cpptasks.detected.os.2" if="isLinuxHppa">
+ <property name="os.and.arch" value="linux-hppa" />
+ </target>
+
-+ <target name="gluegen.cpptasks.detect.os.linux.mips" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMIPS">
++ <target name="gluegen.cpptasks.detect.os.linux.mips" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMips">
+ <property name="os.and.arch" value="linux-mips" />
+ </target>
+
-+ <target name="gluegen.cpptasks.detect.os.linux.mipsel" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMIPSEL">
++ <target name="gluegen.cpptasks.detect.os.linux.mipsel" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMipsel">
+ <property name="os.and.arch" value="linux-mipsel" />
+ </target>
+
-+ <target name="gluegen.cpptasks.detect.os.linux.ppc" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPPC">
++ <target name="gluegen.cpptasks.detect.os.linux.ppc" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc">
+ <property name="os.and.arch" value="linux-ppc" />
+ </target>
+
-+ <target name="gluegen.cpptasks.detect.os.linux.s390" unless="gluegen.cpptasks.detected.os.2" if="isLinuxS390">
++ <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>
+
@@ -194,51 +180,45 @@
</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.armv7,gluegen.cpptasks.detect.os.android.armv7" 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.armv7,gluegen.cpptasks.detect.os.android.armv7,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.armel,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.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.armv7,gluegen.cpptasks.detect.os.android.armv7,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.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" />
-@@ -1008,8 +1149,56 @@
- <property name="linker.cfg.id.base" value="linker.cfg.linux" />
+@@ -1009,7 +1136,49 @@
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ia64" />
</target>
-+ <target name="gluegen.cpptasks.declare.compiler.linux.armel" if="isLinuxArmel">
-+ <echo message="Linux.armel" />
-+ <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/arm/" />
-+ </target>
-+
-+ <target name="gluegen.cpptasks.declare.compiler.linux.hppa" if="isLinuxHPPA">
+
+- <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.armv7" if="isLinux">
++ <target name="gluegen.cpptasks.declare.compiler.linux.hppa" if="isLinuxHppa">
+ <echo message="Linux.hppa" />
+ <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/hppa" />
+ </target>
+
-+ <target name="gluegen.cpptasks.declare.compiler.linux.mips" if="isLinuxMIPS">
-+ <echo message="Linux.MIPS" />
++ <target name="gluegen.cpptasks.declare.compiler.linux.mips" if="isLinuxMips">
++ <echo message="Linux.Mips" />
+ <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/mips" />
+ </target>
+
-+ <target name="gluegen.cpptasks.declare.compiler.linux.mipsel" if="isLinuxMIPSEL">
-+ <echo message="Linux.MIPSEL" />
++ <target name="gluegen.cpptasks.declare.compiler.linux.mipsel" if="isLinuxMipsel">
++ <echo message="Linux.Mipsel" />
+ <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/mipsel" />
+ </target>
+
-+ <target name="gluegen.cpptasks.declare.compiler.linux.ppc" if="isLinuxPPC">
-+ <echo message="Linux.PPC" />
++ <target name="gluegen.cpptasks.declare.compiler.linux.ppc" if="isLinuxPpc">
++ <echo message="Linux.Ppc" />
+ <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/ppc" />
+ </target>
+
-+ <target name="gluegen.cpptasks.declare.compiler.linux.s390" if="isLinuxS390">
-+ <echo message="Linux.S390" />
++ <target name="gluegen.cpptasks.declare.compiler.linux.s390" if="isLinuxs390">
++ <echo message="Linux.s390" />
+ <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/s390" />
@@ -250,15 +230,14 @@
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/" />
+ </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.armv7" 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.armv7,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.armel,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.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.armv7,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.sparc" if="isLinux">
<property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
</target>
---- gluegen2-2.0-rc3.orig/make/build.xml 2011-10-06 13:22:16.000000000 +0200
-+++ gluegen2-2.0-rc3/make/build.xml 2011-10-06 13:46:35.000000000 +0200
-@@ -306,8 +306,56 @@
+--- plop/gluegen-2.0-rc3/make/build.xml 2011-10-06 13:22:16.000000000 +0200
++++ gluegen2-2.0-rc3/make/build.xml 2011-10-08 13:54:07.000000000 +0200
+@@ -306,8 +306,50 @@
<property name="compiler.cfg.id" value="compiler.cfg.linux.armv7" />
<property name="linker.cfg.id" value="linker.cfg.linux.armv7" />
</target>
@@ -269,12 +248,6 @@
+ <property name="linker.cfg.id" value="linker.cfg.linux.alpha" />
+ </target>
+
-+ <target name="declare.linux.armel" if="isLinuxArmel">
-+ <echo message="Linux.armel" />
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux.armel" />
-+ <property name="linker.cfg.id" value="linker.cfg.linux.armel" />
-+ </target>
-+
+ <target name="declare.linux.hppa" if="isLinuxHppa">
+ <echo message="Linux.hppa" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux.hppa" />
@@ -299,7 +272,7 @@
+ <property name="linker.cfg.id" value="linker.cfg.linux.ppc" />
+ </target>
+
-+ <target name="declare.linux.s390" if="isLinuxS390">
++ <target name="declare.linux.s390" if="isLinuxs390">
+ <echo message="Linux.s390" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux.s390" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.s390" />
@@ -312,7 +285,7 @@
+ </target>
- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.armv7" if="isLinux" >
-+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.alpha,declare.linux.armel,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.sparc,declare.linux.armv7" if="isLinux" >
++ <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.sparc,declare.linux.armv7" if="isLinux" >
<property name="c.src.dir.os" value="unix" />
<property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
</target>
Modified: trunk/gluegen2/debian/patches/series
===================================================================
--- trunk/gluegen2/debian/patches/series 2011-10-08 11:20:44 UTC (rev 15168)
+++ trunk/gluegen2/debian/patches/series 2011-10-08 11:59:46 UTC (rev 15169)
@@ -6,4 +6,4 @@
disable-test-zip-archive.diff
fix_issues.diff
disable_android.diff
-
+disable_git_call.diff
More information about the pkg-java-commits
mailing list