Bas Couwenberg pushed to branch master at Debian GIS Project / josm
Commits: 435ebcdd by Bas Couwenberg at 2022-05-17T13:59:33+02:00 Use JavaCC 5 to fix FTBFS with JavaCC 6. (closes: #1011131) - - - - - 50ecdc10 by Bas Couwenberg at 2022-05-17T13:59:33+02:00 Set distribution to unstable. - - - - - 3 changed files: - debian/changelog - debian/control - debian/patches/00-build.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +josm (0.0.svn18427+dfsg-2) unstable; urgency=medium + + * Use JavaCC 5 to fix FTBFS with JavaCC 6. + (closes: #1011131) + + -- Bas Couwenberg <[email protected]> Tue, 17 May 2022 13:51:23 +0200 + josm (0.0.svn18427+dfsg-1) unstable; urgency=medium * New tested snapshot. ===================================== debian/control ===================================== @@ -10,7 +10,7 @@ Build-Depends: debhelper-compat (= 12), ant, ant-contrib, gettext, - javacc, + javacc5, jmapviewer (>= 2.16), libcommons-compress-java, libgettext-ant-tasks-java, ===================================== debian/patches/00-build.patch ===================================== @@ -120,7 +120,7 @@ Forwarded: not-needed - <java classname="javacc" fork="true" dir="${mapcss.dir}" failonerror="true"> - <classpath path="${tools.dir}/javacc"/> - <classpath refid="javacc.classpath"/> -+ <exec append="false" executable="javacc" failifexecutionfails="true"> ++ <exec append="false" executable="javacc5" failifexecutionfails="true"> <arg value="-DEBUG_PARSER=false"/> <arg value="-DEBUG_TOKEN_MANAGER=false"/> <arg value="-JDK_VERSION=1.${java.lang.version}"/> @@ -133,7 +133,7 @@ Forwarded: not-needed + </target> + <target name="javacc-openinghoursparser" depends="init" unless="javacc.notRequired"> + <mkdir dir="${src.dir}/ch/poole/openinghoursparser/parsergen"/> -+ <exec append="false" executable="javacc" failifexecutionfails="true"> ++ <exec append="false" executable="javacc5" failifexecutionfails="true"> + <arg value="-DEBUG_PARSER=false"/> + <arg value="-DEBUG_TOKEN_MANAGER=false"/> + <arg value="-JDK_VERSION=1.${java.lang.version}"/> View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/compare/795c1585c636dd1f89a4c5b0573bcc31f45a2da2...50ecdc103f88718d99d40cb1b587405e4fdd9737 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/compare/795c1585c636dd1f89a4c5b0573bcc31f45a2da2...50ecdc103f88718d99d40cb1b587405e4fdd9737 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
