This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ecj.

commit 808915c299e3b482be9f907b8fb7db344dbc04e5
Merge: 391ef42 20b7f18
Author: Matthias Klose <d...@debian.org>
Date:   Sat Jul 5 15:55:57 2014 +0200

    Import Debian changes 3.10.0+3.9.0-1
    
    ecj (3.10.0+3.9.0-1) unstable; urgency=high
    
      * Revert back to 3.9.0, as long as #753315 is not fixed.

 .pc/.quilt_patches                                 |    1 +
 .pc/.quilt_series                                  |    1 +
 .pc/.version                                       |    1 +
 debian/changelog                                   |   30 +-
 debian/compat                                      |    2 +-
 debian/control                                     |    6 +-
 debian/ecj.1                                       |    6 +-
 debian/ecj.postinst                                |    4 +-
 debian/ecj.prerm                                   |    4 +-
 debian/patches/gcc-changes.diff                    |   12 +-
 debian/patches/remove-overrides.diff               |   55 -
 debian/patches/series                              |    1 -
 debian/poms/ecj.pom                                |    2 +-
 debian/rules                                       |   86 +-
 debian/stamp-patched                               |    0
 debian/watch                                       |    9 -
 src/org.eclipse.jdt.core/build.xml                 |   21 +-
 .../org/eclipse/jdt/core/JDTCompilerAdapter.java   |   15 +-
 .../org/eclipse/jdt/core/compiler/IProblem.java    |  286 +-
 .../eclipse/jdt/internal/compiler/ASTVisitor.java  |   84 +-
 .../eclipse/jdt/internal/compiler/ClassFile.java   | 1291 +--------
 .../jdt/internal/compiler/CompilationResult.java   |    4 +-
 .../eclipse/jdt/internal/compiler/Compiler.java    |   25 +-
 .../compiler/DefaultErrorHandlingPolicies.java     |   31 +-
 .../internal/compiler/IErrorHandlingPolicy.java    |    6 +-
 .../eclipse/jdt/internal/compiler/ReadManager.java |    5 +-
 .../internal/compiler/ast/AND_AND_Expression.java  |    3 +-
 .../eclipse/jdt/internal/compiler/ast/ASTNode.java |  482 +---
 .../compiler/ast/AbstractMethodDeclaration.java    |  186 +-
 .../compiler/ast/AbstractVariableDeclaration.java  |   16 +-
 .../compiler/ast/AllocationExpression.java         |  354 +--
 .../jdt/internal/compiler/ast/Annotation.java      |  809 +-----
 .../compiler/ast/AnnotationMethodDeclaration.java  |    7 +-
 .../jdt/internal/compiler/ast/Argument.java        |   63 +-
 .../compiler/ast/ArrayAllocationExpression.java    |   65 +-
 .../internal/compiler/ast/ArrayInitializer.java    |   29 +-
 .../compiler/ast/ArrayQualifiedTypeReference.java  |   97 +-
 .../jdt/internal/compiler/ast/ArrayReference.java  |   24 +-
 .../internal/compiler/ast/ArrayTypeReference.java  |   98 +-
 .../jdt/internal/compiler/ast/Assignment.java      |   25 +-
 .../internal/compiler/ast/BinaryExpression.java    |    8 +-
 .../eclipse/jdt/internal/compiler/ast/Block.java   |    5 -
 .../jdt/internal/compiler/ast/CastExpression.java  |  101 +-
 .../compiler/ast/CompilationUnitDeclaration.java   |   37 +-
 .../internal/compiler/ast/CompoundAssignment.java  |    8 +-
 .../compiler/ast/ConditionalExpression.java        |  321 +--
 .../compiler/ast/ConstructorDeclaration.java       |   31 +-
 .../internal/compiler/ast/ContainerAnnotation.java |   88 -
 .../jdt/internal/compiler/ast/EqualExpression.java |   16 +-
 .../compiler/ast/ExplicitConstructorCall.java      |  101 +-
 .../jdt/internal/compiler/ast/Expression.java      |  169 +-
 .../internal/compiler/ast/ExpressionContext.java   |   73 -
 .../compiler/ast/FakedTrackingVariable.java        |  113 +-
 .../internal/compiler/ast/FieldDeclaration.java    |   47 +-
 .../jdt/internal/compiler/ast/FieldReference.java  |   30 +-
 .../internal/compiler/ast/ForeachStatement.java    |   14 +-
 .../compiler/ast/FunctionalExpression.java         |  358 ---
 .../jdt/internal/compiler/ast/Initializer.java     |    8 +-
 .../compiler/ast/InnerInferenceHelper.java         |   42 -
 .../compiler/ast/InstanceOfExpression.java         |   14 +-
 .../ast/IntersectionCastTypeReference.java         |  201 --
 .../jdt/internal/compiler/ast/Invocation.java      |   89 -
 .../eclipse/jdt/internal/compiler/ast/Javadoc.java |   34 +-
 .../compiler/ast/JavadocAllocationExpression.java  |    4 +-
 .../compiler/ast/JavadocImplicitTypeReference.java |   12 +-
 .../internal/compiler/ast/JavadocMessageSend.java  |    2 +-
 .../ast/JavadocQualifiedTypeReference.java         |    8 +-
 .../compiler/ast/JavadocSingleTypeReference.java   |    6 +-
 .../internal/compiler/ast/LambdaExpression.java    | 1275 ---------
 .../internal/compiler/ast/LocalDeclaration.java    |   69 +-
 .../internal/compiler/ast/MarkerAnnotation.java    |   10 +-
 .../jdt/internal/compiler/ast/MemberValuePair.java |   63 +-
 .../jdt/internal/compiler/ast/MessageSend.java     |  336 +--
 .../internal/compiler/ast/MethodDeclaration.java   |   51 +-
 .../jdt/internal/compiler/ast/NameReference.java   |   24 -
 .../internal/compiler/ast/NormalAnnotation.java    |   15 +-
 .../compiler/ast/NullAnnotationMatching.java       |  462 ----
 .../internal/compiler/ast/OR_OR_Expression.java    |    3 +-
 .../internal/compiler/ast/OperatorExpression.java  |    8 +-
 .../ast/ParameterizedQualifiedTypeReference.java   |  130 +-
 .../ast/ParameterizedSingleTypeReference.java      |  145 +-
 .../ast/QualifiedAllocationExpression.java         |   49 +-
 .../compiler/ast/QualifiedNameReference.java       |   65 +-
 .../compiler/ast/QualifiedSuperReference.java      |   47 +-
 .../compiler/ast/QualifiedThisReference.java       |   45 +-
 .../compiler/ast/QualifiedTypeReference.java       |   79 +-
 .../jdt/internal/compiler/ast/Receiver.java        |   40 -
 .../jdt/internal/compiler/ast/Reference.java       |   17 +-
 .../internal/compiler/ast/ReferenceExpression.java |  851 ------
 .../jdt/internal/compiler/ast/ReturnStatement.java |  102 +-
 .../compiler/ast/SingleMemberAnnotation.java       |   20 +-
 .../internal/compiler/ast/SingleNameReference.java |   67 +-
 .../internal/compiler/ast/SingleTypeReference.java |   52 +-
 .../jdt/internal/compiler/ast/Statement.java       |  189 +-
 .../jdt/internal/compiler/ast/SuperReference.java  |   11 +-
 .../jdt/internal/compiler/ast/SwitchStatement.java |    6 +-
 .../jdt/internal/compiler/ast/ThisReference.java   |   31 +-
 .../jdt/internal/compiler/ast/ThrowStatement.java  |    4 +-
 .../jdt/internal/compiler/ast/TryStatement.java    |   12 +-
 .../jdt/internal/compiler/ast/TypeDeclaration.java |   54 +-
 .../jdt/internal/compiler/ast/TypeParameter.java   |   78 +-
 .../jdt/internal/compiler/ast/TypeReference.java   |  496 +---
 .../internal/compiler/ast/UnionTypeReference.java  |   21 +-
 .../jdt/internal/compiler/ast/Wildcard.java        |   58 +-
 .../compiler/batch/ClasspathDirectory.java         |    3 +-
 .../jdt/internal/compiler/batch/ClasspathJar.java  |    3 +-
 .../jdt/internal/compiler/batch/FileFinder.java    |    3 +-
 .../jdt/internal/compiler/batch/FileSystem.java    |    3 +-
 .../eclipse/jdt/internal/compiler/batch/Main.java  |   72 +-
 .../internal/compiler/batch/messages.properties    |   15 +-
 .../compiler/classfmt/ClassFileConstants.java      |   36 +-
 .../compiler/classfmt/ClassFileReader.java         |   40 +-
 .../jdt/internal/compiler/classfmt/FieldInfo.java  |  128 +-
 .../compiler/classfmt/FieldInfoWithAnnotation.java |   11 +-
 .../classfmt/FieldInfoWithTypeAnnotation.java      |   50 -
 .../jdt/internal/compiler/classfmt/MethodInfo.java |   76 +-
 .../MethodInfoWithParameterAnnotations.java        |    2 +-
 .../classfmt/MethodInfoWithTypeAnnotations.java    |   47 -
 .../NonNullDefaultAwareTypeAnnotationWalker.java   |  151 --
 .../compiler/classfmt/TypeAnnotationInfo.java      |  238 --
 .../compiler/classfmt/TypeAnnotationWalker.java    |  320 ---
 .../compiler/codegen/AnnotationContext.java        |   56 -
 .../codegen/AnnotationTargetTypeConstants.java     |   52 -
 .../compiler/codegen/AttributeNamesConstants.java  |   13 +-
 .../jdt/internal/compiler/codegen/CodeStream.java  |  490 +---
 .../internal/compiler/codegen/ConstantPool.java    |  102 +-
 .../internal/compiler/codegen/ExceptionLabel.java  |   15 +-
 .../compiler/codegen/MultiCatchExceptionLabel.java |   12 +-
 .../jdt/internal/compiler/codegen/Opcodes.java     |    6 +-
 .../internal/compiler/codegen/StackMapFrame.java   |    2 +-
 .../compiler/codegen/StackMapFrameCodeStream.java  |    3 +-
 .../compiler/codegen/TypeAnnotationCodeStream.java |  152 --
 .../jdt/internal/compiler/env/IBinaryField.java    |    9 +-
 .../jdt/internal/compiler/env/IBinaryMethod.java   |    9 +-
 .../jdt/internal/compiler/env/IBinaryType.java     |   11 +-
 .../compiler/env/IBinaryTypeAnnotation.java        |   74 -
 .../jdt/internal/compiler/env/ISourceType.java     |    5 -
 .../flow/ExceptionHandlingFlowContext.java         |    5 +-
 .../internal/compiler/flow/FinallyFlowContext.java |   14 +-
 .../jdt/internal/compiler/flow/FlowContext.java    |    8 +-
 .../jdt/internal/compiler/flow/FlowInfo.java       |   25 +-
 .../internal/compiler/flow/LoopingFlowContext.java |   18 +-
 .../compiler/flow/UnconditionalFlowInfo.java       |   16 -
 .../internal/compiler/impl/CompilerOptions.java    |   72 +-
 .../jdt/internal/compiler/impl/CompilerStats.java  |    3 +-
 .../internal/compiler/impl/ReferenceContext.java   |    6 +-
 .../compiler/lookup/AnnotatableTypeSystem.java     |  416 ---
 .../compiler/lookup/AnnotationBinding.java         |   84 +-
 .../internal/compiler/lookup/AnnotationHolder.java |    3 +-
 .../jdt/internal/compiler/lookup/ArrayBinding.java |  208 +-
 .../internal/compiler/lookup/BaseTypeBinding.java  |   47 +-
 .../compiler/lookup/BinaryTypeBinding.java         |  624 +----
 .../jdt/internal/compiler/lookup/Binding.java      |   77 +-
 .../jdt/internal/compiler/lookup/BlockScope.java   |  163 +-
 .../jdt/internal/compiler/lookup/BoundSet.java     |  987 -------
 .../internal/compiler/lookup/CaptureBinding.java   |  149 +-
 .../internal/compiler/lookup/CaptureBinding18.java |  335 ---
 .../compiler/lookup/CatchParameterBinding.java     |    9 +-
 .../jdt/internal/compiler/lookup/ClassScope.java   |  129 +-
 .../compiler/lookup/CompilationUnitScope.java      |   87 +-
 .../lookup/ConstraintExceptionFormula.java         |  160 --
 .../lookup/ConstraintExpressionFormula.java        |  485 ----
 .../compiler/lookup/ConstraintFormula.java         |   83 -
 .../compiler/lookup/ConstraintTypeFormula.java     |  396 ---
 .../internal/compiler/lookup/ElementValuePair.java |   38 +-
 .../compiler/lookup/ExtraCompilerModifiers.java    |   16 +-
 .../jdt/internal/compiler/lookup/FieldBinding.java |   25 +-
 .../lookup/ImplicitNullAnnotationVerifier.java     |  184 +-
 .../internal/compiler/lookup/InferenceContext.java |    2 +-
 .../compiler/lookup/InferenceContext18.java        | 1694 ------------
 .../compiler/lookup/InferenceFailureException.java |   26 -
 .../compiler/lookup/InferenceSubstitution.java     |   97 -
 .../compiler/lookup/InferenceVariable.java         |  121 -
 .../lookup/IntersectionCastTypeBinding.java        |  278 --
 .../internal/compiler/lookup/InvocationSite.java   |   13 +-
 .../internal/compiler/lookup/LocalTypeBinding.java |   93 +-
 .../compiler/lookup/LocalVariableBinding.java      |   30 +-
 .../compiler/lookup/LookupEnvironment.java         |  552 ++--
 .../compiler/lookup/MemberTypeBinding.java         |   32 +-
 .../internal/compiler/lookup/MethodBinding.java    |  175 +-
 .../jdt/internal/compiler/lookup/MethodScope.java  |  122 +-
 .../internal/compiler/lookup/MethodVerifier.java   |  234 +-
 .../internal/compiler/lookup/MethodVerifier15.java |  354 +--
 .../compiler/lookup/MissingTypeBinding.java        |   11 +-
 .../lookup/MostSpecificExceptionMethodBinding.java |    7 +-
 .../compiler/lookup/NestedTypeBinding.java         |   45 +-
 .../internal/compiler/lookup/NullTypeBinding.java  |   31 -
 .../internal/compiler/lookup/PackageBinding.java   |    8 +-
 .../lookup/ParameterizedGenericMethodBinding.java  |  255 +-
 .../lookup/ParameterizedMethodBinding.java         |   83 +-
 .../compiler/lookup/ParameterizedTypeBinding.java  |  448 +---
 .../internal/compiler/lookup/PolyTypeBinding.java  |   75 -
 .../compiler/lookup/PolymorphicMethodBinding.java  |    4 +-
 .../compiler/lookup/ProblemMethodBinding.java      |   11 +-
 .../internal/compiler/lookup/ProblemReasons.java   |   17 +-
 .../compiler/lookup/ProblemReferenceBinding.java   |   13 +-
 .../internal/compiler/lookup/RawTypeBinding.java   |   70 +-
 .../internal/compiler/lookup/ReductionResult.java  |   57 -
 .../internal/compiler/lookup/ReferenceBinding.java |  550 +---
 .../jdt/internal/compiler/lookup/Scope.java        | 1742 ++++--------
 .../compiler/lookup/SourceTypeBinding.java         |  736 +----
 .../lookup/SyntheticFactoryMethodBinding.java      |   42 -
 .../compiler/lookup/SyntheticMethodBinding.java    |  107 +-
 .../jdt/internal/compiler/lookup/TagBits.java      |   39 +-
 .../jdt/internal/compiler/lookup/TypeBinding.java  |  555 +---
 .../compiler/lookup/TypeBindingVisitor.java        |  143 -
 .../jdt/internal/compiler/lookup/TypeBound.java    |   83 -
 .../internal/compiler/lookup/TypeConstants.java    |   67 +-
 .../jdt/internal/compiler/lookup/TypeIds.java      |   15 +-
 .../jdt/internal/compiler/lookup/TypeSystem.java   |  379 ---
 .../compiler/lookup/TypeVariableBinding.java       |  423 +--
 .../lookup/UnresolvedAnnotationBinding.java        |    7 +-
 .../lookup/UnresolvedReferenceBinding.java         |   74 +-
 .../internal/compiler/lookup/VariableBinding.java  |   17 +-
 .../internal/compiler/lookup/VoidTypeBinding.java  |   31 -
 .../internal/compiler/lookup/WildcardBinding.java  |  248 +-
 .../compiler/parser/AbstractCommentParser.java     |    3 +-
 .../compiler/parser/CommitRollbackParser.java      |  106 -
 .../internal/compiler/parser/ConflictedParser.java |   21 -
 .../compiler/parser/JavadocTagConstants.java       |    6 +-
 .../jdt/internal/compiler/parser/Parser.java       | 2807 +++++---------------
 .../compiler/parser/ParserBasicInformation.java    |   34 +-
 .../internal/compiler/parser/RecoveredBlock.java   |   23 +-
 .../internal/compiler/parser/RecoveredElement.java |    5 +-
 .../internal/compiler/parser/RecoveredField.java   |    3 +-
 .../compiler/parser/RecoveredLocalVariable.java    |    4 +-
 .../internal/compiler/parser/RecoveredMethod.java  |   11 +-
 .../compiler/parser/RecoveredStatement.java        |    7 +-
 .../internal/compiler/parser/RecoveredType.java    |    9 +-
 .../internal/compiler/parser/RecoveredUnit.java    |    3 +-
 .../internal/compiler/parser/RecoveryScanner.java  |    8 +-
 .../jdt/internal/compiler/parser/Scanner.java      |  478 +---
 .../internal/compiler/parser/ScannerHelper.java    |  170 +-
 .../internal/compiler/parser/TerminalTokens.java   |  208 +-
 .../compiler/parser/diagnose/DiagnoseParser.java   |   38 +-
 .../compiler/parser/diagnose/LexStream.java        |   14 +-
 .../jdt/internal/compiler/parser/parser1.rsc       |  Bin 32238 -> 24970 bytes
 .../jdt/internal/compiler/parser/parser10.rsc      |  Bin 566 -> 276 bytes
 .../jdt/internal/compiler/parser/parser11.rsc      |  Bin 566 -> 276 bytes
 .../jdt/internal/compiler/parser/parser12.rsc      |  Bin 566 -> 276 bytes
 .../jdt/internal/compiler/parser/parser13.rsc      |  Bin 566 -> 276 bytes
 .../jdt/internal/compiler/parser/parser14.rsc      |  Bin 2274 -> 1270 bytes
 .../jdt/internal/compiler/parser/parser15.rsc      |  Bin 1446 -> 992 bytes
 .../jdt/internal/compiler/parser/parser16.rsc      |  Bin 2186 -> 2018 bytes
 .../jdt/internal/compiler/parser/parser17.rsc      |  Bin 797 -> 724 bytes
 .../jdt/internal/compiler/parser/parser18.rsc      |  Bin 7747 -> 8254 bytes
 .../jdt/internal/compiler/parser/parser19.rsc      |   13 +-
 .../jdt/internal/compiler/parser/parser2.rsc       |  Bin 30644 -> 23522 bytes
 .../jdt/internal/compiler/parser/parser20.rsc      |  Bin 15356 -> 13600 bytes
 .../jdt/internal/compiler/parser/parser21.rsc      |  Bin 6376 -> 5792 bytes
 .../jdt/internal/compiler/parser/parser22.rsc      |  Bin 720 -> 650 bytes
 .../jdt/internal/compiler/parser/parser23.rsc      |  Bin 90 -> 74 bytes
 .../jdt/internal/compiler/parser/parser24.rsc      |  Bin 720 -> 650 bytes
 .../jdt/internal/compiler/parser/parser3.rsc       |  Bin 2186 -> 2018 bytes
 .../jdt/internal/compiler/parser/parser4.rsc       |  Bin 3178 -> 3454 bytes
 .../jdt/internal/compiler/parser/parser5.rsc       |  Bin 2186 -> 2018 bytes
 .../jdt/internal/compiler/parser/parser6.rsc       |  Bin 1270 -> 1040 bytes
 .../jdt/internal/compiler/parser/parser7.rsc       |  Bin 238 -> 222 bytes
 .../jdt/internal/compiler/parser/parser8.rsc       |  Bin 720 -> 650 bytes
 .../jdt/internal/compiler/parser/parser9.rsc       |  Bin 15408 -> 16368 bytes
 .../internal/compiler/parser/readableNames.props   |   35 -
 .../internal/compiler/parser/unicode6_2/part0.rsc  |  Bin 8192 -> 0 bytes
 .../internal/compiler/parser/unicode6_2/part1.rsc  |  Bin 8192 -> 0 bytes
 .../internal/compiler/parser/unicode6_2/part14.rsc |  Bin 8192 -> 0 bytes
 .../internal/compiler/parser/unicode6_2/part2.rsc  |  Bin 8192 -> 0 bytes
 .../internal/compiler/parser/unicode6_2/start0.rsc |  Bin 8192 -> 0 bytes
 .../internal/compiler/parser/unicode6_2/start1.rsc |  Bin 8192 -> 0 bytes
 .../internal/compiler/parser/unicode6_2/start2.rsc |  Bin 8192 -> 0 bytes
 .../compiler/problem/DefaultProblemFactory.java    |    3 +-
 .../internal/compiler/problem/ProblemHandler.java  |   23 +-
 .../internal/compiler/problem/ProblemReporter.java | 1580 +----------
 .../compiler/problem/ProblemSeverities.java        |    5 +-
 .../internal/compiler/problem/messages.properties  |  213 +-
 .../internal/compiler/util/GenericXMLWriter.java   |    3 +-
 .../internal/compiler/util/HashtableOfType.java    |   25 -
 .../internal/compiler/util/ManifestAnalyzer.java   |    3 +-
 .../jdt/internal/compiler/util/Messages.java       |    3 +-
 .../jdt/internal/compiler/util/Sorting.java        |   48 +-
 .../eclipse/jdt/internal/compiler/util/Util.java   |   19 +-
 279 files changed, 4057 insertions(+), 30342 deletions(-)

