[med-svn] r11953 - trunk/packages/biomaj/trunk/debian

[olivier sallou]

Author: osallou-guest
Date: 2012-08-01 13:31:44 +0000 (Wed, 01 Aug 2012)
New Revision: 11953

Modified:
   trunk/packages/biomaj/trunk/debian/changelog
   trunk/packages/biomaj/trunk/debian/control
   trunk/packages/biomaj/trunk/debian/rules
Log:
Apply Ubuntu patch to use default java runtime

Modified: trunk/packages/biomaj/trunk/debian/changelog
===================================================================
--- trunk/packages/biomaj/trunk/debian/changelog	2012-08-01 09:20:14 UTC (rev 11952)
+++ trunk/packages/biomaj/trunk/debian/changelog	2012-08-01 13:31:44 UTC (rev 11953)
@@ -1,3 +1,15 @@
+biomaj (1.2.0-7) unstable; urgency=low
+
+   [ Olivier Sallou ]
+   Patch from James Page <james.page at ubuntu.com> (Closes: #683517)
+   * Transition package to use default java implementation:
+    - d/rules: Specify source/target = 1.5 to ensure bytecode is backwards
+      compatible.
+    - d/control: BD on default-jdk only. Switch runtime dependency to
+      default-jre | java6-runtime. 
+
+ -- Olivier Sallou <osallou at debian.org>  Wed, 01 Aug 2012 14:58:41 +0200
+
 biomaj (1.2.0-6) unstable; urgency=low
 
   [ Olivier Sallou ]

Modified: trunk/packages/biomaj/trunk/debian/control
===================================================================
--- trunk/packages/biomaj/trunk/debian/control	2012-08-01 09:20:14 UTC (rev 11952)
+++ trunk/packages/biomaj/trunk/debian/control	2012-08-01 13:31:44 UTC (rev 11953)
@@ -8,7 +8,7 @@
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/biomaj/trunk/
 Homepage: http://biomaj.genouest.org
 Build-Depends: debhelper (>= 7.1)
-Build-Depends-Indep: debconf, po-debconf, openjdk-6-jdk|default-jdk|sun-java6-jdk, ant, libhsqldb-java, ant-contrib,
+Build-Depends-Indep: debconf, po-debconf, default-jdk, ant, libhsqldb-java, ant-contrib,
  liblog4j1.2-java, libcommons-net2-java, libcommons-dbcp-java, libgnumail-java, libcommons-pool-java,
  libgnujaf-java, libjgoodies-forms-java, liboro-java, libregexp-java, 
  libjcommon-java, libjsch-java, libjdom1-java, junit4, libsaxonb-java, libjdepend-java,
@@ -19,7 +19,7 @@
 Package: biomaj
 Architecture: all
 Depends: ${misc:Depends}, ${java:Depends},
- openjdk-6-jdk|default-jdk|sun-java6-jdk, ant, libmysql-java, debconf, 
+ default-jre | java6-runtime, ant, libmysql-java, debconf, 
  libhsqldb-java,ant-contrib,liblog4j1.2-java,libcommons-net2-java (>= 2.2),libcommons-dbcp-java (>= 1.2),
  libgnumail-java, libcommons-pool-java (>= 1.5), libgnujaf-java, libjgoodies-forms-java (>= 1.2),
  liboro-java (>= 2.0),libregexp-java (>= 1.4),libjcommon-java (>= 1.0),libjsch-java (>= 0.1.42),

Modified: trunk/packages/biomaj/trunk/debian/rules
===================================================================
--- trunk/packages/biomaj/trunk/debian/rules	2012-08-01 09:20:14 UTC (rev 11952)
+++ trunk/packages/biomaj/trunk/debian/rules	2012-08-01 13:31:44 UTC (rev 11953)
@@ -10,14 +10,15 @@
 export DH_OPTIONS
 
 export ANT_HOME=/usr/share/ant
-JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::")
+export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::")
 
 %:
 	dh $@ --with javahelper
 
 override_dh_auto_build:
-	ant -f usr/share/biomaj/build.xml
-	javac -d usr/share/biomaj/bin usr/share/biomaj/bin/Configurator.java
+	echo ${JAVA_HOME}
+	ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -f usr/share/biomaj/build.xml
+	javac -source 1.5 -target 1.5 -d usr/share/biomaj/bin usr/share/biomaj/bin/Configurator.java
 
 override_dh_clean:
 	dh_clean