Author: sylvestre Date: 2011-03-16 20:33:24 +0000 (Wed, 16 Mar 2011) New Revision: 13434
Added: trunk/libgluegen2-java/debian/patches/moreFeedback.diff trunk/libgluegen2-java/debian/patches/other-archs.diff Modified: trunk/libgluegen2-java/debian/changelog trunk/libgluegen2-java/debian/patches/series Log: gluegen2 (2.0-rc2-4) experimental; urgency=low * Same playern try again: I forgot some declarations in make/build.xml -- Sylvestre Ledru <[email protected]> Wed, 16 Mar 2011 21:23:33 +0100 gluegen2 (2.0-rc2-3) experimental; urgency=low * Try to build on all Debian archs. Archs are likely to fail here. -- Sylvestre Ledru <[email protected]> Mon, 14 Mar 2011 21:28:49 +0100 Modified: trunk/libgluegen2-java/debian/changelog =================================================================== --- trunk/libgluegen2-java/debian/changelog 2011-03-16 13:32:50 UTC (rev 13433) +++ trunk/libgluegen2-java/debian/changelog 2011-03-16 20:33:24 UTC (rev 13434) @@ -1,3 +1,15 @@ +gluegen2 (2.0-rc2-4) experimental; urgency=low + + * Same playern try again: I forgot some declarations in make/build.xml + + -- Sylvestre Ledru <[email protected]> Wed, 16 Mar 2011 21:23:33 +0100 + +gluegen2 (2.0-rc2-3) experimental; urgency=low + + * Try to build on all Debian archs. Archs are likely to fail here. + + -- Sylvestre Ledru <[email protected]> Mon, 14 Mar 2011 21:28:49 +0100 + gluegen2 (2.0-rc2-2) experimental; urgency=low * Beginning of the management of other debian archs. Partially fixes the Added: trunk/libgluegen2-java/debian/patches/moreFeedback.diff =================================================================== --- trunk/libgluegen2-java/debian/patches/moreFeedback.diff (rev 0) +++ trunk/libgluegen2-java/debian/patches/moreFeedback.diff 2011-03-16 20:33:24 UTC (rev 13434) @@ -0,0 +1,10 @@ +--- gluegen2-2.0-rc2.orig/make/gluegen-cpptasks-base.xml 2011-03-16 11:46:52.000000000 +0100 ++++ gluegen2-2.0-rc2/make/gluegen-cpptasks-base.xml 2011-03-16 11:46:18.000000000 +0100 +@@ -517,6 +517,7 @@ + </target> + + <target name="gluegen.cpptasks.detect.os.2" depends="gluegen.cpptasks.detect.os.freebsd,gluegen.cpptasks.detect.os.hpux,gluegen.cpptasks.detect.os.linux,gluegen.cpptasks.detect.os.osx,gluegen.cpptasks.detect.os.solaris,gluegen.cpptasks.detect.os.unix,gluegen.cpptasks.detect.os.windows" unless="gluegen.cpptasks.detected.os.2"> ++ <echo message="${os.and.arch}" /> + </target> + + <target name="gluegen.cpptasks.detect.os" depends="gluegen.properties.load.user,gluegen.cpptasks.detect.os.1,gluegen.cpptasks.detect.os.2"> Added: trunk/libgluegen2-java/debian/patches/other-archs.diff =================================================================== --- trunk/libgluegen2-java/debian/patches/other-archs.diff (rev 0) +++ trunk/libgluegen2-java/debian/patches/other-archs.diff 2011-03-16 20:33:24 UTC (rev 13434) @@ -0,0 +1,288 @@ +Index: gluegen2-2.0-rc2/make/gluegen-cpptasks-base.xml +=================================================================== +--- gluegen2-2.0-rc2.orig/make/gluegen-cpptasks-base.xml 2011-03-14 20:42:55.000000000 +0100 ++++ gluegen2-2.0-rc2/make/gluegen-cpptasks-base.xml 2011-03-14 21:28:31.000000000 +0100 +@@ -25,6 +25,13 @@ + - isLinuxIA64 + - isLinuxX86 + - isLinuxAlpha ++ - isLinuxArmel ++ - isLinuxHPPA ++ - isLinuxMIPS ++ - isLinuxMIPSEL ++ - isLinuxPPC ++ - isLinuxS390 ++ - isLinuxSparc + - isOSX + - isOSXPPC + - isSolaris +@@ -252,6 +259,69 @@ + <condition property="alpha"> + <os arch="alpha" /> + </condition> ++ <condition property="isLinuxArmel"> ++ <and> ++ <istrue value="${isLinux}" /> ++ <os arch="armel" /> ++ </and> ++ </condition> ++ <condition property="armel"> ++ <os arch="armel" /> ++ </condition> ++ <condition property="isLinuxHPPA"> ++ <and> ++ <istrue value="${isLinux}" /> ++ <os arch="hppa" /> ++ </and> ++ </condition> ++ <condition property="hppa"> ++ <os arch="hppa" /> ++ </condition> ++ <condition property="isLinuxMIPS"> ++ <and> ++ <istrue value="${isLinux}" /> ++ <os arch="mips" /> ++ </and> ++ </condition> ++ <condition property="mips"> ++ <os arch="mips" /> ++ </condition> ++ <condition property="isLinuxMIPSEL"> ++ <and> ++ <istrue value="${isLinux}" /> ++ <os arch="mipsel" /> ++ </and> ++ </condition> ++ <condition property="mipsel"> ++ <os arch="mipsel" /> ++ </condition> ++ <condition property="isLinuxPPC"> ++ <and> ++ <istrue value="${isLinux}" /> ++ <os arch="ppc" /> ++ </and> ++ </condition> ++ <condition property="ppc"> ++ <os arch="ppc" /> ++ </condition> ++ <condition property="isLinuxS390"> ++ <and> ++ <istrue value="${isLinux}" /> ++ <os arch="s390" /> ++ </and> ++ </condition> ++ <condition property="s390"> ++ <os arch="s390" /> ++ </condition> ++ <condition property="isLinuxSparc"> ++ <and> ++ <istrue value="${isLinux}" /> ++ <os arch="sparc" /> ++ </and> ++ </condition> ++ <condition property="sparc"> ++ <os arch="sparc" /> ++ </condition> + <condition property="isSolaris32Bit"> + <and> + <istrue value="${isSolaris}" /> +@@ -322,6 +392,13 @@ + <echo message="LinuxIA64=${isLinuxIA64}" /> + <echo message="LinuxX86=${isLinuxX86}" /> + <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="LinuxSparc=${isLinuxSparc}" /> + <echo message="OS X=${isOSX}" /> + <echo message="OS X PPC=${use.macosppc}" /> + <echo message="OS X x32=${use.macosx32}" /> +@@ -335,6 +412,9 @@ + <echo message="Unix=${isUnix}" /> + <echo message="Windows=${isWindows}" /> + <echo message="X11=${isX11}" /> ++ <echo message="os=${os.name}" /> ++ <echo message="os=${os.version}" /> ++ <echo message="arch=${os.arch}" /> + </target> + + <target name="gluegen.cpptasks.detect.os.freebsd.x86" unless="gluegen.cpptasks.detected.os.2" if="isFreeBSDX86"> +@@ -367,7 +447,35 @@ + <property name="os.and.arch" value="linux-alpha" /> + </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.alpha" unless="gluegen.cpptasks.detected.os.2" /> ++ <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"> ++ <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"> ++ <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"> ++ <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"> ++ <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"> ++ <property name="os.and.arch" value="linux-s390" /> ++ </target> ++ ++ <target name="gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" if="isLinuxSparc"> ++ <property name="os.and.arch" value="linux-sparc" /> ++ </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.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.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX"> + <property name="native.library.suffix" value="*lib" /> +@@ -569,7 +677,6 @@ + <!-- UNIX compiler configuration --> + + <compiler id="compiler.cfg.linux" name="gcc"> +- <compilerarg value="-m32"/> + <defineset> + <define name="__unix__"/> + <define name="_DEBUG" if="c.compiler.use-debug"/> +@@ -751,7 +858,7 @@ + <!-- Unix linker configuration --> + + <linker id="linker.cfg.linux" name="gcc"> +- <linkerarg value="-m32"/> ++<!-- <linkerarg value="-m32"/>--> + </linker> + + <linker id="linker.cfg.linux.amd64" name="gcc"> +@@ -902,8 +1009,8 @@ + + <target name="gluegen.cpptasks.declare.compiler.linux.ia64" if="isLinuxIA64"> + <echo message="Linux.IA64" /> +- <property name="compiler.cfg.id.base" value="compiler.cfg.linux.amd64" /> +- <property name="linker.cfg.id.base" value="linker.cfg.linux" /> ++ <property name="compiler.cfg.id.base" value="compiler.cfg.linux.ia64" /> ++ <property name="linker.cfg.id.base" value="linker.cfg.linux.amd64" /> + <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ia64" /> + </target> + +@@ -914,7 +1021,56 @@ + <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/alpha" /> + </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.alpha" if="isLinux"> ++ <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/armel/" /> ++ </target> ++ ++ <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" /> ++ <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" /> ++ <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" /> ++ <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" /> ++ <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" /> ++ </target> ++ ++ <target name="gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinuxSparc"> ++ <echo message="Linux.Sparc" /> ++ <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/" /> ++ </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.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"> + <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> + </target> + +--- gluegen2-2.0-rc2.orig/make/build.xml 2011-03-16 11:45:57.000000000 +0100 ++++ gluegen2-2.0-rc2/make/build.xml 2011-03-16 21:21:43.000000000 +0100 +@@ -278,7 +278,49 @@ + <property name="linker.cfg.id" value="linker.cfg.linux.amd64" /> + </target> + +- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.alpha" if="isLinux" > ++ <target name="declare.linux.armel" if="isLinuxArmel"> ++ <echo message="Linux.armael" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" /> ++ <property name="linker.cfg.id" value="linker.cfg.linux" /> ++ </target> ++ ++ <target name="declare.linux.hppa" if="isLinuxHPPA"> ++ <echo message="Linux.hppa" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" /> ++ <property name="linker.cfg.id" value="linker.cfg.linux" /> ++ </target> ++ ++ <target name="declare.linux.mips" if="isLinuxMIPS"> ++ <echo message="Linux.mips" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" /> ++ <property name="linker.cfg.id" value="linker.cfg.linux" /> ++ </target> ++ ++ <target name="declare.linux.mipsel" if="isLinuxMIPSEL"> ++ <echo message="Linux.mipsel" /> ++ <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.s390" if="isLinuxS390"> ++ <echo message="Linux.s390" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" /> ++ <property name="linker.cfg.id" value="linker.cfg.linux" /> ++ </target> ++ ++ <target name="declare.linux.sparc" if="isLinuxSparc"> ++ <echo message="Linux.sparc" /> ++ <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,declare.linux.alpha,declare.linux.armel,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.sparc" if="isLinux" > + <property name="c.src.dir.os" value="unix" /> + <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> + </target> Modified: trunk/libgluegen2-java/debian/patches/series =================================================================== --- trunk/libgluegen2-java/debian/patches/series 2011-03-16 13:32:50 UTC (rev 13433) +++ trunk/libgluegen2-java/debian/patches/series 2011-03-16 20:33:24 UTC (rev 13434) @@ -4,3 +4,5 @@ disableArchive7z.diff macosx.diff alpha-ia64.diff +other-archs.diff +moreFeedback.diff _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