diff --cc debian/changelog
index 9737f25,0000000..9144a85
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,571 -1,0 +1,551 @@@
- ecj (3.10.0-1) unstable; urgency=medium
- 
-   * Team upload.
-   * New upstream release (built from the R4_4 tag, identifies itself as 
3.10.0)
-     - Refreshed gcc-changes.diff
-     - Added a patch fixing compilation errors caused by @Override annotations
-     - Updated the version of the Maven pom
-     - Added the new -1.8 option in the manpages
-   * debian/control:
-     - Removed the recommended dependency on a JRE for libecj-java
-     - Added the Homepage and the Vcs-* fields
-   * Switch to debhelper level 9
-   * Call 'set -e' in the body of the ecj maintainer scripts
-   * Fixed a typo in the ecj manpages
-   * Added a watch file
-   * debian/rules:
-     - Renamed the get-source target to get-orig-source and completed
-       the script to build the upstream tarball.
-     - Removed the option to build with the old ant1.7 package
-     - Reduced the number of warnings during the compilation
-     - Replace the bundle_version parameter with the actual version
-       in message.properties
-   * Use XZ compression for the upstream tarball
- 
-  -- Emmanuel Bourg <ebo...@apache.org>  Thu, 26 Jun 2014 17:45:28 +0200
++ecj (3.10.0+3.9.0-1) unstable; urgency=high
++
++  * Revert back to 3.9.0, as long as #753315 is not fixed.
++
++ -- Matthias Klose <d...@debian.org>  Sat, 05 Jul 2014 15:55:57 +0200
 +
 +ecj (3.9.0-2) unstable; urgency=medium
 +
 +  * Build using gcj-4.9.
 +
 + -- Matthias Klose <d...@debian.org>  Sat, 03 May 2014 16:46:31 +0200
 +
 +ecj (3.9.0-1) unstable; urgency=medium
 +
 +  * Update to 4.3.1 (built from the R4_3_1 tag, identifies itself as 3.9.0).
 +
 + -- Matthias Klose <d...@debian.org>  Tue, 10 Dec 2013 15:50:07 +0100
 +
 +ecj (3.8.2-4) unstable; urgency=low
 +
 +  * Build using gcj-4.8 on all architectures.
 +
 + -- Matthias Klose <d...@debian.org>  Mon, 01 Jul 2013 01:17:16 +0200
 +
 +ecj (3.8.2-2) unstable; urgency=low
 +
 +  * Build using gcj-4.6 on mips.
 +
 + -- Matthias Klose <d...@debian.org>  Mon, 08 Apr 2013 18:56:06 +0200
 +
 +ecj (3.8.2-1) unstable; urgency=low
 +
 +  * Update to 3.8.2 (built from the R3_8_2 tag, identifies itself as 3.8.3).
 +    Supports Java7. Closes: #693441.
 +  * Remove copyright information from ICU and jsch. Closes: #622296.
 +
 + -- Matthias Klose <d...@debian.org>  Mon, 08 Apr 2013 00:34:31 +0200
 +
 +ecj (3.5.1-6) unstable; urgency=low
 +
 +  * Allow package to build with gcj-4.6 on ia64.
 +
 + -- Matthias Klose <d...@debian.org>  Sun, 06 Jan 2013 18:54:59 +0100
 +
 +ecj (3.5.1-5) unstable; urgency=low
 +
 +  * Fix the libgcj so version.
 +
 + -- Matthias Klose <d...@debian.org>  Sun, 06 Jan 2013 17:36:18 +0100
 +
 +ecj (3.5.1-4) unstable; urgency=low
 +
 +  * Rebuild using GCC-4.7.
 +
 + -- Matthias Klose <d...@debian.org>  Tue, 10 Apr 2012 14:47:52 +0200
 +
 +ecj (3.5.1-3) unstable; urgency=low
 +
 +  [ James Page ]
 +  * Add maven artifact deployment to resolve FTBFS for 
 +    tomcat-maven-plugin (LP: #835769):
 +    - debian/control: added maven-repo-helper to Build-Depends-Indep
 +    - debian/rules: install maven artifacts, added get-orig-poms target 
 +      to retrieve original pom files
 +    - debian/libecj-java.poms: POM file locator.
 +    - debian/poms/ecj.pom: Upstream POM file from Maven repo1.
 +    - debian/libecj-java.install: removed - install handled by m-r-h.
 +
 +  [ Matthias Klose ]
 +  * Remove Jerry Haltom and Michael Koch from uploaders.
 +
 + -- Matthias Klose <d...@debian.org>  Wed, 14 Sep 2011 23:27:58 +0200
 +
 +ecj (3.5.1-2.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Enable armhf architecture for ecj1 (Closes: #631070) 
 +
 + -- Hector Oron <zu...@debian.org>  Wed, 13 Jul 2011 22:13:12 +0100
 +
 +ecj (3.5.1-2) unstable; urgency=medium
 +
 +  [ Steve Langasek ]
 +  * Move ecj1 binary to the multiarch gcc directory so gcj can find it.
 +  * Create a link to ecj1 in our build directory so that gcj can find it
 +    for rebootstrapping ecj1.
 +
 +  [ Matthias Klose]
 +  * Build with default gcj-jdk.
 +  * ecj1: Provide a compatibility symlink in /usr/lib/gcc/ecj1.
 +
 + -- Matthias Klose <d...@debian.org>  Wed, 08 Jun 2011 19:25:06 +0200
 +
 +ecj (3.5.1-1) unstable; urgency=low
 +
 +  * Update to the final 3.5.1 release.
 +  * Update GCCMain.java from rhug/eclipse-gcj.
 +
 + -- Matthias Klose <d...@debian.org>  Sat, 10 Oct 2009 11:18:07 +0200
 +
 +ecj (3.5+20090820-1) unstable; urgency=low
 +
 +  * Update to the R3_5_maintenance branch.
 +    - Fixes eclipse #285466, bootstrap error in OpenJDK.
 +  * Set sections to java.
 +
 + -- Matthias Klose <d...@debian.org>  Thu, 20 Aug 2009 19:34:12 +0200
 +
 +ecj (3.5-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * Update to the R3_5_maintenance branch 20090728.
 +  * Update GCCMain.java.
 +  * Build using gcj-4.4-jdk on all architectures.
 +
 + -- Matthias Klose <d...@debian.org>  Tue, 28 Jul 2009 18:55:13 +0200
 +
 +ecj (3.4.2-4) unstable; urgency=low
 +
 +  * Build using gcj-4.4-jdk on hppa.
 +
 + -- Matthias Klose <d...@debian.org>  Sun, 15 Feb 2009 22:34:28 +0100
 +
 +ecj (3.4.2-1) unstable; urgency=low
 +
 +  * New upstream version 3.4.2, built from the v_894_R34x tag,
 +    R3_4_maintenance branch.
 +
 + -- Matthias Klose <d...@debian.org>  Sun, 15 Feb 2009 22:34:28 +0100
 +
 +ecj (3.3.0+0728-11) unstable; urgency=low
 +
 +  * Build again for alpha.
 +
 + -- Matthias Klose <d...@debian.org>  Sun, 01 Feb 2009 09:31:00 +0100
 +
 +ecj (3.3.0+0728-10) unstable; urgency=low
 +
 +  * libecj-java: Recommend default-jre-headless | java2-runtime-headless
 +    instead of java2-runtime.
 +
 + -- Matthias Klose <d...@debian.org>  Sat, 06 Sep 2008 10:52:13 +0000
 +
 +ecj (3.3.0+0728-9) unstable; urgency=low
 +
 +  * Don't build on alpha, arm, hppa.
 +
 + -- Matthias Klose <d...@debian.org>  Wed, 09 Apr 2008 04:12:54 +0200
 +
 +ecj (3.3.0+0728-8) unstable; urgency=low
 +
 +  * Fix build failure on alpha.
 +
 + -- Matthias Klose <d...@debian.org>  Thu, 24 Jan 2008 19:58:40 +0100
 +
 +ecj (3.3.0+0728-7) unstable; urgency=low
 +
 +  * Build using gcj-4.3 on all archs but alpha.
 +
 + -- Matthias Klose <d...@debian.org>  Thu, 24 Jan 2008 19:11:08 +0100
 +
 +ecj (3.3.0+0728-6) unstable; urgency=low
 +
 +  * Build-depend on libecj-java on arm.
 +
 + -- Matthias Klose <d...@debian.org>  Mon, 14 Jan 2008 22:07:01 +0100
 +
 +ecj (3.3.0+0728-5) unstable; urgency=medium
 +
 +  * Make ecj architecture dependent, dependencies depend on the jvm used.
 +  * ecj: Depend on gij-x.y.
 +
 + -- Matthias Klose <d...@debian.org>  Thu, 06 Sep 2007 19:22:58 +0200
 +
 +ecj (3.3.0+0728-4) unstable; urgency=low
 +
 +  * Fix name of renamed jar file (Michael Koch).
 +
 + -- Matthias Klose <d...@debian.org>  Wed, 05 Sep 2007 00:08:06 +0200
 +
 +ecj (3.3.0+0728-3) unstable; urgency=medium
 +
 +  * Use ecj-standalone.jar to build the ecj-gcj and ecj1 binaries.
 +  * ecj-gcj: Depend on ecj. Closes: #440259.
 +
 + -- Matthias Klose <d...@debian.org>  Thu, 30 Aug 2007 23:33:08 +0200
 +
 +ecj (3.3.0+0728-2) unstable; urgency=low
 +
 +  * Tighten build-dependency on libgcj-bc.
 +
 + -- Matthias Klose <d...@debian.org>  Sat, 25 Aug 2007 20:12:38 +0200
 +
 +ecj (3.3.0+0728-1) unstable; urgency=medium
 +
 +  * New upstream version, taken from the R3_3_maintenance tag.
 +  * Build using gcj-4.2 on all architectures except alpha and m68k.
 +  * Stop building the ecj-bootstrap and ecj-bootstrap-gcj packages.
 +  * Build a libecj-java-gcj package.
 +  * Build an ecj1 package on arm, BC-compile ecj1.
 +  * Update debian/copyright, eclipse is EPL, not CPL anymore.
 +
 + -- Matthias Klose <d...@debian.org>  Sat, 25 Aug 2007 12:35:30 +0200
 +
 +ecj (3.3.0-2) unstable; urgency=low
 +
 +  * Apply fix for upstream report #195317.
 +
 + -- Matthias Klose <d...@debian.org>  Fri, 20 Jul 2007 12:05:37 +0200
 +
 +ecj (3.3.0-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Don't reference the transitional bootstrap package in the README.
 +    Closes: #426887.
 +  * Split out the library into libecj-java. Closes: #421621.
 +
 + -- Matthias Klose <d...@ubuntu.com>  Sat,  7 Jul 2007 02:13:27 +0200
 +
 +ecj (3.3~M7-2) unstable; urgency=low
 +
 +  * debian/control: Make ecj and ecj-gcj conflict and replace their
 +    eclipse-ecj and eclipse-ecj-gcj counterparts. Closes: #421302.
 +
 + -- Michael Koch <konque...@gmx.de>  Sun, 20 May 2007 09:57:58 -0100
 +
 +ecj (3.3~M7-1) unstable; urgency=low
 +
 +  * New upstream release.
 +    - Fixes issues with classes extending java.io.PrintWriter and implementing
 +      some random interface. Closes: #424504.
 +    - Removed debian/patches/ecj-square-bracket-classpath.diff.
 +      Applied upstream.
 +
 + -- Michael Koch <konque...@gmx.de>  Fri, 18 May 2007 09:32:35 -0100
 +
 +ecj (3.2.2-2) unstable; urgency=low
 +
 +  * Loosen dependency on gij-4.1, libgcj7-jar. Closes: #421488.
 +
 + -- Matthias Klose <d...@debian.org>  Sun, 29 Apr 2007 22:19:47 +0200
 +
 +ecj (3.2.2-1) unstable; urgency=low
 +
 +  * Upload to unstable.
 +
 + -- Matthias Klose <d...@debian.org>  Fri, 27 Apr 2007 01:04:45 +0200
 +
 +ecj (3.2.2-0) experimental; urgency=low
 +
 +  * New upstream version.
 +    - Update patches.
 +  * (Build-)depend on gcj generics backport.
 +  * Build-Conflicts with ecj-bootstrap-gcj (<< 3.2.2).
 +  * Merge from Ubuntu:
 +    - Split out patches.
 +    - Add ecj-square-bracket-classpath.diff.
 +    - ecj-bootstrap: Add compatibilty script ecj-bootstrap.
 +    - Install the jar as eclipse-ecj.jar, provide an ecj.jar symlink.
 +    - Rename source and binary package to ecj.
 +    - Pass gcj and gcj-dbtool versions to aot-compile.
 +
 + -- Matthias Klose <d...@debian.org>  Sat,  3 Mar 2007 19:37:46 +0100
 +
 +ecj-bootstrap (3.2.1-6) unstable; urgency=low
 +
 +  * Fix PR java/30585 (-Werror and -Wall not working). Taken from the rhug
 +    repository.
 +
 + -- Matthias Klose <d...@debian.org>  Sat,  3 Feb 2007 14:16:47 +0100
 +
 +ecj-bootstrap (3.2.1-5) unstable; urgency=low
 +
 +  * debian/control: Call it a "standalone" version, not a "bootstrap"
 +    version. The package is used as the compiler in java-gcj-compat-dev
 +    as well. See also #396170.
 +
 + -- Matthias Klose <d...@debian.org>  Thu, 11 Jan 2007 20:44:40 +0100
 +
 +ecj-bootstrap (3.2.1-4) unstable; urgency=medium
 +
 +  * Refactor batch/org/eclipse/jdt/internal/compiler/batch/Main.java,
 +    add batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java,
 +    needed to bootstrap GCC-4.3.
 +
 + -- Matthias Klose <d...@debian.org>  Tue,  9 Jan 2007 00:09:22 +0100
 +
 +ecj-bootstrap (3.2.1-3) unstable; urgency=low
 +
 +  * Add missing build dependency.
 +
 + -- Matthias Klose <d...@debian.org>  Sun,  8 Oct 2006 01:40:00 +0200
 +
 +ecj-bootstrap (3.2.1-2) unstable; urgency=low
 +
 +  * Add 1.6 compatibility in package description.
 +  * Use own copy of aot-compile to build with less memory resources
 +    on arm and m68k.
 +  * Build the standalone binary without -fjni -findirect-dispatch.
 +
 + -- Matthias Klose <d...@debian.org>  Sat,  7 Oct 2006 23:38:47 +0200
 +
 +ecj-bootstrap (3.2.1-1) unstable; urgency=medium
 +
 +  * New upstream version.
 +  * ecj-bootstrap-gcj: Add postrm script.
 +
 + -- Matthias Klose <d...@debian.org>  Tue,  3 Oct 2006 09:35:39 +0200
 +
 +ecj-bootstrap (3.2-3) unstable; urgency=low
 +
 +  * Install classmap db in /usr/share/gcj/classmap.db, install jar.so
 +    in /usr/lib/gcj.
 +  * ecj-bootstrap-gcj.postinst: Use rebuild-gcj-db.
 +  * Build depend on gcj-4.1 (>= 4.1.1-13).
 +
 + -- Matthias Klose <d...@debian.org>  Sat,  2 Sep 2006 13:55:21 +0000
 +
 +ecj-bootstrap (3.2-2) experimental; urgency=low
 +
 +   * Build using the gcj backport from experimental.
 +   * Do not build the binary ecj.
 +
 + -- Matthias Klose <d...@debian.org>  Sun, 13 Aug 2006 13:01:45 +0200 
 +
 +ecj-bootstrap (3.2-1) unstable; urgency=low
 +
 +  * New upstream version.
 +
 + -- Matthias Klose <d...@debian.org>  Mon, 31 Jul 2006 18:16:52 +0000
 +
 +ecj-bootstrap (3.1.2-6) unstable; urgency=low
 +
 +  * ecj-bootstrap-gcj: Do not register an alternative for ecj.
 +  * ecj-bootstrap: Use ecj-bootstrap-gcj, if available.
 +  * The above changes set the bootclasspath to /usr/share/java/libgcj-4.1.jar,
 +    if no bootclasspath is set. Closes: #361608, #361806.
 +  * Do not try to rebuild the jar file using the gij on arm and m68k.
 +
 + -- Matthias Klose <d...@debian.org>  Thu,  1 Jun 2006 22:55:00 +0200
 +
 +ecj-bootstrap (3.1.2-5) unstable; urgency=low
 +
 +  * Updated Standards-Version to 3.7.2. No changes needed.
 +
 + -- Michael Koch <konque...@gmx.de>  Sat,  6 May 2006 16:25:40 +0000
 +
 +ecj-bootstrap (3.1.2-4) unstable; urgency=low
 +
 +  * Build using gij-4.1/gcj-4.1.
 +  * Rebuild using ecj on all architectures.
 +  * Remove conflict on virtual package ecj.
 +
 + -- Matthias Klose <d...@debian.org>  Sat,  1 Apr 2006 11:29:03 +0000
 +
 +ecj-bootstrap (3.1.2-3) experimental; urgency=low
 +
 +   * Build using gcj-4.1, upload to experimental.
 +
 + -- Matthias Klose <d...@debian.org>  Sat, 28 Jan 2006 08:35:09 +0000 
 +
 +ecj-bootstrap (3.1.2-2ubuntu3) dapper; urgency=low
 +
 +  * Use gij-4.1 in the package scripts.
 +
 + -- Matthias Klose <d...@ubuntu.com>  Sun, 26 Feb 2006 21:00:44 +0000
 +
 +ecj-bootstrap (3.1.2-2ubuntu2) dapper; urgency=low
 +
 +  * Build using gcj-4.1.
 +
 + -- Matthias Klose <d...@ubuntu.com>  Sun, 19 Feb 2006 01:07:40 +0000
 +
 +ecj-bootstrap (3.1.2-2build1) dapper; urgency=low
 +
 +  * Require gcj-4.0.2-9 to build.
 +
 + -- Matthias Klose <d...@ubuntu.com>  Thu, 16 Feb 2006 03:18:22 +0000
 +
 +ecj-bootstrap (3.1.2-2) unstable; urgency=low
 +
 +  * Set the bootclasspath to /usr/share/java/libgcj-4.0.jar, if not called
 +    with the -bootclasspath and /usr/lib/jvm/java-gcj/jre/lib/rt.jar does
 +    not exist (java-gcj-compat not installed). Closes: #350542.
 +
 + -- Matthias Klose <d...@debian.org>  Thu,  9 Feb 2006 16:33:45 +0000
 +
 +ecj-bootstrap (3.1.2-1) unstable; urgency=low
 +
 +  * New upstream version.
 +
 + -- Matthias Klose <d...@debian.org>  Sat, 28 Jan 2006 08:09:25 +0000
 +
 +ecj-bootstrap (3.1.1-4) unstable; urgency=low
 +
 +  * Depend on libgcj6-jar instead of libgcj6-common.
 +
 + -- Matthias Klose <d...@debian.org>  Thu,  5 Jan 2006 19:14:49 +0000
 +
 +ecj-bootstrap (3.1.1-3.1) unstable; urgency=low
 +
 +  [ Arnaud Fontaine ]
 +  * NMU: added a backslash at the end of the first line of
 +    'debian/ecj-bootstrap-gcj.postinst'. Closes: #335031.
 +
 + -- Christoph Berg <m...@debian.org>  Sat, 29 Oct 2005 12:09:06 +0200
 +
 +ecj-bootstrap (3.1.1-3) unstable; urgency=low
 +
 +  * On arm and hppa, don't rebuild ecj using gij.
 +
 + -- Matthias Klose <d...@debian.org>  Thu, 20 Oct 2005 19:08:20 +0000
 +
 +ecj-bootstrap (3.1.1-2) unstable; urgency=low
 +
 +  * Add a javac alternative (priority higher than gcj).
 +  * ecj-bootstrap-gcj: Add slave alternative for the man page.
 +    Addresses #328743.
 +
 + -- Matthias Klose <d...@debian.org>  Thu, 20 Oct 2005 00:11:27 +0200
 +
 +ecj-bootstrap (3.1.1-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * Remove bootstrap workaround, tighten build dependency to gcj-4.0.2.
 +  * Fix symlink to manpage (closes: #330080).
 +
 + -- Matthias Klose <d...@debian.org>  Sat,  1 Oct 2005 18:32:05 +0200
 +
 +ecj-bootstrap (3.0.93-1) unstable; urgency=low
 +
 +  * New upstream version (3.1rc3). Taken from the eclipse-3.1 package,
 +    file ecj.zip.
 +
 + -- Matthias Klose <d...@debian.org>  Wed, 14 Sep 2005 12:54:56 +0000
 +
 +ecj-bootstrap (3.0.1-4ubuntu6) breezy; urgency=low
 +
 +  * Only build one java file per gcj call, ignore errors on first
 +    build. Closes: #327161, Ubuntu 14938.
 +  * Add more error checking in debian/rules.
 +  * Install manual page for ecj alternative as well.
 +
 + -- Matthias Klose <d...@ubuntu.com>  Wed, 14 Sep 2005 14:19:57 +0200
 +
 +ecj-bootstrap (3.0.1-4ubuntu5) breezy; urgency=low
 +
 +  * Reenable ecj-bootstrap-gcj. (Build-)depend on fixed gcj-4.0.
 +
 + -- Matthias Klose <d...@ubuntu.com>  Sat,  2 Jul 2005 08:25:02 +0000
 +
 +ecj-bootstrap (3.0.1-4ubuntu4) breezy; urgency=low
 +
 +  * Temporarily disable building ecj-bootstrap-gcj. FTBFS on amd64. Unbreak
 +    ant's dependency on ecj (>= 3.0.1-4ubuntu2).
 +
 + -- Matthias Klose <d...@ubuntu.com>  Thu, 30 Jun 2005 09:59:20 +0000
 +
 +ecj-bootstrap (3.0.1-4ubuntu3) breezy; urgency=low
 +
 +  * Include manpages for ecj-bootstrap and ecj-bootstrap-gcj (closes: 
#316641).
 +
 + -- Jeff Bailey <jbai...@ubuntu.com>  Wed, 29 Jun 2005 14:52:57 +0000
 +
 +ecj-bootstrap (3.0.1-4ubuntu2) breezy; urgency=low
 +
 +  * Merged ecj-adapter.jar into ecj.jar in preparation for Eclipse 3.1
 +    upgrade. Upstream has laid out ecj in this fashion.
 +  * Removed java-gcj-compat bits which were unneccassary.
 +  * Added native versions of the ecj binary and ecj.jar in a new package
 +    named ecj-bootstrap-gcj. This increases the compilation speed of
 +    packages built with this copy of ecj.
 +  * Added new alternatives for /usr/bin/ecj for the native version.
 +  * First package successfully creating a classmap.db.
 +
 + -- Jerry Haltom <was...@larvalstage.net>  Tue, 14 Jun 2005 21:38:29 -0500
 +
 +ecj-bootstrap (3.0.1-4ubuntu1) breezy; urgency=low
 +
 +  * Add a /usr/bin/ecj binary.
 +
 + -- Matthias Klose <d...@ubuntu.com>  Sat, 11 Jun 2005 16:57:27 +0000
 +
 +ecj-bootstrap (3.0.1-3) experimental; urgency=low
 +
 +  * Synchronize.
 +
 + -- Matthias Klose <d...@debian.org>  Wed,  1 Jun 2005 23:24:48 +0200
 +
 +ecj-bootstrap (3.0.1-1ubuntu6) breezy; urgency=low
 +
 +  * Now provides 'ecj' which will also be provided by the future
 +    eclipse-ecj package built from full Eclipse source.
 +  * Removed universe/ from Section.
 +  * Now refering to libgcj-4.0.jar instead of 4.0.0.jar to handle
 +    changing versions better.
 +
 + -- Jerry Haltom <was...@larvalstage.net>  Wed,  1 Jun 2005 14:12:16 -0500
 +
 +ecj-bootstrap (3.0.1-2) experimental; urgency=low
 +
 +  * Upload to experimental, set maintainer to Debian Java Matainers,
 +    request by Michael Koch.
 +
 + -- Matthias Klose <d...@debian.org>  Sun, 22 May 2005 15:53:07 +0000
 +
 +ecj-bootstrap (3.0.1-1ubuntu5) hoary; urgency=low
 +
 +  * Fixed path to ant.jar.
 +
 + -- Jerry Haltom <was...@larvalstage.net>  Mon, 28 Mar 2005 20:17:03 -0600
 +
 +ecj-bootstrap (3.0.1-1ubuntu4) hoary; urgency=low
 +
 +  * Added build of Ant adapter. This introduces a circular dependency
 +    on ecj-bootstrap and Ant.
 +
 + -- Jerry Haltom <was...@larvalstage.net>  Sun, 27 Mar 2005 22:51:13 -0600
 +
 +ecj-bootstrap (3.0.1-1ubuntu3) hoary; urgency=low
 +
 +  * Added missing dependency on libgcj6-common.
 +
 + -- Jerry Haltom <was...@larvalstage.net>  Wed, 23 Feb 2005 22:45:00 -0600
 +
 +ecj-bootstrap (3.0.1-1ubuntu2) hoary; urgency=low
 +
 +  * Removed argument modification from ecj and moved it to ecj-wrapper in the
 +    style of gcj-wrapper.
 +  * Jeff Bailey corrected the Posix-compliant argument expansion in
 +    ecj-wrapper with the help of David Weinehall.
 +  * ecj now rebuilds with itself as a sanity test.
 +
 + -- Jerry Haltom <was...@larvalstage.net>  Mon, 14 Feb 2005 20:34:25 -0600
 +
 +ecj-bootstrap (3.0.1-1ubuntu1) hoary; urgency=low
 +
 +  * First upload to Ubuntu.
 +
 +  * Tighten build deps.  Use "ecj" instead of "ecj-bootstrap" to
 +    allow ant to depend on ecj | ecj-bootstrap.
 +
 +  * Posixify wrapper
 +
 + -- Jeff Bailey <jbai...@ubuntu.com>  Fri, 11 Feb 2005 20:37:21 +0000
 +
 +ecj-bootstrap (3.0.1-0) unstable; urgency=low
 +
 +  * Initial release.
 +
 + -- Jerry Haltom <was...@larvalstage.net>  Wed, 09 Feb 2005 19:36:07 -0600
diff --cc debian/compat
index ec63514,0000000..7ed6ff8
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 9
++5
diff --cc debian/control
index d8845de,0000000..40bd3c4
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,71 -1,0 +1,69 @@@
 +Source: ecj
 +Section: java
 +Priority: optional
 +Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
 +Uploaders: Matthias Klose <d...@debian.org>
- Build-Depends: cdbs (>= 0.4.90ubuntu9), debhelper (>= 9),
++Build-Depends: cdbs (>= 0.4.90ubuntu9), debhelper (>= 5),
 + gcj-4.9-jdk (>= 4.9.0),
 + libgcj-bc (>= 4.6.3),
 + libecj-java (>= 3.8.2) [arm], unzip [arm],
 + fastjar, ant, zip, dpkg (>= 1.13.19), python, time
 +Build-Depends-Indep: maven-repo-helper
 +Build-Conflicts: ecj-bootstrap-gcj (<< 3.8.2)
 +Standards-Version: 3.9.5
- Vcs-Git: git://anonscm.debian.org/pkg-java/ecj.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/ecj.git
- Homepage: http://www.eclipse.org/jdt/core/index.php
 +
 +Package: ecj
 +Architecture: any
 +Depends: libecj-java (>= ${source:Version}), ${pkg:gij}, ${pkg:libgcjjar}, 
java-common (>= 0.23), ${misc:Depends}
 +Recommends: ecj-gcj
 +Conflicts: ecj-bootstrap (<< 3.2.2), eclipse-ecj
 +Replaces: ecj-bootstrap (<< 3.2.2), eclipse-ecj
 +Suggests: ant
 +Description: standalone version of the Eclipse Java compiler
 + This package provides a standalone version of the Eclipse JDT compiler which
 + is distributed as part of Eclipse. It passes the JCK (Java Compatibility Kit)
 + and is compatible with Java 1.3, 1.4, 1.5, 1.6 and 1.7.
 +
 +Package: libecj-java
 +Architecture: all
 +Depends: java-common (>= 0.23), ${misc:Depends}
 +Conflicts: ecj-bootstrap (<< 3.2.2), eclipse-ecj
 +Replaces: ecj-bootstrap (<< 3.2.2), eclipse-ecj, ecj (<< 3.3.0-1)
++Recommends: default-jre-headless | java2-runtime-headless | 
java5-runtime-headless
 +Suggests: ecj, ant, libecj-java-gcj
 +Description: Eclipse Java compiler (library)
 + This package provides a standalone version of the Eclipse JDT compiler 
library
 + which is distributed as part of Eclipse. It passes the JCK (Java 
Compatibility
 + Kit) and is compatible with Java 1.3, 1.4, 1.5, 1.6 and 1.7.
 +
 +Package: libecj-java-gcj
 +Architecture: any
 +Depends: java-common (>= 0.23), libecj-java (>= ${source:Version}), 
${shlibs:Depends}, ${misc:Depends}
 +Replaces: ecj-bootstrap-gcj (<< 3.2.2), eclipse-ecj-gcj, ecj-gcj (<< 
3.3.0+0728)
 +Description: Eclipse Java compiler (native library)
 + This package provides a standalone version of the Eclipse JDT compiler 
library
 + which is distributed as part of Eclipse. It passes the JCK (Java 
Compatibility
 + Kit) and is compatible with Java 1.3, 1.4, 1.5, 1.6 and 1.7.
 + .
 + This package contains a native version of libecj-java built using gcj.
 +
 +Package: ecj1
 +Architecture: alpha arm armel armhf
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Description: java byte code compiler used by gcj
 + This package provides a standalone version of the java byte code compiler
 + used by gcj.
 +
 +Package: ecj-gcj
 +Architecture: any
 +Depends: ecj (>= ${source:Version}), libecj-java-gcj (>= ${source:Version}), 
${shlibs:Depends}, ${misc:Depends}
 +Recommends: java-gcj-compat (>= 1.0.69)
 +Replaces: ecj-bootstrap-gcj (<< 3.2.2), eclipse-ecj-gcj
 +Conflicts: eclipse-ecj-gcj
 +Provides: libecj-java-gcj
 +Description: standalone version of the Eclipse Java compiler (native version)
 + This package provides a standalone version of the Eclipse JDT compiler which
 + is distributed as part of Eclipse. It passes the JCK (Java Compatibility Kit)
 + and is compatible with Java 1.3, 1.4, 1.5, 1.6 and 1.7.
 + .
 + This package contains a native version of ecj built using gcj.
diff --cc debian/ecj.1
index 91835e5,0000000..37f9ae0
mode 100644,000000..100644
--- a/debian/ecj.1
+++ b/debian/ecj.1
@@@ -1,108 -1,0 +1,106 @@@
 +.TH ECJ "1" "October 2002" 
 +.SH NAME
 +ecj \- manual page for eclipse JDT Compiler
 +.SH SYNOPSIS
 +.B ecj <options> <source files>\fR
 +.SH DESCRIPTION
 +The JDT Compiler (jdtc) is a command version of Java compiler for eclipse. 
ecj 
 +has basic java compiler options like SUN's javac.
 +.PP
 +Note: this manual page is out of date; please call the compiler with
 +\fB\-help\fR for the current documentation.
 +.SH OPTIONS
 +.TP
 +\fB\-help\fR                   display a help message
 +.TP
 +\fB\-version\fR                compiler version number
 +.TP
 +\fB\-classpath\fR              <dir 1>;<dir 2>;...;<dir P>
 +.TP
 +\fB\-d\fR <dir>                destination directory (if omitted no package 
directory structure is created)
 +.TP
 +\fB\-d\fR none
 +no classfile is generated
 +.PP
 +\fB\-1.3\fR                    set compliance level to 1.3
 +.TP
 +\fB\-1.4\fR                    set compliance level to 1.4 (default)
 +.TP
 +\fB\-1.5\fR                    set compliance level to 1.5
 +.TP
 +\fB\-1.6\fR                    set compliance level to 1.6
 +.TP
 +\fB\-1.7\fR                    set compliance level to 1.7
 +.TP
- \fB\-1.8\fR                    set compliance level to 1.8
- .TP
- \fB\-source\fR <ver>           assertions toggle (1.3 or 1.4, default is 1.3 
in \-1.3 mode and 1.4 in \-1.4 mode)
++\fB\-source\fR <ver>           assertions toggle (1.3 or 1.4, default is 1.3 
in -1.3 mode and 1.4 in -1.4 mode)
 +.TP
 +\fB\-target\fR <ver>           classfile target setting
 +.TP
 +\fB\-nowarn\fR                 no warning (equivalent to '\-warn:none')
 +.TP
 +\fB\-warn\fR: <level>          set warning level (e.g. 
'\-warn:unusedLocals,deprecation')
 +.TP
 +constructorName
 +warn method with constructor name
 +.TP
 +packageDefaultMethod
 +warn attempt to override package-default method
 +.TP
 +deprecation
 +warn usage of deprecated type or member
 +.TP
 +maskedCatchBlocks
 +warn hidden catch block
 +.TP
 +unusedLocals
 +warn on unused local variable (never read)
 +.TP
 +unusedArguments
 +warn on unused method argument (never read)
 +.TP
 +unusedImports
 +warn on unused imports
 +.TP
 +syntheticAccess
 +warn when performing synthetic access for innerclass
 +.TP
 +assertIdentifier
 +warn occurrence of 'assert' used as identifier
 +.PP
 +\fB\-deprecation\fR            equivalent to \fB\-warn\fR:deprecation.
 +\fB\-g[\fR:<level>]            debug attributes level
 +.TP
 +\fB\-g\fR
 +all debug info ('\-g:lines,vars,source')
 +.TP
 +\fB\-g\fR:none
 +no debug info
 +.TP
 +\fB\-g\fR:[lines,vars,source]
 +selective debug info
 +.PP
 +\fB\-preserveAllLocals\fR      code gen preserve all local variables (for 
debug purpose)
 +.TP
 +\fB\-noImportError\fR          no errors for unresolved imports
 +.TP
- \fB\-encoding\fR               specify default source encoding format (custom 
encoding can also be specified on a per file basis by suffixing each input 
source file/folder name with '[encoding]')
++\fB\-encoding\fR               specify default source encoding format (custom 
encoding can also be specifed on a per file basis by suffixing each input 
source file/folder name with '[encoding]')
 +.PP
 +\fB\-log\fR <filename>         specify a log file
 +.TP
 +\fB\-proceedOnError\fR         keep compiling when error, dumping class files 
with problem methods
 +.TP
 +\fB\-verbose\fR                print accessed\/processed compilation units
 +.TP
 +\fB\-referenceInfo\fR          compute reference info
 +.TP
 +\fB\-progress\fR               show progress (only in \fB\-log\fR mode)
 +.TP
 +\fB\-time\fR                   display speed information
 +.TP
 +\fB\-noExit\fR                 do not call System.exit(n) at end of 
compilation (n=0 if no error)
 +.TP
 +\fB\-repeat\fR <n>             repeat compilation process <n> times (perf 
analysis)
 +.PP
 +.SH AUTHOR
 +This manual page was written by Takshi Okamoto and Jan Schulz
 +<deb...@katzien.de>.
diff --cc debian/ecj.postinst
index 39536af,0000000..b2f1b68
mode 100644,000000..100644
--- a/debian/ecj.postinst
+++ b/debian/ecj.postinst
@@@ -1,8 -1,0 +1,6 @@@
- #! /bin/sh
- 
- set -e
++#! /bin/sh -e
 +
 +update-alternatives --quiet --install /usr/bin/javac javac /usr/bin/ecj 143 \
 +  --slave /usr/share/man/man1/javac.1.gz javac.1.gz 
/usr/share/man/man1/ecj.1.gz
 +
 +#DEBHELPER#
diff --cc debian/ecj.prerm
index 036c075,0000000..b7920e1
mode 100644,000000..100644
--- a/debian/ecj.prerm
+++ b/debian/ecj.prerm
@@@ -1,7 -1,0 +1,5 @@@
- #! /bin/sh
- 
- set -e
++#! /bin/sh -e
 +
 +update-alternatives --quiet --remove javac /usr/bin/ecj
 +
 +#DEBHELPER#
diff --cc debian/patches/gcc-changes.diff
index 9d13a4c,0000000..5e2f09a
mode 100644,000000..100644
--- a/debian/patches/gcc-changes.diff
+++ b/debian/patches/gcc-changes.diff
@@@ -1,543 -1,0 +1,551 @@@
++Index: b/gcc.properties
++===================================================================
 +--- /dev/null
 ++++ b/gcc.properties
 +@@ -0,0 +1,5 @@
 ++
 ++# GCCMain messages.
 ++gcc.zipArg=-fzip-target requires argument
 ++gcc.zipDepArg=-fzip-dependency requires argument
 ++gcc.noClasspath=no classpath specified
++Index: b/src/org.eclipse.jdt.core/build.xml
++===================================================================
 +--- a/src/org.eclipse.jdt.core/build.xml
 ++++ b/src/org.eclipse.jdt.core/build.xml
- @@ -38,9 +38,10 @@
++@@ -49,9 +49,10 @@
 +                              <include name="**/readableNames.props"/>
 +                              <include name="META-INF/**"/>
 +                              <include name="**/*.properties"/>
 ++                             <include name="**/*.props"/>
 +                              <exclude name="META-INF/eclipse.inf"/>
 +                      </fileset>
 +              </zip>
 +              <delete dir="${output}" />
 +      </target>
 +-</project>
 +\ No newline at end of file
 ++</project>
++Index: 
b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
++===================================================================
 +--- 
a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
 ++++ 
b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
- @@ -1215,9 +1215,9 @@
++@@ -1188,9 +1188,9 @@
 +              
 +              // by default only lines and source attributes are generated.
 +              this.produceDebugAttributes = ClassFileConstants.ATTR_SOURCE | 
ClassFileConstants.ATTR_LINES;
 +-             this.complianceLevel = this.originalComplianceLevel = 
ClassFileConstants.JDK1_4; // by default be compliant with 1.4
 +-             this.sourceLevel = this.originalSourceLevel = 
ClassFileConstants.JDK1_3; //1.3 source behavior by default
 +-             this.targetJDK = ClassFileConstants.JDK1_2; // default 
generates for JVM1.2
 ++             this.complianceLevel = this.originalComplianceLevel = 
ClassFileConstants.JDK1_5;
 ++             this.sourceLevel = this.originalSourceLevel = 
ClassFileConstants.JDK1_5;
 ++             this.targetJDK = ClassFileConstants.JDK1_5;
 + 
 +              this.defaultEncoding = null; // will use the platform default 
encoding
 + 
++Index: 
b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
++===================================================================
 +--- /dev/null
 ++++ 
b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
 +@@ -0,0 +1,502 @@
 ++/**
 ++ * 
 ++ */
 ++package org.eclipse.jdt.internal.compiler.batch;
 ++
 ++import java.io.BufferedOutputStream;
 ++import java.io.BufferedReader;
 ++import java.io.ByteArrayInputStream;
 ++import java.io.File;
 ++import java.io.FileOutputStream;
 ++import java.io.FileReader;
 ++import java.io.IOException;
 ++import java.io.InputStreamReader;
 ++import java.io.OutputStream;
 ++import java.io.PrintWriter;
 ++import java.io.UnsupportedEncodingException;
 ++import java.util.ArrayList;
 ++import java.util.HashSet;
 ++import java.util.Iterator;
 ++import java.util.Map;
 ++import java.util.StringTokenizer;
 ++import java.util.zip.CRC32;
 ++import java.util.zip.ZipEntry;
 ++import java.util.zip.ZipOutputStream;
 ++
 ++import org.eclipse.jdt.internal.compiler.ClassFile;
 ++import org.eclipse.jdt.internal.compiler.CompilationResult;
 ++import org.eclipse.jdt.internal.compiler.env.AccessRestriction;
 ++import org.eclipse.jdt.internal.compiler.env.AccessRule;
 ++import org.eclipse.jdt.internal.compiler.env.AccessRuleSet;
 ++import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
 ++import org.eclipse.jdt.internal.compiler.problem.ProblemSeverities;
 ++import org.eclipse.jdt.internal.compiler.util.Messages;
 ++import org.eclipse.jdt.internal.compiler.util.SuffixConstants;
 ++
 ++/**
 ++ * This is an alternate entry point for the command-line compiler which
 ++ * is simpler to integrate into GCC.  In particular the option processing
 ++ * is more GNU-like and the recognized options are similar to those supported
 ++ * by other GCC front ends.
 ++ */
 ++public class GCCMain extends Main {
 ++
 ++     // All the compilation units specified on the command line.
 ++     private HashSet commandLineCompilationUnits = new HashSet();
 ++     // True if we are only checking syntax.
 ++     private boolean syntaxOnly;
 ++     // If not null, the name of the output zip file.
 ++     // If null, we are generating class files in the file system,
 ++     // not a zip file.
 ++     private String zipDestination;
 ++     // The zip stream to which we're writing, or null if it hasn't been 
opened.
 ++     private ZipOutputStream zipStream;
 ++     
 ++     // If not null, the name of the zip file to which dependency class files
 ++     // should be written.
 ++     private String zipDependencyDestination;
 ++     // The zip stream to which dependency files should be written.
 ++     private ZipOutputStream zipDependencyStream;
 ++
 ++     public GCCMain(PrintWriter outWriter, PrintWriter errWriter,
 ++                     boolean systemExitWhenFinished) {
 ++             super(outWriter, errWriter, systemExitWhenFinished);
 ++             this.logger.setEmacs();
 ++     }
 ++
 ++     public GCCMain(PrintWriter outWriter, PrintWriter errWriter,
 ++                     boolean systemExitWhenFinished, Map 
customDefaultOptions) {
 ++             super(outWriter, errWriter, systemExitWhenFinished,
 ++                             customDefaultOptions);
 ++             this.logger.setEmacs();
 ++     }
 ++
 ++     private void fail(Exception t) {
 ++             t.printStackTrace();
 ++             this.logger.logException(t);
 ++             System.exit(1);
 ++     }
 ++
 ++     public CompilationUnit[] getCompilationUnits() {
 ++             CompilationUnit[] units = super.getCompilationUnits();
 ++             for (int i = 0; i < units.length; ++i)
 ++                     this.commandLineCompilationUnits.add(units[i]);
 ++             return units;
 ++     }
 ++
 ++     private String combine(char[] one, char[] two) {
 ++             StringBuffer b = new StringBuffer();
 ++             b.append(one);
 ++             b.append(two);
 ++             return b.toString();
 ++     }
 ++
 ++     private ZipOutputStream getZipOutput() throws IOException {
 ++             if (this.zipDestination != null && this.zipStream == null) {
 ++                     OutputStream os;
 ++                     if ("-".equals(this.zipDestination)) { //$NON-NLS-1$
 ++                             os = System.out;
 ++                     } else {
 ++                             os = new FileOutputStream(this.zipDestination);
 ++                     }
 ++                     zipStream = new ZipOutputStream(new 
BufferedOutputStream(os));
 ++                     zipStream.setMethod(ZipOutputStream.STORED);
 ++                     // Sun/OpenJDK require at least one entry in the zip 
file.
 ++                     ZipEntry entry = new ZipEntry(".dummy");
 ++                     byte[] contents = new byte[0];
 ++                     CRC32 crc = new CRC32();
 ++                     crc.update(contents);
 ++                     entry.setSize(contents.length);
 ++                     entry.setCrc(crc.getValue());
 ++                     zipStream.putNextEntry(entry);
 ++                     zipStream.write(contents);
 ++                     zipStream.closeEntry();
 ++             }
 ++             return zipStream;
 ++     }
 ++
 ++     private ZipOutputStream getDependencyOutput() throws IOException {
 ++             if (this.zipDependencyDestination != null && 
this.zipDependencyStream == null) {
 ++                     OutputStream os = new 
FileOutputStream(zipDependencyDestination);
 ++                     zipDependencyStream = new ZipOutputStream(new 
BufferedOutputStream(os));
 ++                     zipDependencyStream.setMethod(ZipOutputStream.STORED);
 ++                     // Sun/OpenJDK require at least one entry in the zip 
file.
 ++                     ZipEntry entry = new ZipEntry(".dummy");
 ++                     byte[] contents = new byte[0];
 ++                     CRC32 crc = new CRC32();
 ++                     crc.update(contents);
 ++                     entry.setSize(contents.length);
 ++                     entry.setCrc(crc.getValue());
 ++                     zipDependencyStream.putNextEntry(entry);
 ++                     zipDependencyStream.write(contents);
 ++                     zipDependencyStream.closeEntry();
 ++             }
 ++             return zipDependencyStream;
 ++     }
 ++
 ++     public void outputClassFiles(CompilationResult unitResult) {
 ++             if (this.syntaxOnly) {
 ++                     return;
 ++             }
 ++             if (this.zipDestination == null) {
 ++                     // Nothing special to do here.
 ++                     super.outputClassFiles(unitResult);
 ++                     return;
 ++             }
 ++             if (unitResult == null || unitResult.hasErrors()) {
 ++                     return;
 ++             }
 ++
 ++             // If we are compiling with indirect dispatch, we don't need
 ++             // any dependent classes.  If we are using the C++ ABI, then we
 ++             // do need the dependencies in order to do proper layout.
 ++             boolean gcjCompile = 
this.commandLineCompilationUnits.contains(unitResult.getCompilationUnit());
 ++             if (this.zipDependencyDestination == null && !gcjCompile) {
 ++                     return;
 ++             }
 ++
 ++             try {
 ++                     ZipOutputStream dest = gcjCompile ? getZipOutput() : 
getDependencyOutput();
 ++                     ClassFile[] classFiles = unitResult.getClassFiles();
 ++                     for (int i = 0; i < classFiles.length; ++i) {
 ++                             ClassFile classFile = classFiles[i];
 ++                             String filename = combine(classFile.fileName(), 
SuffixConstants.SUFFIX_class);
 ++                             if (this.verbose)
 ++                                     this.out.println(
 ++                                                     Messages.bind(
 ++                                                                     
Messages.compilation_write,
 ++                                                                     new 
String[] {
 ++                                                             
String.valueOf(this.exportedClassFilesCounter+1),
 ++                                                             filename
 ++                                                     }));
 ++                             ZipEntry entry = new ZipEntry(filename);
 ++                             byte[] contents = classFile.getBytes();
 ++                             CRC32 crc = new CRC32();
 ++                             crc.update(contents);
 ++                             entry.setSize(contents.length);
 ++                             entry.setCrc(crc.getValue());
 ++                             dest.putNextEntry(entry);
 ++                             dest.write(contents);
 ++                             dest.closeEntry();
 ++                     }
 ++             } catch (IOException err) {
 ++                     fail(err);
 ++             }
 ++     }
 ++     
 ++     private String getArgument(String option) {
 ++             int index = option.indexOf('=');
 ++             return option.substring(index + 1);
 ++     }
 ++
 ++     private void addPath(ArrayList result, String currentClasspathName) {
 ++             String customEncoding = null;
 ++             AccessRule[] accessRules = new AccessRule[0];
 ++             AccessRuleSet accessRuleSet = new AccessRuleSet(accessRules, 
AccessRestriction.COMMAND_LINE, currentClasspathName);
 ++             FileSystem.Classpath currentClasspath = FileSystem
 ++                             .getClasspath(currentClasspathName,
 ++                                             customEncoding, accessRuleSet);
 ++             if (currentClasspath != null) {
 ++                     result.add(currentClasspath);
 ++             }
 ++     }
 ++     
 ++     private void parsePath(ArrayList result, String path) {
 ++             StringTokenizer iter = new StringTokenizer(path, 
File.pathSeparator);
 ++             while (iter.hasMoreTokens()) {
 ++                     addPath(result, iter.nextToken());
 ++             }
 ++     }
 ++
 ++     protected void handleWarningToken(String token, boolean isEnabling) {
 ++             // Recognize this for compatibility with older versions of gcj.
 ++             if ("deprecated".equals(token)) //$NON-NLS-1$
 ++                     token = "deprecation"; //$NON-NLS-1$
 ++             else if ("static-access".equals(token)   //$NON-NLS-1$
 ++                             || "dep-ann".equals(token) //$NON-NLS-1$
 ++                             || "over-ann".equals(token)) { //$NON-NLS-1$
 ++                     // Some exceptions to the warning naming rule.
 ++             } else if ("extraneous-semicolon".equals(token)) { //$NON-NLS-1$
 ++                     // Compatibility with earlier versions of gcj.
 ++                     token = "semicolon"; //$NON-NLS-1$
 ++             } else {
 ++                     // Turn "foo-bar-baz" into eclipse-style "fooBarBaz".
 ++                     StringBuffer newToken = new 
StringBuffer(token.length());
 ++                     StringTokenizer t = new StringTokenizer(token, "-"); 
//$NON-NLS-1$
 ++                     boolean first = true;
 ++                     while (t.hasMoreTokens()) {
 ++                             String next = t.nextToken();
 ++                             if (first) {
 ++                                     newToken.append(next);
 ++                                     first = false;
 ++                             } else {
 ++                                     
newToken.append(Character.toUpperCase(next.charAt(0)));
 ++                                     newToken.append(next.substring(1));
 ++                             }
 ++                     }
 ++                     token = newToken.toString();
 ++             }
 ++             super.handleWarningToken(token, isEnabling);
 ++     }
 ++
 ++     private void turnWarningsToErrors() {
 ++             Object[] entries = this.options.entrySet().toArray();
 ++             for (int i = 0, max = entries.length; i < max; i++) {
 ++                     Map.Entry entry = (Map.Entry) entries[i];
 ++                     if (!(entry.getKey() instanceof String))
 ++                             continue;
 ++                     if (!(entry.getValue() instanceof String))
 ++                             continue;
 ++                     if (((String) 
entry.getValue()).equals(CompilerOptions.WARNING)) {
 ++                             this.options.put(entry.getKey(), 
CompilerOptions.ERROR);
 ++                     }
 ++             }
 ++     }
 ++
 ++     /**
 ++      * Set the debug level to the indicated value.  The level should be
 ++      * between 0 and 2, inclusive, but this is not checked.
 ++      * @param level the debug level
 ++      */
 ++     private void setDebugLevel(int level) {
 ++             this.options.put(
 ++                             CompilerOptions.OPTION_LocalVariableAttribute,
 ++                             level > 1 ? CompilerOptions.GENERATE : 
CompilerOptions.DO_NOT_GENERATE);
 ++             this.options.put(
 ++                             CompilerOptions.OPTION_LineNumberAttribute,
 ++                             level > 0 ? CompilerOptions.GENERATE : 
CompilerOptions.DO_NOT_GENERATE);
 ++             this.options.put(
 ++                             CompilerOptions.OPTION_SourceFileAttribute,
 ++                             CompilerOptions.GENERATE);
 ++     }
 ++
 ++     private void readFileList(String file, ArrayList result) {
 ++             try {
 ++                     BufferedReader b = new BufferedReader(new 
FileReader(file));
 ++                     String line;
 ++                     while ((line = b.readLine()) != null) {
 ++                             if (line.endsWith(SUFFIX_STRING_java))
 ++                                     result.add(line);
 ++                     }
 ++                     b.close();
 ++             } catch (IOException err) {
 ++                     fail(err);
 ++             }
 ++     }
 ++     
 ++     private void readAllFileListFiles(ArrayList fileList, ArrayList result) 
{
 ++             Iterator it = fileList.iterator();
 ++             while (it.hasNext()) {
 ++                     readFileList((String) it.next(), result);
 ++             }
 ++     }
 ++
 ++     private void handleWall(boolean enable) {
 ++             // A somewhat arbitrary list.  We use the GCC names
 ++             // here, and the local handleWarningToken translates
 ++             // for us.
 ++             handleWarningToken("constructor-name", enable);
 ++             handleWarningToken("pkg-default-method", enable);
 ++             handleWarningToken("masked-catch-block", enable);
 ++             handleWarningToken("all-deprecation", enable);
 ++             handleWarningToken("unused-local", enable);
 ++             handleWarningToken("unused-label", enable);
 ++             handleWarningToken("static-receiver", enable);
 ++             handleWarningToken("indirect-static", enable);
 ++             handleWarningToken("no-effect-assign", enable);
 ++             handleWarningToken("char-concat", enable);
 ++             handleWarningToken("useless-type-check", enable);
 ++             handleWarningToken("final-bound", enable);
 ++             handleWarningToken("assert-identifier", enable);
 ++             handleWarningToken("enum-identifier", enable);
 ++             handleWarningToken("finally", enable);
 ++             handleWarningToken("varargs-cast", enable);
 ++             handleWarningToken("unused", enable);
 ++             handleWarningToken("forbidden", enable);
 ++     }
 ++
 ++     public void configure(String[] argv) {
 ++             if ((argv == null) || (argv.length == 0)) {
 ++                     // This is a "can't happen".
 ++                     System.exit(1);
 ++             }
 ++
 ++             ArrayList files = new ArrayList();
 ++             ArrayList otherFiles = new ArrayList();
 ++             String classpath = null;
 ++             boolean haveFileList = false;
 ++             boolean inhibitAllWarnings = false;
 ++             boolean treatWarningsAsErrors = false;
 ++
 ++             for (int i = 0; i < argv.length; ++i) {
 ++                     String currentArg = argv[i];
 ++                     
 ++                     if (currentArg.startsWith("-fencoding=")) { 
//$NON-NLS-1$
 ++                             // Simply accept the last one.
 ++                             String encoding = getArgument(currentArg);
 ++                             try { // ensure encoding is supported
 ++                                     new InputStreamReader(new 
ByteArrayInputStream(new byte[0]), encoding);
 ++                             } catch (UnsupportedEncodingException e) {
 ++                                     throw new IllegalArgumentException(
 ++                                             
this.bind("configure.unsupportedEncoding", encoding)); //$NON-NLS-1$
 ++                             }
 ++                             
this.options.put(CompilerOptions.OPTION_Encoding, encoding);
 ++                     } else if 
(currentArg.startsWith("-foutput-class-dir=")) { //$NON-NLS-1$
 ++                             String arg = getArgument(currentArg);
 ++                             if (this.destinationPath != null) {
 ++                                     StringBuffer errorMessage = new 
StringBuffer();
 ++                                     errorMessage.append("-d"); //$NON-NLS-1$
 ++                                     errorMessage.append(' ');
 ++                                     errorMessage.append(arg);
 ++                                     throw new IllegalArgumentException(
 ++                                             
this.bind("configure.duplicateOutputPath", errorMessage.toString())); 
//$NON-NLS-1$
 ++                             }
 ++                             this.setDestinationPath(arg);
 ++                     } else if (currentArg.startsWith("-fbootclasspath=")) { 
//$NON-NLS-1$
 ++                             classpath = getArgument(currentArg);
 ++                     } else if (currentArg.equals("-fzip-target")) { 
//$NON-NLS-1$
 ++                             ++i;
 ++                             if (i >= argv.length)
 ++                                     throw new 
IllegalArgumentException(this.bind("gcc.zipArg")); //$NON-NLS-1$
 ++                             this.zipDestination = argv[i];
 ++                     } else if (currentArg.equals("-fzip-dependency")) { 
//$NON-NLS-1$
 ++                             ++i;
 ++                             if (i >= argv.length)
 ++                                     throw new 
IllegalArgumentException(this.bind("gcc.zipDepArg")); //$NON-NLS-1$
 ++                             this.zipDependencyDestination = argv[i];
 ++                     } else if (currentArg.startsWith("-g")) { //$NON-NLS-1$
 ++                             if (currentArg.equals("-g0")) { //$NON-NLS-1$
 ++                                     setDebugLevel(0);
 ++                             } else if (currentArg.equals("-g2") || 
currentArg.equals("-g3") //$NON-NLS-1$ //$NON-NLS-2$
 ++                                             || currentArg.equals("-g")) { 
//$NON-NLS-1$
 ++                                     setDebugLevel(2);
 ++                             } else {
 ++                                     // Handle -g1 but also things like 
-gstabs.
 ++                                     setDebugLevel(1);
 ++                             }
 ++                     } else if (currentArg.equals("-Werror")) { //$NON-NLS-1$
 ++                             treatWarningsAsErrors = true;
 ++                     } else if (currentArg.equals("-Wno-error")) { 
//$NON-NLS-1$
 ++                             treatWarningsAsErrors = false;
 ++                     } else if (currentArg.equals("-Wall")) { //$NON-NLS-1$
 ++                             handleWall(true);
 ++                     } else if (currentArg.equals("-Wno-all")) { 
//$NON-NLS-1$
 ++                             handleWall(false);
 ++                     } else if (currentArg.startsWith("-Wno-")) { 
//$NON-NLS-1$
 ++                             handleWarningToken(currentArg.substring(5), 
false);
 ++                     } else if (currentArg.startsWith("-W")) { //$NON-NLS-1$
 ++                             handleWarningToken(currentArg.substring(2), 
true);
 ++                     } else if (currentArg.equals("-w")) { //$NON-NLS-1$
 ++                             inhibitAllWarnings = true;
 ++                     } else if (currentArg.startsWith("-O")) { //$NON-NLS-1$
 ++                             // Ignore.
 ++                     } else if (currentArg.equals("-v")) { //$NON-NLS-1$
 ++                             this.verbose = true;
 ++                     } else if (currentArg.equals("-fsyntax-only")) { 
//$NON-NLS-1$
 ++                             this.syntaxOnly = true;
 ++                     } else if (currentArg.startsWith("-fsource=")) { 
//$NON-NLS-1$
 ++                             currentArg = getArgument(currentArg);
 ++                             if (currentArg.equals("1.3")) { //$NON-NLS-1$
 ++                                     
this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_3);
 ++                             } else if (currentArg.equals("1.4")) { 
//$NON-NLS-1$
 ++                                     
this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4);
 ++                             } else if (currentArg.equals("1.5") || 
currentArg.equals("5") || currentArg.equals("5.0")) { 
//$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
 ++                                     
this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
 ++                             } else if (currentArg.equals("1.6") || 
currentArg.equals("6") || currentArg.equals("6.0")) { 
//$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
 ++                                     
this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
 ++                             } else {
 ++                                     throw new 
IllegalArgumentException(this.bind("configure.source", currentArg)); 
//$NON-NLS-1$
 ++                             }
 ++                     } else if (currentArg.startsWith("-ftarget=")) { 
//$NON-NLS-1$
 ++                             currentArg = getArgument(currentArg);
 ++                             if (currentArg.equals("1.1")) { //$NON-NLS-1$
 ++                                     
this.options.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_1_1);
 ++                             } else if (currentArg.equals("1.2")) { 
//$NON-NLS-1$
 ++                                     
this.options.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_1_2);
 ++                             } else if (currentArg.equals("1.3")) { 
//$NON-NLS-1$
 ++                                     
this.options.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_1_3);
 ++                             } else if (currentArg.equals("1.4")) { 
//$NON-NLS-1$
 ++                                     
this.options.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_1_4);
 ++                             } else if (currentArg.equals("1.5") || 
currentArg.equals("5") || currentArg.equals("5.0")) { 
//$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
 ++                                     
this.options.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_1_5);
 ++                             } else if (currentArg.equals("1.6") || 
currentArg.equals("6") || currentArg.equals("6.0")) { 
//$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
 ++                                     
this.options.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_1_6);
 ++                             } else if (currentArg.equals("jsr14")) { 
//$NON-NLS-1$
 ++                                     
this.options.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_JSR14);
 ++                             } else {
 ++                                     throw new 
IllegalArgumentException(this.bind("configure.targetJDK", currentArg)); 
//$NON-NLS-1$
 ++                             }
 ++                     } else if (currentArg.equals("-ffilelist-file")) { 
//$NON-NLS-1$
 ++                             haveFileList = true;
 ++                     } else if 
(currentArg.endsWith(SuffixConstants.SUFFIX_STRING_java)) {
 ++                             files.add(currentArg);
 ++                     } else if (currentArg.charAt(0) == '-'){
 ++                             // FIXME: error if not a file?
 ++                     } else {
 ++                             otherFiles.add(currentArg);
 ++                     }
 ++             }
 ++
 ++             // Read the file list file.  We read them all, but really there
 ++             // will only be one.
 ++             if (haveFileList)
 ++                     readAllFileListFiles(otherFiles, files);
 ++
 ++             this.filenames = (String[]) files.toArray(new String[0]);
 ++             this.encodings = new String[this.filenames.length];
 ++             this.destinationPaths = new String[this.filenames.length];
 ++             for (int i = 0; i < this.filenames.length; ++i)
 ++                     this.destinationPaths[i] = this.destinationPath;
 ++             
 ++             // Classpath processing.
 ++             ArrayList result = new ArrayList();
 ++             if (classpath == null)
 ++                     throw new 
IllegalArgumentException(this.bind("gcc.noClasspath")); //$NON-NLS-1$
 ++             parsePath(result, classpath);
 ++
 ++             // We must always create both output files, even if one is not 
used.
 ++             // That way we will always pass valid zip file on to jc1.
 ++             try {
 ++                     getZipOutput();
 ++                     getDependencyOutput();
 ++             } catch (IOException err) {
 ++                     fail(err);
 ++             }
 ++
 ++             if (inhibitAllWarnings)
 ++                     disableAll(ProblemSeverities.Warning);
 ++             if (treatWarningsAsErrors)
 ++                     turnWarningsToErrors();
 ++
 ++             this.checkedClasspaths = new 
FileSystem.Classpath[result.size()];
 ++             result.toArray(this.checkedClasspaths);
 ++
 ++             this.logger.logCommandLineArguments(argv);
 ++             this.logger.logOptions(this.options);
 ++             this.logger.logClasspath(this.checkedClasspaths);
 ++
 ++             this.maxRepetition = 1;
 ++     }
 ++
 ++     public boolean compile(String[] argv) {
 ++             boolean result = super.compile(argv);
 ++             try {
 ++                     if (zipStream != null) {
 ++                             zipStream.finish();
 ++                             zipStream.close();
 ++                     }
 ++                     if (zipDependencyStream != null) {
 ++                             zipDependencyStream.finish();
 ++                             zipDependencyStream.close();
 ++                     }
 ++             } catch (IOException err) {
 ++                     fail(err);
 ++             }
 ++             return result;
 ++     }
 ++
 ++     public static void main(String[] argv) {
 ++             boolean result = new GCCMain(new PrintWriter(System.out), new 
PrintWriter(System.err), false).compile(argv);
 ++             System.exit(result ? 0 : 1);
 ++     }
 ++}
