tool/pom.xml | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 disable the antlr plugin for the tool module only. the generated source files are already in debian/generated-sources

tool/src/main/java/org/antlr/analysis/DFA.java | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 increase the default conversion timeout to avoid build failures when complex grammars are processed on slow architectures.

tool/src/main/resources/org/antlr/codegen/templates/C/C.stg | 7 6 + 1 - 0 !
1 file changed, 6 insertions(+), 1 deletion(-)

 fix various issues with the c template (backports of patchs proposed upstream)

runtime/Java/src/main/java/org/antlr/runtime/Token.java | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 keep the token.eof_token field to preserve the backward compatibility

tool/src/main/antlr3/org/antlr/grammar/v3/DefineGrammarItemsWalker.g | 9 5 + 4 - 0 !
1 file changed, 5 insertions(+), 4 deletions(-)

 replace the hashsets with linkedhashsets to make the generated parsers reproducible