[pkg-java] r17937 - in trunk/libjogl2-java/debian: . patches

Sylvestre Ledru sylvestre at moszumanska.debian.org
Mon Mar 24 19:02:08 UTC 2014


Author: sylvestre
Date: 2014-03-24 19:02:08 +0000 (Mon, 24 Mar 2014)
New Revision: 17937

Added:
   trunk/libjogl2-java/debian/patches/add-ports.diff
Modified:
   trunk/libjogl2-java/debian/changelog
   trunk/libjogl2-java/debian/control
   trunk/libjogl2-java/debian/patches/series
Log:
* New upstream release
* Cherry-pick of the add-port.diff patch

Modified: trunk/libjogl2-java/debian/changelog
===================================================================
--- trunk/libjogl2-java/debian/changelog	2014-03-24 19:00:59 UTC (rev 17936)
+++ trunk/libjogl2-java/debian/changelog	2014-03-24 19:02:08 UTC (rev 17937)
@@ -1,3 +1,10 @@
+libjogl2-java (2.1.5-1) unstable; urgency=medium
+
+  * New upstream release
+  * Cherry-pick of the add-port.diff patch
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 24 Mar 2014 14:33:05 +0100
+
 libjogl2-java (2.1.4-1) unstable; urgency=medium
 
   * New upstream release

Modified: trunk/libjogl2-java/debian/control
===================================================================
--- trunk/libjogl2-java/debian/control	2014-03-24 19:00:59 UTC (rev 17936)
+++ trunk/libjogl2-java/debian/control	2014-03-24 19:02:08 UTC (rev 17937)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk,
- libgluegen2-build-java (>= 2.1.3), libgluegen2-rt-java (>= 2.1.4),
+ libgluegen2-build-java (>= 2.1.3), libgluegen2-rt-java (>= 2.1.5),
  ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev,
  x11proto-xf86vidmode-dev, libxt-dev,  junit4, libswt-gtk-3-java,
  ant-contrib, ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev,
@@ -17,7 +17,7 @@
 Package: libjogl2-java
 Architecture: all
 Depends: ${misc:Depends},
- libgluegen2-rt-java (>= 2.1.4), libjogl2-jni (>= ${source:Version})
+ libgluegen2-rt-java (>= 2.1.5), libjogl2-jni (>= ${source:Version})
 Suggests: libjogl2-java-doc
 Description: Java bindings for OpenGL API
  The JOGL project hosts the development version of the Java Bindings for

Added: trunk/libjogl2-java/debian/patches/add-ports.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/add-ports.diff	                        (rev 0)
+++ trunk/libjogl2-java/debian/patches/add-ports.diff	2014-03-24 19:02:08 UTC (rev 17937)
@@ -0,0 +1,147 @@
+Index: b/make/build-jogl.xml
+===================================================================
+--- a/make/build-jogl.xml
++++ b/make/build-jogl.xml
+@@ -1329,6 +1329,12 @@
+       <property name="linker.cfg.id.os"                    value="linker.cfg.linux.arm.jogl.x11" />
+     </target>
+     
++    <target name="c.configure.linux.aarch64" if="isLinuxAarch64">
++      <echo message="Linux.aarch64" />
++      <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.ia64" if="isLinuxIA64">
+       <echo message="Linux.IA64" />
+       <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
+@@ -1359,6 +1365,18 @@
+       <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
+     </target>
+ 
++    <target name="c.configure.linux.ppc64" if="isLinuxPpc64">
++      <echo message="Linux.PPC64" />
++      <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.ppc64le" if="isLinuxPpc64le">
++      <echo message="Linux.PPC64le" />
++      <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.s390" if="isLinuxs390">
+       <echo message="Linux.S390" />
+       <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
+@@ -1377,7 +1395,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.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.linux" depends="c.configure.linux.arm,c.configure.linux.aarch64,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.ppc64,c.configure.linux.ppc64le,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: b/make/build-nativewindow.xml
+===================================================================
+--- a/make/build-nativewindow.xml
++++ b/make/build-nativewindow.xml
+@@ -508,6 +508,12 @@
+       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.arm.nativewindow.x11" />
+     </target>
+     
++    <target name="c.configure.linux.aarch64" if="isLinuxAarch64">
++      <echo message="Linux.Aarch64" />
++      <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.ia64" if="isLinuxIA64">
+       <echo message="Linux.IA64" />
+       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
+@@ -538,6 +544,18 @@
+       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
+     </target>
+ 
++    <target name="c.configure.linux.ppc64" if="isLinuxPpc64">
++      <echo message="Linux.PPC64" />
++      <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.ppc64le" if="isLinuxPpc64le">
++      <echo message="Linux.PPC64le" />
++      <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.s390" if="isLinuxs390">
+       <echo message="Linux.S390" />
+       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
+@@ -556,7 +574,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.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.linux" depends="c.configure.linux.arm,c.configure.linux.aarch64,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.ppc64,c.configure.linux.ppc64le,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: b/make/build-newt.xml
+===================================================================
+--- a/make/build-newt.xml
++++ b/make/build-newt.xml
+@@ -453,6 +453,16 @@
+       <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+     </target>
+ 
++    <target name="c.configure.linux.aarch64" if="isLinuxAarch64">
++      <echo message="Linux.aarch64" />
++      <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.hppa" if="isLinuxHppa">
+       <echo message="Linux.hppa" />
+       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
+@@ -493,6 +503,26 @@
+       <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+     </target>
+ 
++    <target name="c.configure.linux.ppc64" if="isLinuxPpc64">
++      <echo message="Linux.ppc64" />
++      <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.ppc64le" if="isLinuxPpc64le">
++      <echo message="Linux.ppc64le" />
++      <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.s390" if="isLinuxs390">
+       <echo message="Linux.S390" />
+       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
+@@ -529,7 +559,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.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.linux" depends="c.configure.linux.arm,c.configure.linux.aarch64,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.ppc64,c.configure.linux.ppc64le,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" />

Modified: trunk/libjogl2-java/debian/patches/series
===================================================================
--- trunk/libjogl2-java/debian/patches/series	2014-03-24 19:00:59 UTC (rev 17936)
+++ trunk/libjogl2-java/debian/patches/series	2014-03-24 19:02:08 UTC (rev 17937)
@@ -15,3 +15,4 @@
 disable-applet.diff
 alpha.diff
 
+add-ports.diff




More information about the pkg-java-commits mailing list