diff --cc debian/patches/series
index 590acf3,0000000..fdc5ff4
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +gcc-changes.diff
- remove-overrides.diff
diff --cc debian/poms/ecj.pom
index a0e515f,0000000..f268e80
mode 100644,000000..100644
--- a/debian/poms/ecj.pom
+++ b/debian/poms/ecj.pom
@@@ -1,38 -1,0 +1,38 @@@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
 +      <!-- Originally downloaded here: 
 +              
http://download.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/#JDTCORE
 +      -->
 +      <modelVersion>4.0.0</modelVersion>
 +      <groupId>org.eclipse.jdt.core.compiler</groupId>
 +      <artifactId>ecj</artifactId>
-       <version>3.10.0</version>
++      <version>3.8.2</version>
 +      <packaging>jar</packaging>
 +      <name>Eclipse ECJ</name>
 +      <description>Eclipse JDT Core Batch Compiler</description>
 +      <url>http://www.eclipse.org/jdt/</url>
 +      <properties>
 +              
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 +              
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 +      </properties>
 +      <licenses>
 +              <license>
 +                      <name>Eclipse Public License v1.0</name>
 +                      
<url>http://www.eclipse.org/org/documents/epl-v10.php</url>
 +                      <distribution>repo</distribution>
 +              </license>
 +      </licenses>
 +      <scm>
 +              
