Author: drazzib Date: 2011-06-01 22:48:01 +0000 (Wed, 01 Jun 2011) New Revision: 13737
Added: trunk/libgroboutils-java/debian/patches/06_support_others_jdk.diff trunk/libgroboutils-java/debian/source/ trunk/libgroboutils-java/debian/source/format Modified: trunk/libgroboutils-java/debian/changelog trunk/libgroboutils-java/debian/control trunk/libgroboutils-java/debian/patches/series trunk/libgroboutils-java/debian/rules Log: * Bump Standards-Version to 3.9.2: no changes needed. * Switch to 3.0 (quilt) source format. * debian/patches/06_support_others_jdk.diff: Support for OpenJDK6 (Closes: #628301). Modified: trunk/libgroboutils-java/debian/changelog =================================================================== --- trunk/libgroboutils-java/debian/changelog 2011-06-01 06:23:46 UTC (rev 13736) +++ trunk/libgroboutils-java/debian/changelog 2011-06-01 22:48:01 UTC (rev 13737) @@ -1,3 +1,12 @@ +libgroboutils-java (5-2) unstable; urgency=low + + * Bump Standards-Version to 3.9.2: no changes needed. + * Switch to 3.0 (quilt) source format. + * debian/patches/06_support_others_jdk.diff: Support for OpenJDK6 + (Closes: #628301). + + -- Damien Raude-Morvan <[email protected]> Thu, 02 Jun 2011 00:26:25 +0200 + libgroboutils-java (5-1) unstable; urgency=low * Initial release (Closes: #551812) Modified: trunk/libgroboutils-java/debian/control =================================================================== --- trunk/libgroboutils-java/debian/control 2011-06-01 06:23:46 UTC (rev 13736) +++ trunk/libgroboutils-java/debian/control 2011-06-01 22:48:01 UTC (rev 13737) @@ -2,10 +2,10 @@ Section: java Priority: optional Maintainer: Damien Raude-Morvan <[email protected]> -Build-Depends: libgroboutils-java, ant, cdbs, debhelper (>= 7), default-jdk, quilt +Build-Depends: libgroboutils-java, ant, cdbs, debhelper (>= 7), default-jdk Build-Depends-Indep: ant-optional, junit, liblog4j1.2-java, libeasymock-java, libbcel-java -Standards-Version: 3.8.3 +Standards-Version: 3.9.2 Homepage: http://groboutils.sourceforge.net/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgroboutils-java/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgroboutils-java/ Added: trunk/libgroboutils-java/debian/patches/06_support_others_jdk.diff =================================================================== --- trunk/libgroboutils-java/debian/patches/06_support_others_jdk.diff (rev 0) +++ trunk/libgroboutils-java/debian/patches/06_support_others_jdk.diff 2011-06-01 22:48:01 UTC (rev 13737) @@ -0,0 +1,61 @@ +Description: Support for new JDK >= 1.4 (read from ant.java.version property) +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2011-06-02 +Forwarded: no +--- a/_shared/common-ant/common-ant-tasks-init.ant-inc.xml ++++ b/_shared/common-ant/common-ant-tasks-init.ant-inc.xml +@@ -60,6 +60,9 @@ + <equals arg1="${ant.java.version}" arg2="1.2" /> + <equals arg1="${ant.java.version}" arg2="1.3" /> + <equals arg1="${ant.java.version}" arg2="1.4" /> ++ <equals arg1="${ant.java.version}" arg2="1.5" /> ++ <equals arg1="${ant.java.version}" arg2="1.6" /> ++ <equals arg1="${ant.java.version}" arg2="1.7" /> + </or> + </condition> + <condition property="_shared.common.depend.has-jdk12" > +@@ -67,17 +70,44 @@ + <equals arg1="${ant.java.version}" arg2="1.2" /> + <equals arg1="${ant.java.version}" arg2="1.3" /> + <equals arg1="${ant.java.version}" arg2="1.4" /> ++ <equals arg1="${ant.java.version}" arg2="1.5" /> ++ <equals arg1="${ant.java.version}" arg2="1.6" /> ++ <equals arg1="${ant.java.version}" arg2="1.7" /> + </or> + </condition> + <condition property="_shared.common.depend.has-jdk13" > + <or> + <equals arg1="${ant.java.version}" arg2="1.3" /> + <equals arg1="${ant.java.version}" arg2="1.4" /> ++ <equals arg1="${ant.java.version}" arg2="1.5" /> ++ <equals arg1="${ant.java.version}" arg2="1.6" /> ++ <equals arg1="${ant.java.version}" arg2="1.7" /> + </or> + </condition> + <condition property="_shared.common.depend.has-jdk14" > + <or> + <equals arg1="${ant.java.version}" arg2="1.4" /> ++ <equals arg1="${ant.java.version}" arg2="1.5" /> ++ <equals arg1="${ant.java.version}" arg2="1.6" /> ++ <equals arg1="${ant.java.version}" arg2="1.7" /> ++ </or> ++ </condition> ++ <condition property="_shared.common.depend.has-jdk15" > ++ <or> ++ <equals arg1="${ant.java.version}" arg2="1.5" /> ++ <equals arg1="${ant.java.version}" arg2="1.6" /> ++ <equals arg1="${ant.java.version}" arg2="1.7" /> ++ </or> ++ </condition> ++ <condition property="_shared.common.depend.has-jdk16" > ++ <or> ++ <equals arg1="${ant.java.version}" arg2="1.6" /> ++ <equals arg1="${ant.java.version}" arg2="1.7" /> ++ </or> ++ </condition> ++ <condition property="_shared.common.depend.has-jdk17" > ++ <or> ++ <equals arg1="${ant.java.version}" arg2="1.7" /> + </or> + </condition> + </target> Modified: trunk/libgroboutils-java/debian/patches/series =================================================================== --- trunk/libgroboutils-java/debian/patches/series 2011-06-01 06:23:46 UTC (rev 13736) +++ trunk/libgroboutils-java/debian/patches/series 2011-06-01 22:48:01 UTC (rev 13737) @@ -3,3 +3,4 @@ 03_easymock_upgrade.diff 04_coverage_zip_archives.diff 05_rename_subprojects.diff +06_support_others_jdk.diff Modified: trunk/libgroboutils-java/debian/rules =================================================================== --- trunk/libgroboutils-java/debian/rules 2011-06-01 06:23:46 UTC (rev 13736) +++ trunk/libgroboutils-java/debian/rules 2011-06-01 22:48:01 UTC (rev 13737) @@ -2,7 +2,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk JAVA_HOME := /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant Added: trunk/libgroboutils-java/debian/source/format =================================================================== --- trunk/libgroboutils-java/debian/source/format (rev 0) +++ trunk/libgroboutils-java/debian/source/format 2011-06-01 22:48:01 UTC (rev 13737) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
