Author: onkarshinde-guest Date: 2008-11-18 18:57:39 +0000 (Tue, 18 Nov 2008) New Revision: 7344
Modified: trunk/omegat/debian/ant.properties trunk/omegat/debian/changelog trunk/omegat/debian/control trunk/omegat/debian/patches/02-edit-wrapper.dpatch trunk/omegat/debian/rules trunk/omegat/debian/watch Log: omegat - port packaging changes from Ubuntu Modified: trunk/omegat/debian/ant.properties =================================================================== --- trunk/omegat/debian/ant.properties 2008-11-18 18:57:24 UTC (rev 7343) +++ trunk/omegat/debian/ant.properties 2008-11-18 18:57:39 UTC (rev 7344) @@ -1,3 +1,5 @@ +ant.build.javac.source=1.4 +ant.build.javac.target=1.4 file.reference.htmlparser.jar=/usr/share/java/libhtmlparser.jar file.reference.vldocking_2.0.6d.jar=/usr/share/java/vldocking.jar javac.classpath=\ Modified: trunk/omegat/debian/changelog =================================================================== --- trunk/omegat/debian/changelog 2008-11-18 18:57:24 UTC (rev 7343) +++ trunk/omegat/debian/changelog 2008-11-18 18:57:39 UTC (rev 7344) @@ -1,3 +1,21 @@ +omegat (1.7.3.u2+dfsg-2) unstable; urgency=low + + * debian/control + - Use openjdk-6-jdk as build dependency. + - Use 'openjdk-6-jre | sun-java5-jre | sun-java6-jre' as runtime + dependency. + * debian/rules + - Set JAVA_HOME corresponding to openjdk-6-jdk. + * debain/ant.properties + - Set default source and target values to 1.4. + * debian/patches + - 02-edit-wrapper.dpatch - Add check for OpenJDK runtime as well. + * debian/watch + - Fix expression to match only release versions. Do not directly use + specific sourceforge mirror. + + -- Onkar Shinde <[EMAIL PROTECTED]> Wed, 19 Nov 2008 00:17:19 +0530 + omegat (1.7.3.u2+dfsg-1) unstable; urgency=low * New upstream release. Modified: trunk/omegat/debian/control =================================================================== --- trunk/omegat/debian/control 2008-11-18 18:57:24 UTC (rev 7343) +++ trunk/omegat/debian/control 2008-11-18 18:57:39 UTC (rev 7344) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]> Uploaders: Tiago Saboga <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5), sun-java5-jdk, dpatch, ant +Build-Depends: debhelper (>= 5), openjdk-6-jdk, dpatch, ant Build-Depends-Indep: docbook-to-man, imagemagick, libvldocking-java, libhtmlparser-java, tofrodos Homepage: http://www.omegat.org/omegat/omegat.html Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/omegat @@ -12,7 +12,7 @@ Package: omegat Architecture: all -Depends: sun-java6-jre | sun-java5-jre | sun-j2sdk1.5 | sun-j2re1.5, libvldocking-java, libhtmlparser-java +Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre, libvldocking-java, libhtmlparser-java Description: Computer Assisted Translation (CAT) tool OmegaT's main features are - ability to run on any operating system supporting Java Modified: trunk/omegat/debian/patches/02-edit-wrapper.dpatch =================================================================== --- trunk/omegat/debian/patches/02-edit-wrapper.dpatch 2008-11-18 18:57:24 UTC (rev 7343) +++ trunk/omegat/debian/patches/02-edit-wrapper.dpatch 2008-11-18 18:57:39 UTC (rev 7344) @@ -7,15 +7,17 @@ ## DP: - look for sun's java vm @DPATCH@ -diff -urNad omegat-1.7.2.dfsg0~/release/OmegaT omegat-1.7.2.dfsg0/release/OmegaT ---- omegat-1.7.2.dfsg0~/release/OmegaT 2007-06-18 15:26:40.000000000 -0300 -+++ omegat-1.7.2.dfsg0/release/OmegaT 2007-11-10 12:36:24.000000000 -0200 -@@ -1,3 +1,12 @@ +diff -urNad omegat-1.7.3.u2+dfsg~/release/OmegaT omegat-1.7.3.u2+dfsg/release/OmegaT +--- omegat-1.7.3.u2+dfsg~/release/OmegaT 2008-03-28 19:49:26.000000000 +0530 ++++ omegat-1.7.3.u2+dfsg/release/OmegaT 2008-11-19 00:13:13.000000000 +0530 +@@ -1,3 +1,14 @@ -#!/bin/bash -java -jar OmegaT.jar $* +#!/bin/sh -+if [ -x /usr/lib/jvm/java-6-sun/bin/java ] ++if [ -x /usr/lib/jvm/java-6-openjdk/bin/java ] ++ then JAVABIN=/usr/lib/jvm/java-6-openjdk/bin/java ++elif [ -x /usr/lib/jvm/java-6-sun/bin/java ] + then JAVABIN=/usr/lib/jvm/java-6-sun/bin/java +elif [ -x /usr/lib/jvm/java-1.5.0-sun/bin/java ] + then JAVABIN=/usr/lib/jvm/java-1.5.0-sun/bin/java Modified: trunk/omegat/debian/rules =================================================================== --- trunk/omegat/debian/rules 2008-11-18 18:57:24 UTC (rev 7343) +++ trunk/omegat/debian/rules 2008-11-18 18:57:39 UTC (rev 7344) @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/dpatch/dpatch.make -JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun +JAVA_HOME=/usr/lib/jvm/java-6-openjdk ANT_OPTIONS=-propertyfile debian/ant.properties configure: configure-stamp Modified: trunk/omegat/debian/watch =================================================================== --- trunk/omegat/debian/watch 2008-11-18 18:57:24 UTC (rev 7343) +++ trunk/omegat/debian/watch 2008-11-18 18:57:39 UTC (rev 7344) @@ -1,6 +1,6 @@ version=3 #http://sf.net/omegat/OmegaT_(.*)_Source\.zip opts=dversionmangle=s/\+dfsg\d*$//,uversionmangle=s/_(\d)+/.u$1/ \ - http://heanet.dl.sourceforge.net/sourceforge/omegat/OmegaT_(.*)_Source.zip \ + http://sf.net/omegat/OmegaT_([\d.]+)_Source\.zip \ debian \ debian/repack-source.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