<url>http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/</url>
 +              
<connection>:pserver:anonym...@dev.eclipse.org:/cvsroot/eclipse</connection>
 +      </scm>
 +      <developers>
 +              <!-- I didn't develop ECJ, but the Central Sync Requirements 
mandate a developer in the POM:
 +                      
https://docs.sonatype.org/display/Repository/Central+Sync+Requirements
 +              -->
 +              <developer>
 +                      <name>Ralph Schaer</name>
 +                      <email>ralphsch...@gmail.com</email>
 +              </developer>
 +      </developers>
 +</project>
diff --cc debian/rules
index e5e1da6,0000000..8dd0277
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,277 -1,0 +1,269 @@@
 +#!/usr/bin/make -f
 +
 +include /usr/share/cdbs/1/rules/debhelper.mk
 +
 +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 +
- VERSION       := $(shell dpkg-parsechangelog --show-field Version | sed 
's/-[^-]*//')
- 
 +GCC_VERSION   := $(shell ls -l /usr/bin/gcj | sed 's/.*-> gcj-\(.*\)/\1/')
 +GCC_VERSION   := 4.9
 +
 +LIBGCJ_EXT    := $(shell ls -l /usr/lib/$(DEB_HOST_MULTIARCH)/libgcj_bc.so.1 
| sed 's/.*\.//')
 +LIBGCJ_SOVER  = $(LIBGCJ_EXT)
 +LIBGCJ_SOVER  = 15
 +REQ_VERSION   = 4.4.6
 +
++ant_version = 1.7
++ant_version =
 +GCJ = gcj-$(GCC_VERSION)
 +GIJ = gij-$(GCC_VERSION)
 +GCJDBTOOL = gcj-dbtool-$(GCC_VERSION)
 +GCJSUBDIR = /usr/lib/$(DEB_HOST_MULTIARCH)/gcj-$(GCC_VERSION)-$(LIBGCJ_SOVER)
 +
 +# work around ecj1 having fallen out of the gcc search path
 +PATH := $(CURDIR):$(PATH)
 +export PATH
 +
 +with_native := yes
 +with_rebuild := yes
 +with_sourcebuild := yes
 +
 +ifneq (,$(filter $(DEB_HOST_ARCH), arm armel))
 +  with_rebuild := no
 +endif
 +
 +ifneq (,$(filter $(DEB_HOST_ARCH), arm))
 +  with_sourcebuild := no
 +endif
 +
 +DEB_DH_GENCONTROL_ARGS = -- \
 +      '-Vpkg:gij=gcj-$(GCC_VERSION)-jre-headless (>= $(REQ_VERSION))' \
 +      '-Vpkg:libgcjjar=gcj-$(GCC_VERSION)-jre-lib (>= $(REQ_VERSION))'
 +
 +JAR = eclipse-ecj.jar
 +
 +default: build
 +
 +eclipse_root = $(CURDIR)/../eclipse
 +
 +build/ecj:: build/stamp-bytecode build/stamp-nativecode
 +
 +build/stamp-bytecode:
 +ifneq (,$(findstring $(DEB_HOST_ARCH),arm))
