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

[Sylvestre Ledru]

Author: sylvestre
Date: 2011-04-19 07:48:47 +0000 (Tue, 19 Apr 2011)
New Revision: 13556

Added:
   trunk/libjogl2-java/debian/README.source
   trunk/libjogl2-java/debian/patches/swt.diff
Modified:
   trunk/libjogl2-java/debian/changelog
   trunk/libjogl2-java/debian/control
   trunk/libjogl2-java/debian/patches/series
   trunk/libjogl2-java/debian/rules
Log:
swt-debug.jar removed from the archive. Update the dep list.

Added: trunk/libjogl2-java/debian/README.source
===================================================================
--- trunk/libjogl2-java/debian/README.source	                        (rev 0)
+++ trunk/libjogl2-java/debian/README.source	2011-04-19 07:48:47 UTC (rev 13556)
@@ -0,0 +1,3 @@
+rm $(find . -iname '*.lib') doc/deployment/lstjars/*.log make/lib/swt/*/swt-debug.jar
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 19 Apr 2011 09:19:54 +0200

Modified: trunk/libjogl2-java/debian/changelog
===================================================================
--- trunk/libjogl2-java/debian/changelog	2011-04-19 04:47:03 UTC (rev 13555)
+++ trunk/libjogl2-java/debian/changelog	2011-04-19 07:48:47 UTC (rev 13556)
@@ -3,6 +3,7 @@
   * New upstream release
   * Standards-Version updated to version 3.9.2
   * needless-dependency-on-jre removed
+  * swt-debug.jar removed from the archive. Update the dep list.
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 17 Apr 2011 14:41:20 +0200
 

Modified: trunk/libjogl2-java/debian/control
===================================================================
--- trunk/libjogl2-java/debian/control	2011-04-19 04:47:03 UTC (rev 13555)
+++ trunk/libjogl2-java/debian/control	2011-04-19 07:48:47 UTC (rev 13556)
@@ -7,7 +7,7 @@
  ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev, 
  x11proto-xf86vidmode-dev, libxt-dev, libgluegen2-build-java, ant-contrib,
  ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev, libgluegen2-rt-java,
- junit4
+ junit4, libswt-gtk-3.5-java
 Standards-Version: 3.9.2
 Homepage: http://jogamp.org/
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjogl2-java

Modified: trunk/libjogl2-java/debian/patches/series
===================================================================
--- trunk/libjogl2-java/debian/patches/series	2011-04-19 04:47:03 UTC (rev 13555)
+++ trunk/libjogl2-java/debian/patches/series	2011-04-19 07:48:47 UTC (rev 13556)
@@ -1,2 +1,3 @@
 variousFixes.diff
 disableOneDir.diff
+swt.diff

Added: trunk/libjogl2-java/debian/patches/swt.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/swt.diff	                        (rev 0)
+++ trunk/libjogl2-java/debian/patches/swt.diff	2011-04-19 07:48:47 UTC (rev 13556)
@@ -0,0 +1,18 @@
+Index: jogl-v2.0-rc2/make/build-common.xml
+===================================================================
+--- jogl-v2.0-rc2.orig/make/build-common.xml	2011-04-19 09:40:43.000000000 +0200
++++ jogl-v2.0-rc2/make/build-common.xml	2011-04-19 09:42:06.000000000 +0200
+@@ -99,11 +99,8 @@
+         <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar">
+           <istrue value="${isWindowsX86}" />
+         </condition>
+-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt-debug.jar">
+-          <istrue value="${isLinuxAMD64}" />
+-        </condition>
+-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
+-          <istrue value="${isLinuxX86}" />
++        <condition property="swt.jar" value="/usr/share/java/swt.jar">
++          <istrue value="${isLinux}" />
+         </condition>
+         <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar">
+           <and>

Modified: trunk/libjogl2-java/debian/rules
===================================================================
--- trunk/libjogl2-java/debian/rules	2011-04-19 04:47:03 UTC (rev 13555)
+++ trunk/libjogl2-java/debian/rules	2011-04-19 07:48:47 UTC (rev 13556)
@@ -5,7 +5,7 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 JAVA_HOME            := /usr/lib/jvm/default-java/
-DEB_JARS             := ant-contrib ant-contrib-cpptasks ant-nodeps antlr ant-antlr
+DEB_JARS             := ant-contrib ant-contrib-cpptasks ant-nodeps antlr ant-antlr swt
 DEB_ANT_ARGS         := -Dsetup.noCDC=true
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := all