Package: logol
Version: 1.5.0-2
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-----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/control: BD on default-jdk (>= 1:1.6), switch runtime dependency
to default-jre | java6-runtime.
- d/rules: Specify source/target = 1.5 to ensure backwards compatible
bytecode is built.
Ubuntu quantal is transitioning default java from openjdk-6 to openjdk-7; this
patch eases this transtion (and future java transitions). It also ensures that
the bytecode produced by the package is backwards compatible. Note that this
transition is not a release goal for wheezy.
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-8-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)
iQIcBAEBCAAGBQJQIRNtAAoJEL/srsug59jDlEgP/0wBBWeP4ChlVdDpM9sfPYlK
x2LNZ5nyAcnJXVw53IvxjuexpKneEVXNluO7vHFYP7eqpTgcpy/+tbP5utUxUv9n
WR63oYi6BrRgJpXzoy/+a8837cf/487Nq8xxIOlXxDtkORd13WzbxIiBPHXVc9QW
OneB5k/myWUiarjZBYb1z3pchg7LKAnJCcQrAwB5gT1sQGORqmioNJRvuZ+ACrsW
B9IBIGnSCKsYgOykvyy7l1UCNuW1Suk1/9xrLYXYEykQqoPYdKpTMth3Ybxdgi7y
2aqr6EjpazxE4dCh+ZkPTvT8/ndi3h34rRa3VREnFg4sdKQK8j8AS7BThtkDpwhK
vrEAxNYgEx4wKY38wViePMFbkx+kwHTKnmbeUD0OEHCpTkLuhCtNbVbDR0fwcbjs
BMb1/4hR+WM+zpljFc+h7rGH81pwoomxTNU83oAMfn4sVXmRIDyRGlAGg3FM6RTq
O551+R5nyjBSK1arFwAEZ0Ju2Mq1IHBBYEWmC4IFO0+K+q91eqOrKC0g9P4yCkdn
3YSXjU/IY3EbPqQczZ6wiHE1XYgHj/N2eQHAXiKJCKmeqB8RD4JAw11RYbyJtrqE
U7B2kAotmxLeFua+JQ5fbLaIR+K8iPNMH27V/C9DZPByBK+O3rGLNellJrQ6T3L9
nVp5ToGx7f3IQdPO/25i
=ZpH6
-----END PGP SIGNATURE-----
diff -Nru logol-1.5.0/debian/changelog logol-1.5.0/debian/changelog
diff -Nru logol-1.5.0/debian/control logol-1.5.0/debian/control
--- logol-1.5.0/debian/control 2012-07-01 21:53:13.000000000 +0100
+++ logol-1.5.0/debian/control 2012-08-07 14:07:05.000000000 +0100
@@ -6,7 +6,7 @@
DM-Upload-Allowed: yes
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/logol/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/logol/trunk/
-Build-Depends: debhelper (>= 8.0.0),openjdk-6-jdk|default-jdk|sun-java6-jdk,ant,ruby (>=1.8),rubygems, gawk, swi-prolog,
+Build-Depends: debhelper (>= 8.0.0), default-jdk (>= 1:1.6),ant,ruby (>=1.8),rubygems, gawk, swi-prolog,
libbiojava-java, libdrmaa-java, antlr3, libcommons-cli-java, libcommons-collections3-java, libcommons-configuration-java,
libcommons-lang-java, libcommons-logging-java, libxalan2-java, libxerces2-java, junit4, libgnumail-java,
liblog4j1.2-java,texlive, tex4ht, libncursesw5-dev, ruby-cassiopee, ant-optional
@@ -15,7 +15,7 @@
Package: logol
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre|default-jre|sun-java6-jre, ruby (>=1.8),rubygems, gawk,
+Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java6-runtime , ruby (>=1.8),rubygems, gawk,
libbiojava-java, libdrmaa-java, antlr3, libcommons-cli-java, libcommons-collections3-java, libcommons-configuration-java,
libcommons-lang-java, libcommons-logging-java, libxalan2-java, libxerces2-java, libgnumail-java, liblog4j1.2-java,
ruby-cassiopee, logol-bin
diff -Nru logol-1.5.0/debian/rules logol-1.5.0/debian/rules
--- logol-1.5.0/debian/rules 2012-07-01 22:47:53.000000000 +0100
+++ logol-1.5.0/debian/rules 2012-08-07 13:59:41.000000000 +0100
@@ -5,10 +5,14 @@
#export DH_VERBOSE=1
DEB_ANT_BUILD_TARGET=create-jar,test_swi
+DEB_ANT_ARGS=-Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
%:
dh $@
+override_dh_auto_build:
+ dh_auto_build -- $(DEB_ANT_ARGS)
+
override_dh_install:
dh_install
rm -f debian/logol/usr/share/logol/prolog/*.c