-       @echo 'Sorry ecj is no longer built on $(DEB_HOST_ARCH) due to a lack 
of porters'
-       @echo 'supporting gij/gcj on this architecture. Please consider helping 
if you can.'
++      @echo 'ecj is not built anymore on this architecture.'
++      @echo 'People insist on 100% compatible packages without providing any 
help.'
++      @echo 'The porter lists are quiet on the topic of better gij/gcj 
support for'
++      @echo 'these architectures.'
 +      false
 +endif
 +      rm -rf build/bin
 +      mkdir -p build/bin
 +
 +ifeq ($(with_sourcebuild),yes)
 +      cp -r src/org.eclipse.jdt.core/org build/bin/
 +      cat gcc.properties \
 +          >> 
build/bin/org/eclipse/jdt/internal/compiler/batch/messages.properties
 +      rm -rf build/bin/org/eclipse/jdt/internal/compiler/apt
 +      rm -rf build/bin/org/eclipse/jdt/internal/compiler/tool
 +
-       # Replace the bundle_version parameter with the actual version
-       sed -i 's/bundle_qualifier, bundle_version/$(VERSION)/' 
build/bin/org/eclipse/jdt/internal/compiler/batch/messages.properties
- 
 +      find build/bin -name '*.java' > build/sourcefiles
 +      split -l 25 build/sourcefiles ecj-sources.
 +      ls -l
 +      mv ecj-sources.* build/bin
 +      ls -l . build/bin
 +
 +      ln -sf /usr/lib/gcc/ecj1 $(CURDIR)/ecj1
 +      set -e; \
 +      for list in $$(find build/bin -name 'ecj-sources.*'); do \
 +          echo "building files in $$list ..."; \
 +          echo $(GCJ) -d build/bin -C -g \
