Package: biomaj
Version: 1.2.0-6
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu quantal ubuntu-patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* 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.
These changes will ease transition when the default java implementation
changes (as it has done in Ubuntu quantal).
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5.0-7-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQGRyIAAoJEL/srsug59jDcUkP/RXTz1BJcauxNvnMeLGzDKxj
YvJ6NSjg5q6fngfjXvV7WbDpEZmB7uSeMcd+LGfM3RM2N03FPYdPm0RsLdkVIM34
mfx3mSRVj1tLO/TdbWwOokRrv5upEliuVPy6PHVr6sIUJXehgYe14xj5tY5ZOJ4A
f1s6nDceQPHIcrmkTvSx8MqiaUR96WnOyZowJgn6bF5YX1IObZ95zeg/Qs0RHkxc
KEUvcFGyiizKP6TeqhMpXzQjwGIIA4G6kLeZTbsr7T89LomElZ0p6VT8H5W5uh48
+qxg8znA4NizIzrLcQo/vSlXJXhY/Vvf1hevI3Dn/FWefzQE1E3SubAeq/PSW/Zn
eDAfOc8/GWAFkMWWP+RqPtV+O/bwxY3okyasbIGBCwSPfTDx+LntdRz8b8vN/O+e
soIZ8xYLhxZY+zk4U0TCR7u/Yuzg6eTm3RQe6gbnOX4GqFJjODFhY3mygCXhFdRN
eavyiwuCTyUdc5Bkr2eZF0Xr7qZ4F7CZHPQ5Oh/Z2zQebgGuCXSop0pZPHZUzfcX
ntzJumWx2boU5luY0eKliXbUx3kj1M1xNJne2ZdwHqRh6rzGSdpdjEJwe1o5QSd+
Q2cE7umu5/tT9NMy8cLluqFVTOMipJr7JWcxPYvTn0fVGCrFapo+6eT85o55U2ro
TcE4NGDgyu4fKkNgfgaa
=5+NN
-----END PGP SIGNATURE-----
diff -Nru biomaj-1.2.0/debian/changelog biomaj-1.2.0/debian/changelog
diff -Nru biomaj-1.2.0/debian/control biomaj-1.2.0/debian/control
--- biomaj-1.2.0/debian/control 2012-06-22 08:54:37.000000000 +0100
+++ biomaj-1.2.0/debian/control 2012-08-01 13:08:22.000000000 +0100
@@ -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),
diff -Nru biomaj-1.2.0/debian/rules biomaj-1.2.0/debian/rules
--- biomaj-1.2.0/debian/rules 2012-03-02 15:23:10.000000000 +0000
+++ biomaj-1.2.0/debian/rules 2012-08-01 13:03:00.000000000 +0100
@@ -16,8 +16,8 @@
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
+ 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
