Author: osallou Date: 2012-08-07 13:22:35 +0000 (Tue, 07 Aug 2012) New Revision: 12008
Modified: trunk/packages/logol/trunk/debian/changelog trunk/packages/logol/trunk/debian/control trunk/packages/logol/trunk/debian/rules Log: Force java compilation to 1.5 support, transitional support for Ubuntu Modified: trunk/packages/logol/trunk/debian/changelog =================================================================== --- trunk/packages/logol/trunk/debian/changelog 2012-08-07 13:18:41 UTC (rev 12007) +++ trunk/packages/logol/trunk/debian/changelog 2012-08-07 13:22:35 UTC (rev 12008) @@ -1,3 +1,15 @@ +logol (1.5.0-5) unstable; urgency=low + + [ Olivier Sallou] + * Transition package to use default java implementation: + From [email protected] (Closes: #684158) + - 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. + + -- Olivier Sallou <[email protected]> Tue, 07 Aug 2012 15:18:43 +0200 + logol (1.5.0-4) unstable; urgency=low * debian/postinst: remove directory permissions (Closes: #683647). Modified: trunk/packages/logol/trunk/debian/control =================================================================== --- trunk/packages/logol/trunk/debian/control 2012-08-07 13:18:41 UTC (rev 12007) +++ trunk/packages/logol/trunk/debian/control 2012-08-07 13:22:35 UTC (rev 12008) @@ -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 Modified: trunk/packages/logol/trunk/debian/rules =================================================================== --- trunk/packages/logol/trunk/debian/rules 2012-08-07 13:18:41 UTC (rev 12007) +++ trunk/packages/logol/trunk/debian/rules 2012-08-07 13:22:35 UTC (rev 12008) @@ -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 _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