-               -I/usr/share/ant/lib/ant.jar \
++              -I/usr/share/ant$(ant_version)/lib/ant.jar \
 +              -Ibuild/bin \
 +              $$(cat $$list); \
 +          $(GCJ) -v -d build/bin -C -g \
-               -I/usr/share/ant/lib/ant.jar \
++              -I/usr/share/ant$(ant_version)/lib/ant.jar \
 +              -Ibuild/bin \
-               -Wno-all -Wno-unchecked -Wno-raw -Wno-resource \
 +              $$(cat $$list); \
 +      done
 +
 +      find build/bin -name 'sources.list' -exec rm -f {} \;
 +      find build/bin -name '*.java' -exec rm -f {} \;
 +      find build/bin -name '*.html' -exec rm -f {} \;
 +
 +      mkdir -p build/bootstrap
 +      fastjar -c -C build/bin . -f build/bootstrap/$(JAR)
 +
 +  ifeq ($(with_rebuild),yes)
 +      : # rebuild the compiler
 +      rm -rf build/bin
 +      mkdir -p build/bin
 +      cp -r src/org.eclipse.jdt.core/org build/bin/
 +      cat gcc.properties \
 +          >> 
build/bin/org/eclipse/jdt/internal/compiler/batch/messages.properties
 +      rm -rf build/bin/org/eclipse/jdt/internal/compiler/apt
 +      rm -rf build/bin/org/eclipse/jdt/internal/compiler/tool
 +
-       # Replace the bundle_version parameter with the actual version
-       sed -i 's/bundle_qualifier, bundle_version/$(VERSION)/' 
build/bin/org/eclipse/jdt/internal/compiler/batch/messages.properties
- 
 +      time $(GIJ) \
-           -classpath build/bootstrap/$(JAR):/usr/share/ant/lib/ant.jar \
++          -classpath 
build/bootstrap/$(JAR):/usr/share/ant$(ant_version)/lib/ant.jar \
 +          org.eclipse.jdt.internal.compiler.batch.Main \
 +          -bootclasspath /usr/share/java/libgcj-$(GCC_VERSION).jar \
 +          build/bin
 +
 +      find build/bin -name '*.java' -exec rm -f {} \;
 +      find build/bin -name '*.html' -exec rm -f {} \;
 +
 +      mkdir -p build/dist
 +      fastjar -c -C build/bin . -f build/dist/$(JAR)
 +  else
 +      mkdir -p build/dist
 +      cp -p build/bootstrap/$(JAR) build/dist/$(JAR)
 +  endif
 +else
 +      mkdir -p build/bin
 +      unzip -d build/bin -q /usr/share/java/eclipse-ecj.jar
 +      mkdir -p build/dist
 +      cp -p /usr/share/java/eclipse-ecj.jar build/dist/$(JAR)
 +endif
 +      mkdir -p build/exe
 +      cp build/dist/$(JAR) build/exe/ecj-standalone.jar
 +      zip -d build/exe/ecj-standalone.jar \
 +              'org/eclipse/jdt/core/JDTCompilerAdapter*'
 +
 +      touch build/stamp-bytecode
 +
 +build/stamp-nativecode: build/stamp-bytecode
 +      find build/dist -name '*.jar.*.jar' | xargs -r rm -f
 +ifeq ($(with_native),yes)
 +      : # $(JAR).so
 +
 +      cd build/bin && find -name '*.rsc' -o -name '*.properties' -o -name 
'*.props' \
 +          | fastjar -c -@ - -f $(CURDIR)/build/resources.jar
 +      $(GCJ) \
 +          -c -O2 -g -fPIC -fjni -findirect-dispatch \
 +          -o build/dist/resources.o build/resources.jar
 +      cp -p build/dist/resources.o build/exe/
 +
 +      PYTHONPATH=$(CURDIR)/debian \
 +      RPATH=-Wl,-rpath,$(GCJSUBDIR) \
 +        time python debian/aot-compile \
 +          --gcj=$(GCJ) --dbtool=$(GCJDBTOOL) \
 +          -L /usr/lib/gcj build/dist build/dist
 +
 +      PYTHONPATH=$(CURDIR)/debian \
 +      RPATH=-Wl,-rpath,$(GCJSUBDIR) \
 +        time python debian/aot-compile \
 +          --gcj=$(GCJ) --dbtool=$(GCJDBTOOL) \
 +          -L /usr/lib/gcj build/exe build/exe
 +
 +  ifeq (0,1)
 +      : # ecj-gcj
 +      time $(GCJ) \
 +          -O1 -g -Wl,-O1 -Wl,-rpath,$(GCJSUBDIR) -Wl,-z,relro \
 +          --main=org.eclipse.jdt.internal.compiler.batch.Main \
 +          -o build/dist/ecj-gcj build/exe/ecj-standalone.jar
 +      : # ecj1
 +      time $(GCJ) \
 +          -O1 -g -Wl,-O1 -Wl,-rpath,$(GCJSUBDIR) -Wl,-z,relro \
 +          --main=org.eclipse.jdt.internal.compiler.batch.GCCMain \
 +          -o build/dist/ecj1 build/exe/ecj-standalone.jar
 +  endif
 +endif
 +      touch build/stamp-nativecode
 +
 +
 +install/libecj-java::
 +      mh_installpoms -plibecj-java
 +      mh_installjar -plibecj-java -l debian/poms/ecj.pom build/dist/$(JAR) \
 +              --usj-name=eclipse-ecj
 +
 +install/ecj::
 +      mkdir -p debian/tmp/usr/bin
 +      sed 's/@ver@/$(GCC_VERSION)/g' debian/ecj.in \
 +        > debian/tmp/usr/bin/ecj
 +      chmod 755 debian/tmp/usr/bin/ecj
 +
 +install/libecj-java-gcj::
 +ifeq ($(with_native),yes)
 +      mkdir -p debian/tmp/usr/lib/gcj
 +      install -m 644 build/dist/$(JAR).so debian/tmp/usr/lib/gcj
 +
 +      mkdir -p debian/tmp/usr/share/gcj/classmap.d
 +      install -m 644 build/dist/*.db \
 +              debian/tmp/usr/share/gcj/classmap.d/
 +endif
 +
 +install/ecj1::
 +ifeq ($(with_native),yes)
 +      mkdir -p debian/ecj1/usr/lib/$(DEB_HOST_MULTIARCH)/gcc
 +      install -m 755 build/exe/ecj1 
debian/ecj1/usr/lib/$(DEB_HOST_MULTIARCH)/gcc/
 +      dh_link -p ecj1 \
 +        /usr/lib/$(DEB_HOST_MULTIARCH)/gcc/ecj1 /usr/lib/gcc/ecj1
 +endif
 +
 +install/ecj-gcj::
 +ifeq ($(with_native),yes)
 +      mkdir -p debian/tmp/usr/bin
 +      install -m 755 build/exe/ecj-gcj debian/tmp/usr/bin/
 +endif
 +      mkdir -p debian/ecj-gcj/usr/bin
 +
 +      mkdir -p debian/ecj-gcj/usr/share/man/man1
 +      ln -sf ecj.1.gz \
 +        debian/ecj-gcj/usr/share/man/man1/ecj-gcj.1.gz
 +
 +      mkdir -p debian/ecj-gcj/usr/share/lintian/overrides
 +      cp -p debian/ecj-gcj.overrides \
 +        debian/ecj-gcj/usr/share/lintian/overrides/ecj-gcj
 +
 +binary-predeb/ecj1::
 +#     sed -i 's/libgcj[1-9][^,]*//;s/,,/,/' debian/ecj1.substvars
 +
 +binary-predeb/ecj-gcj::
 +#     sed -i 's/libgcj[1-9][^,]*//;s/,,/,/' debian/ecj-gcj.substvars
 +
 +clean::
 +      rm -rf build
 +      rm -f debian/*.pyc ecj1
 +      rm -rf debian/.mh
 +
- TAG = R4_4
- DIR = ecj-$(DEB_UPSTREAM_VERSION)
++RR=../cvs/R3_5_maintenance/
++RR=../cvs/R3_5_1/
++RR=R4_3_1/
++tag = R4_3_1
 +
 +MAVEN_REPO  := http://repo1.maven.org/maven2
 +PACKAGE := ecj
 +
 +get-orig-pom:
 +      mkdir -p debian/poms
 +      wget  -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \
 +        
$(MAVEN_REPO)/org/eclipse/jdt/core/compiler/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
 +
- get-orig-source:
-       rm -rf $(DIR) $(TAG).tar.gz $(TAG)
-       wget 
http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/snapshot/$(TAG).tar.gz
-       tar xf $(TAG).tar.gz
-       mkdir -p $(DIR)/src/org.eclipse.jdt.core
-       cp -p $(TAG)/org.eclipse.jdt.core/scripts/about.html \
-               $(DIR)/src/org.eclipse.jdt.core/
-       cp -p $(TAG)/org.eclipse.jdt.core/scripts/build.xml \
-               $(DIR)/src/org.eclipse.jdt.core/
- 
-       tar -c -f - -C $(TAG)/org.eclipse.jdt.core/compiler org \
-           | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/
- 
-       tar -c -f - -C $(TAG)/org.eclipse.jdt.core/antadapter org META-INF \
-           | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/
- 
-       find $(DIR) -name CheckDebugAttributes.java | xargs -r rm -f
-       find $(DIR) -name BuildJarIndex.java | xargs -r rm -f
- 
-       tar -c -f - -C $(TAG)/org.eclipse.jdt.core/batch org \
-           | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/
- 
-       mkdir -p $(DIR)/src/org.eclipse.jdt.core/META-INF/services
- #     cp -p $(TAG)/org.eclipse.jdt.core/scripts/META-INF/MANIFEST.MF \
- #         $(DIR)/src/org.eclipse.jdt.core/META-INF/
++get-source:
++      rm -rf org.eclipse.jdt.core
++      #wget 
http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/snapshot/R4_3_1.tar.gz
++      #git clone -b R3_8_maintenance 
git://git.eclipse.org/gitroot/jdt/eclipse.jdt.core.git
++      tar xf ../R4_3_1.tar.gz
++      rm -rf tmp-src
++      mkdir -p tmp-src/org.eclipse.jdt.core
++      cp -p $(RR)org.eclipse.jdt.core/scripts/about.html \
++              tmp-src/org.eclipse.jdt.core/
++      cp -p $(RR)org.eclipse.jdt.core/scripts/build.xml \
++              tmp-src/org.eclipse.jdt.core/
++      tar -c -f - -C $(RR)org.eclipse.jdt.core/compiler org \
++          | tar -x -f - -C tmp-src/org.eclipse.jdt.core/
++
++      tar -c -f - -C $(RR)org.eclipse.jdt.core/antadapter org META-INF \
++          | tar -x -f - -C tmp-src/org.eclipse.jdt.core/
++      find tmp-src -name CheckDebugAttributes.java | xargs -r rm -f
++      find tmp-src -name BuildJarIndex.java | xargs -r rm -f
++
++      tar -c -f - -C $(RR)org.eclipse.jdt.core/batch org \
++          | tar -x -f - -C tmp-src/org.eclipse.jdt.core/
++
++      mkdir -p tmp-src/org.eclipse.jdt.core/META-INF/services
++#     cp -p $(RR)org.eclipse.jdt.core/scripts/META-INF/MANIFEST.MF \
++#         tmp-src/org.eclipse.jdt.core/META-INF/
 +      printf 'org.eclipse.jdt.internal.compiler.tool.EclipseCompiler #Eclipse 
compiler' \
-           > 
$(DIR)/src/org.eclipse.jdt.core/META-INF/services/javax.tools.JavaCompiler
- 
-       # Create the upstream tarball
-       tar -c -J -f ../ecj_$(VERSION).orig.tar.xz $(DIR)
++          > 
tmp-src/org.eclipse.jdt.core/META-INF/services/javax.tools.JavaCompiler
 +
-       # Remove the temporary files
-       rm -rf $(DIR) $(TAG).tar.gz $(TAG)
diff --cc debian/stamp-patched
index 0000000,0000000..e69de29
new file mode 100644
--- /dev/null
+++ b/debian/stamp-patched

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/ecj.git

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to