This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to annotated tag debian/4.3-1 in repository proguard.
commit dd1d0a8f077b81cf6d1af522f72a5fd2054a7990 Merge: 4dc0e60 09ddf2a Author: Sam Clegg <[email protected]> Date: Wed May 20 08:21:13 2009 +0100 Imported Debian patch 4.3-1 README | 37 +- bin/proguard.bat | 10 + bin/proguard.sh | 9 + bin/proguardgui.bat | 10 + bin/proguardgui.sh | 9 + bin/retrace.bat | 10 + bin/retrace.sh | 9 + build/README | 34 + build/build.sh | 80 ++ build/build.xml | 166 ++++ build/makefile | 94 ++ debian/changelog | 8 + debian/compat | 2 +- debian/control | 4 +- debian/copyright | 2 +- debian/rules | 6 +- docs/FAQ.html | 28 +- docs/GPL_exception.html | 4 +- docs/acknowledgements.html | 9 +- docs/alternatives.html | 32 +- docs/downloads.html | 42 +- docs/feedback.html | 2 +- docs/index.html | 2 +- docs/license.html | 4 +- docs/main.html | 2 +- docs/manual/ant.html | 45 +- docs/manual/attention.gif | Bin 0 -> 896 bytes docs/manual/examples.html | 6 +- docs/manual/gui.html | 5 +- docs/manual/index.html | 2 +- docs/manual/introduction.html | 6 +- docs/manual/limitations.html | 12 +- docs/manual/refcard.html | 25 +- docs/manual/retrace/examples.html | 2 +- docs/manual/retrace/index.html | 2 +- docs/manual/retrace/introduction.html | 2 +- docs/manual/retrace/usage.html | 2 +- docs/manual/troubleshooting.html | 187 +++- docs/manual/usage.html | 110 ++- docs/manual/wtk.html | 10 +- docs/quality.html | 8 +- docs/results.html | 2 +- docs/screenshots.html | 2 +- docs/testimonials.html | 11 +- docs/title.html | 2 +- examples/annotations/lib/annotations.jar | Bin 6123 -> 6123 bytes examples/ant/proguard.xml | 14 +- examples/dictionaries/shakespeare.txt | 0 examples/dictionaries/windows.txt | 209 +++++ examples/proguard.pro | 9 +- examples/proguardall.pro | 11 +- examples/proguardgui.pro | 7 +- src/proguard/ArgumentWordReader.java | 2 +- src/proguard/ClassPath.java | 2 +- src/proguard/ClassPathEntry.java | 2 +- src/proguard/ClassSpecification.java | 2 +- src/proguard/ClassSpecificationVisitorFactory.java | 2 +- src/proguard/Configuration.java | 17 +- src/proguard/ConfigurationConstants.java | 13 +- src/proguard/ConfigurationParser.java | 91 +- src/proguard/ConfigurationWriter.java | 14 +- src/proguard/DataEntryReaderFactory.java | 2 +- src/proguard/DataEntryWriterFactory.java | 2 +- src/proguard/DescriptorKeepChecker.java | 2 +- src/proguard/DuplicateClassPrinter.java | 2 +- src/proguard/FileWordReader.java | 2 +- src/proguard/FullyQualifiedClassNameChecker.java | 2 +- src/proguard/GPL.java | 3 +- src/proguard/Initializer.java | 135 ++- src/proguard/InputReader.java | 2 +- src/proguard/KeepSpecification.java | 2 +- src/proguard/MANIFEST.MF | 2 + src/proguard/MemberSpecification.java | 2 +- src/proguard/OutputWriter.java | 2 +- src/proguard/ParseException.java | 2 +- src/proguard/ProGuard.java | 4 +- src/proguard/SubclassedClassFilter.java | 2 +- src/proguard/Targeter.java | 16 +- src/proguard/UpToDateChecker.java | 2 +- src/proguard/WordReader.java | 2 +- src/proguard/ant/ClassPathElement.java | 2 +- src/proguard/ant/ClassSpecificationElement.java | 13 +- src/proguard/ant/ConfigurationElement.java | 2 +- src/proguard/ant/ConfigurationTask.java | 2 +- src/proguard/ant/FilterElement.java | 2 +- src/proguard/ant/KeepAttributeElement.java | 2 +- src/proguard/ant/KeepSpecificationElement.java | 2 +- src/proguard/ant/MemberSpecificationElement.java | 2 +- src/proguard/ant/ProGuardTask.java | 20 +- src/proguard/classfile/ClassConstants.java | 18 +- src/proguard/classfile/ClassPool.java | 16 +- src/proguard/classfile/Clazz.java | 120 +-- src/proguard/classfile/Field.java | 16 +- src/proguard/classfile/LibraryClass.java | 256 ++---- src/proguard/classfile/LibraryField.java | 27 +- src/proguard/classfile/LibraryMember.java | 36 +- src/proguard/classfile/LibraryMethod.java | 27 +- src/proguard/classfile/Member.java | 24 +- src/proguard/classfile/Method.java | 16 +- src/proguard/classfile/ProgramClass.java | 229 ++--- src/proguard/classfile/ProgramField.java | 33 +- src/proguard/classfile/ProgramMember.java | 40 +- src/proguard/classfile/ProgramMethod.java | 33 +- src/proguard/classfile/VisitorAccepter.java | 16 +- src/proguard/classfile/attribute/Attribute.java | 33 +- .../classfile/attribute/CodeAttribute.java | 42 +- .../attribute/ConstantValueAttribute.java | 28 +- .../classfile/attribute/DeprecatedAttribute.java | 25 +- .../attribute/EnclosingMethodAttribute.java | 30 +- .../classfile/attribute/ExceptionInfo.java | 16 +- .../classfile/attribute/ExceptionsAttribute.java | 30 +- .../classfile/attribute/InnerClassesAttribute.java | 31 +- .../classfile/attribute/InnerClassesInfo.java | 61 +- .../classfile/attribute/LineNumberInfo.java | 16 +- .../attribute/LineNumberTableAttribute.java | 30 +- .../classfile/attribute/LocalVariableInfo.java | 16 +- .../attribute/LocalVariableTableAttribute.java | 30 +- .../classfile/attribute/LocalVariableTypeInfo.java | 16 +- .../attribute/LocalVariableTypeTableAttribute.java | 30 +- .../classfile/attribute/SignatureAttribute.java | 28 +- .../classfile/attribute/SourceDirAttribute.java | 28 +- .../classfile/attribute/SourceFileAttribute.java | 28 +- .../classfile/attribute/SyntheticAttribute.java | 25 +- .../classfile/attribute/UnknownAttribute.java | 30 +- .../classfile/attribute/annotation/Annotation.java | 37 +- .../annotation/AnnotationDefaultAttribute.java | 28 +- .../annotation/AnnotationElementValue.java | 28 +- .../attribute/annotation/AnnotationsAttribute.java | 33 +- .../attribute/annotation/ArrayElementValue.java | 30 +- .../attribute/annotation/ClassElementValue.java | 28 +- .../attribute/annotation/ConstantElementValue.java | 32 +- .../attribute/annotation/ElementValue.java | 33 +- .../annotation/EnumConstantElementValue.java | 30 +- .../annotation/ParameterAnnotationsAttribute.java | 35 +- .../RuntimeInvisibleAnnotationsAttribute.java | 29 +- ...timeInvisibleParameterAnnotationsAttribute.java | 31 +- .../RuntimeVisibleAnnotationsAttribute.java | 27 +- ...untimeVisibleParameterAnnotationsAttribute.java | 31 +- .../annotation/visitor/AllAnnotationVisitor.java | 2 +- .../annotation/visitor/AnnotatedClassVisitor.java | 2 +- .../visitor/AnnotationToMemberVisitor.java | 2 +- .../annotation/visitor/AnnotationTypeFilter.java | 2 +- .../annotation/visitor/AnnotationVisitor.java | 2 +- .../annotation/visitor/ElementValueVisitor.java | 2 +- .../attribute/preverification/DoubleType.java | 16 +- .../attribute/preverification/FloatType.java | 16 +- .../attribute/preverification/FullFrame.java | 18 +- .../attribute/preverification/IntegerType.java | 16 +- .../attribute/preverification/LessZeroFrame.java | 16 +- .../attribute/preverification/LongType.java | 16 +- .../attribute/preverification/MoreZeroFrame.java | 18 +- .../attribute/preverification/NullType.java | 16 +- .../attribute/preverification/ObjectType.java | 16 +- .../attribute/preverification/SameOneFrame.java | 16 +- .../attribute/preverification/SameZeroFrame.java | 16 +- .../preverification/StackMapAttribute.java | 16 +- .../attribute/preverification/StackMapFrame.java | 16 +- .../preverification/StackMapTableAttribute.java | 16 +- .../attribute/preverification/TopType.java | 16 +- .../preverification/UninitializedThisType.java | 16 +- .../preverification/UninitializedType.java | 16 +- .../preverification/VerificationType.java | 16 +- .../preverification/VerificationTypeFactory.java | 2 +- .../visitor/StackMapFrameVisitor.java | 2 +- .../visitor/VerificationTypeVisitor.java | 2 +- .../attribute/visitor/AllAttributeVisitor.java | 2 +- .../attribute/visitor/AttributeNameFilter.java | 2 +- .../attribute/visitor/AttributeVisitor.java | 2 +- .../attribute/visitor/ExceptionInfoVisitor.java | 2 +- .../attribute/visitor/InnerClassesInfoVisitor.java | 2 +- .../attribute/visitor/LineNumberInfoVisitor.java | 2 +- .../visitor/LocalVariableInfoVisitor.java | 2 +- .../visitor/LocalVariableTypeInfoVisitor.java | 2 +- .../attribute/visitor/MultiAttributeVisitor.java | 2 +- .../attribute/visitor/RequiredAttributeFilter.java | 2 +- .../attribute/visitor/StackSizeComputer.java | 19 +- src/proguard/classfile/constant/ClassConstant.java | 16 +- src/proguard/classfile/constant/Constant.java | 16 +- .../classfile/constant/DoubleConstant.java | 16 +- .../classfile/constant/FieldrefConstant.java | 16 +- src/proguard/classfile/constant/FloatConstant.java | 16 +- .../classfile/constant/IntegerConstant.java | 16 +- .../constant/InterfaceMethodrefConstant.java | 16 +- src/proguard/classfile/constant/LongConstant.java | 16 +- .../classfile/constant/MethodrefConstant.java | 16 +- .../classfile/constant/NameAndTypeConstant.java | 16 +- src/proguard/classfile/constant/RefConstant.java | 16 +- .../classfile/constant/StringConstant.java | 16 +- src/proguard/classfile/constant/Utf8Constant.java | 16 +- .../constant/visitor/AllConstantVisitor.java | 2 +- .../constant/visitor/ConstantVisitor.java | 2 +- .../visitor/ExceptClassConstantFilter.java} | 46 +- src/proguard/classfile/editor/AccessFixer.java | 48 +- src/proguard/classfile/editor/AnnotationAdder.java | 116 +++ .../editor/AnnotationsAttributeEditor.java | 67 ++ src/proguard/classfile/editor/AttributeAdder.java | 279 ++++-- src/proguard/classfile/editor/AttributeSorter.java | 16 +- .../classfile/editor/AttributesEditor.java | 309 ++++--- src/proguard/classfile/editor/ClassEditor.java | 255 ++++++ .../classfile/editor/ClassElementSorter.java | 16 +- .../classfile/editor/ClassMemberSorter.java | 16 +- .../classfile/editor/ClassReferenceFixer.java | 50 +- .../classfile/editor/CodeAttributeComposer.java | 43 +- .../classfile/editor/CodeAttributeEditor.java | 6 +- .../editor/CodeAttributeEditorResetter.java | 2 +- .../classfile/editor/ComparableConstant.java | 36 +- src/proguard/classfile/editor/ConstantAdder.java | 82 +- .../classfile/editor/ConstantPoolEditor.java | 474 +++++----- .../classfile/editor/ConstantPoolRemapper.java | 2 +- .../classfile/editor/ConstantPoolSorter.java | 114 +-- .../classfile/editor/ElementValueAdder.java | 218 +++++ .../classfile/editor/ElementValuesEditor.java | 238 +++++ src/proguard/classfile/editor/ExceptionAdder.java | 26 +- .../classfile/editor/ExceptionInfoAdder.java | 67 ++ ...sEditor.java => ExceptionsAttributeEditor.java} | 39 +- .../classfile/editor/InstructionAdder.java | 76 ++ .../classfile/editor/InstructionWriter.java | 16 +- .../{ExceptionAdder.java => InterfaceAdder.java} | 37 +- src/proguard/classfile/editor/InterfaceSorter.java | 48 +- .../classfile/editor/InterfacesEditor.java | 122 +++ src/proguard/classfile/editor/MemberAdder.java | 238 +++-- .../classfile/editor/MemberReferenceFixer.java | 35 +- src/proguard/classfile/editor/MembersEditor.java | 92 -- .../classfile/editor/MethodInvocationFixer.java | 2 +- .../NamedAttributeDeleter.java} | 29 +- .../classfile/editor/StackSizeUpdater.java | 2 +- .../editor/SubclassAdder.java} | 26 +- .../editor/SubclassToAdder.java} | 27 +- src/proguard/classfile/editor/VariableEditor.java | 2 +- .../classfile/editor/VariableRemapper.java | 2 +- .../classfile/editor/VariableSizeUpdater.java | 16 +- .../classfile/instruction/BranchInstruction.java | 2 +- .../classfile/instruction/ConstantInstruction.java | 2 +- .../classfile/instruction/Instruction.java | 4 +- .../instruction/InstructionConstants.java | 2 +- .../classfile/instruction/InstructionFactory.java | 2 +- .../classfile/instruction/InstructionUtil.java | 2 +- .../instruction/LookUpSwitchInstruction.java | 2 +- .../classfile/instruction/SimpleInstruction.java | 2 +- .../classfile/instruction/SwitchInstruction.java | 2 +- .../instruction/TableSwitchInstruction.java | 2 +- .../classfile/instruction/VariableInstruction.java | 2 +- .../instruction/visitor/AllInstructionVisitor.java | 2 +- .../instruction/visitor/InstructionCounter.java | 2 +- .../instruction/visitor/InstructionVisitor.java | 2 +- .../visitor/MultiInstructionVisitor.java | 2 +- src/proguard/classfile/io/LibraryClassReader.java | 8 +- src/proguard/classfile/io/ProgramClassReader.java | 16 +- src/proguard/classfile/io/ProgramClassWriter.java | 2 +- src/proguard/classfile/io/RuntimeDataInput.java | 2 +- src/proguard/classfile/io/RuntimeDataOutput.java | 2 +- src/proguard/classfile/util/AccessUtil.java | 2 +- .../classfile/util/ClassReferenceInitializer.java | 122 ++- .../util/ClassSubHierarchyInitializer.java | 2 +- .../util/ClassSuperHierarchyInitializer.java | 59 +- src/proguard/classfile/util/ClassUtil.java | 10 +- .../classfile/util/DescriptorClassEnumeration.java | 21 +- .../util/DynamicClassReferenceInitializer.java | 49 +- .../util/DynamicMemberReferenceInitializer.java | 2 +- .../classfile/util/ExternalTypeEnumeration.java | 2 +- .../classfile/util/InstructionSequenceMatcher.java | 2 +- .../classfile/util/InternalTypeEnumeration.java | 180 ++-- src/proguard/classfile/util/MemberFinder.java | 2 +- src/proguard/classfile/util/MethodLinker.java | 49 +- src/proguard/classfile/util/SimplifiedVisitor.java | 2 +- src/proguard/classfile/util/StringSharer.java | 2 +- src/proguard/classfile/util/WarningPrinter.java | 2 +- .../classfile/visitor/AllClassVisitor.java | 2 +- .../classfile/visitor/AllFieldVisitor.java | 2 +- .../classfile/visitor/AllMemberVisitor.java | 2 +- .../classfile/visitor/AllMethodVisitor.java | 2 +- .../classfile/visitor/BottomClassFilter.java | 2 +- .../classfile/visitor/ClassAccessFilter.java | 2 +- src/proguard/classfile/visitor/ClassCleaner.java | 8 +- src/proguard/classfile/visitor/ClassCollector.java | 16 +- src/proguard/classfile/visitor/ClassCounter.java | 2 +- .../visitor/ClassForNameClassVisitor.java | 2 +- .../classfile/visitor/ClassHierarchyTraveler.java | 2 +- .../classfile/visitor/ClassMemberVisitor.java | 88 -- .../classfile/visitor/ClassNameFilter.java | 19 +- .../classfile/visitor/ClassPoolFiller.java | 2 +- .../classfile/visitor/ClassPoolVisitor.java | 2 +- .../classfile/visitor/ClassPresenceFilter.java | 2 +- src/proguard/classfile/visitor/ClassPrinter.java | 39 +- .../classfile/visitor/ClassVersionFilter.java | 16 +- .../classfile/visitor/ClassVersionSetter.java | 16 +- src/proguard/classfile/visitor/ClassVisitor.java | 2 +- .../visitor/ConcreteClassDownTraveler.java | 2 +- .../classfile/visitor/DotClassClassVisitor.java | 2 +- ...ttomClassFilter.java => ExceptClassFilter.java} | 28 +- ...omClassFilter.java => ExceptClassesFilter.java} | 51 +- .../classfile/visitor/ExceptionCounter.java | 2 +- .../visitor/ExceptionExcludedOffsetFilter.java | 16 +- .../classfile/visitor/ExceptionOffsetFilter.java | 16 +- .../classfile/visitor/ExceptionRangeFilter.java | 16 +- .../ImplementedClassConstantFilter.java} | 48 +- ...lassFilter.java => ImplementedClassFilter.java} | 32 +- .../visitor/ImplementingClassConstantFilter.java | 70 ++ .../classfile/visitor/LibraryClassFilter.java | 2 +- .../classfile/visitor/LibraryMemberFilter.java | 2 +- .../classfile/visitor/MemberAccessFilter.java | 2 +- .../classfile/visitor/MemberClassAccessFilter.java | 2 +- .../{ClassPoolFiller.java => MemberCollector.java} | 30 +- src/proguard/classfile/visitor/MemberCounter.java | 4 +- .../classfile/visitor/MemberDescriptorFilter.java | 18 +- .../classfile/visitor/MemberNameFilter.java | 18 +- .../classfile/visitor/MemberToClassVisitor.java | 4 +- src/proguard/classfile/visitor/MemberVisitor.java | 2 +- .../visitor/MethodImplementationFilter.java | 2 +- .../visitor/MethodImplementationTraveler.java | 86 +- .../classfile/visitor/MultiClassPoolVisitor.java | 2 +- .../classfile/visitor/MultiClassVisitor.java | 2 +- .../classfile/visitor/MultiMemberVisitor.java | 2 +- .../classfile/visitor/NamedClassVisitor.java | 2 +- .../classfile/visitor/NamedFieldVisitor.java | 4 +- .../classfile/visitor/NamedMethodVisitor.java | 4 +- .../classfile/visitor/ProgramClassFilter.java | 2 +- .../classfile/visitor/ProgramMemberFilter.java | 2 +- .../classfile/visitor/ReferencedClassVisitor.java | 6 +- .../classfile/visitor/ReferencedMemberVisitor.java | 2 +- .../classfile/visitor/SimilarMemberVisitor.java | 125 +++ .../classfile/visitor/SimpleClassPrinter.java | 2 +- ...{BottomClassFilter.java => SubclassFilter.java} | 50 +- ...braryClassFilter.java => SubclassTraveler.java} | 22 +- .../classfile/visitor/VariableClassVisitor.java | 2 +- .../classfile/visitor/VariableMemberVisitor.java | 2 +- src/proguard/evaluation/BasicBranchUnit.java | 2 +- src/proguard/evaluation/BasicInvocationUnit.java | 60 +- src/proguard/evaluation/BranchUnit.java | 2 +- src/proguard/evaluation/InvocationUnit.java | 2 +- src/proguard/evaluation/MutableValue.java | 149 --- src/proguard/evaluation/Processor.java | 44 +- src/proguard/evaluation/Stack.java | 2 +- src/proguard/evaluation/TracedStack.java | 7 +- src/proguard/evaluation/TracedVariables.java | 7 +- src/proguard/evaluation/Variables.java | 2 +- src/proguard/evaluation/value/Category1Value.java | 2 +- src/proguard/evaluation/value/Category2Value.java | 2 +- .../value/{TopValue.java => ComparisonValue.java} | 44 +- .../evaluation/value/CompositeDoubleValue.java | 81 ++ .../evaluation/value/CompositeFloatValue.java | 81 ++ .../evaluation/value/CompositeIntegerValue.java | 87 ++ .../evaluation/value/CompositeLongValue.java | 87 ++ .../{TopValue.java => ConvertedByteValue.java} | 39 +- ...{TopValue.java => ConvertedCharacterValue.java} | 39 +- .../{TopValue.java => ConvertedDoubleValue.java} | 39 +- .../{TopValue.java => ConvertedFloatValue.java} | 39 +- .../{TopValue.java => ConvertedIntegerValue.java} | 39 +- .../{TopValue.java => ConvertedLongValue.java} | 39 +- .../{TopValue.java => ConvertedShortValue.java} | 39 +- src/proguard/evaluation/value/DoubleValue.java | 263 +++--- src/proguard/evaluation/value/FloatValue.java | 258 +++--- .../{TopValue.java => IdentifiedDoubleValue.java} | 42 +- .../{TopValue.java => IdentifiedFloatValue.java} | 42 +- .../{TopValue.java => IdentifiedIntegerValue.java} | 42 +- .../{TopValue.java => IdentifiedLongValue.java} | 42 +- .../evaluation/value/IdentifiedReferenceValue.java | 91 ++ .../evaluation/value/IdentifiedValueFactory.java | 75 ++ .../evaluation/value/InstructionOffsetValue.java | 16 +- src/proguard/evaluation/value/IntegerValue.java | 735 +++++++++++---- src/proguard/evaluation/value/LongValue.java | 314 +++++-- .../{TopValue.java => NegatedDoubleValue.java} | 40 +- .../{TopValue.java => NegatedFloatValue.java} | 40 +- .../{TopValue.java => NegatedIntegerValue.java} | 40 +- .../value/{TopValue.java => NegatedLongValue.java} | 40 +- ...DoubleValue.java => ParticularDoubleValue.java} | 123 ++- .../evaluation/value/ParticularFloatValue.java | 210 +++++ ...tegerValue.java => ParticularIntegerValue.java} | 225 +++-- .../evaluation/value/ParticularLongValue.java | 271 ++++++ src/proguard/evaluation/value/ReferenceValue.java | 25 +- .../evaluation/value/SpecificDoubleValue.java | 98 +- .../evaluation/value/SpecificFloatValue.java | 98 +- .../evaluation/value/SpecificIntegerValue.java | 180 ++-- .../evaluation/value/SpecificLongValue.java | 130 ++- .../evaluation/value/SpecificValueFactory.java | 38 +- src/proguard/evaluation/value/TopValue.java | 12 +- .../evaluation/value/UnknownDoubleValue.java | 125 +++ .../evaluation/value/UnknownFloatValue.java | 125 +++ .../evaluation/value/UnknownIntegerValue.java | 216 +++++ .../evaluation/value/UnknownLongValue.java | 160 ++++ src/proguard/evaluation/value/Value.java | 17 +- src/proguard/evaluation/value/ValueFactory.java | 28 +- src/proguard/gui/ClassPathPanel.java | 8 +- src/proguard/gui/ClassSpecificationDialog.java | 36 +- src/proguard/gui/ClassSpecificationsPanel.java | 2 +- src/proguard/gui/ExtensionFileFilter.java | 2 +- src/proguard/gui/FilterDialog.java | 2 +- src/proguard/gui/GUIResources.java | 2 +- src/proguard/gui/GUIResources.properties | 18 +- src/proguard/gui/KeepSpecificationsPanel.java | 2 +- src/proguard/gui/ListPanel.java | 8 +- src/proguard/gui/MANIFEST.MF | 3 + src/proguard/gui/MemberSpecificationDialog.java | 2 +- src/proguard/gui/MemberSpecificationsPanel.java | 2 +- src/proguard/gui/MessageDialogRunnable.java | 2 +- src/proguard/gui/ProGuardGUI.java | 174 ++-- src/proguard/gui/ProGuardRunnable.java | 2 +- src/proguard/gui/ReTraceRunnable.java | 2 +- src/proguard/gui/SwingUtil.java | 2 +- src/proguard/gui/TabbedPane.java | 2 +- src/proguard/gui/TextAreaOutputStream.java | 2 +- src/proguard/gui/boilerplate.pro | 4 +- src/proguard/gui/default.pro | 2 +- src/proguard/gui/splash/BufferedSprite.java | 2 +- src/proguard/gui/splash/CircleSprite.java | 2 +- src/proguard/gui/splash/ClipSprite.java | 2 +- src/proguard/gui/splash/ColorSprite.java | 2 +- src/proguard/gui/splash/CompositeSprite.java | 2 +- src/proguard/gui/splash/ConstantColor.java | 2 +- src/proguard/gui/splash/ConstantDouble.java | 2 +- src/proguard/gui/splash/ConstantFont.java | 2 +- src/proguard/gui/splash/ConstantInt.java | 2 +- src/proguard/gui/splash/ConstantString.java | 2 +- src/proguard/gui/splash/ConstantTiming.java | 2 +- src/proguard/gui/splash/FontSprite.java | 2 +- src/proguard/gui/splash/ImageSprite.java | 2 +- src/proguard/gui/splash/LinearColor.java | 2 +- src/proguard/gui/splash/LinearDouble.java | 2 +- src/proguard/gui/splash/LinearInt.java | 2 +- src/proguard/gui/splash/LinearTiming.java | 2 +- src/proguard/gui/splash/OverrideGraphics2D.java | 2 +- src/proguard/gui/splash/RectangleSprite.java | 2 +- src/proguard/gui/splash/SawToothTiming.java | 2 +- src/proguard/gui/splash/ShadowedSprite.java | 2 +- src/proguard/gui/splash/SineTiming.java | 2 +- src/proguard/gui/splash/SmoothTiming.java | 2 +- src/proguard/gui/splash/SplashPanel.java | 2 +- src/proguard/gui/splash/Sprite.java | 2 +- src/proguard/gui/splash/TextSprite.java | 2 +- src/proguard/gui/splash/TimeSwitchSprite.java | 2 +- src/proguard/gui/splash/Timing.java | 2 +- src/proguard/gui/splash/TypeWriterString.java | 2 +- src/proguard/gui/splash/VariableColor.java | 2 +- src/proguard/gui/splash/VariableDouble.java | 2 +- src/proguard/gui/splash/VariableFont.java | 2 +- src/proguard/gui/splash/VariableInt.java | 2 +- src/proguard/gui/splash/VariableSizeFont.java | 2 +- src/proguard/gui/splash/VariableString.java | 2 +- src/proguard/io/CascadingDataEntryWriter.java | 2 +- src/proguard/io/ClassFilter.java | 2 +- src/proguard/io/ClassReader.java | 2 +- src/proguard/io/ClassRewriter.java | 2 +- src/proguard/io/DataEntry.java | 2 +- src/proguard/io/DataEntryCopier.java | 2 +- src/proguard/io/DataEntryFilter.java | 2 +- src/proguard/io/DataEntryNameFilter.java | 2 +- src/proguard/io/DataEntryParentFilter.java | 2 +- src/proguard/io/DataEntryPump.java | 2 +- src/proguard/io/DataEntryReader.java | 2 +- src/proguard/io/DataEntryRenamer.java | 4 +- src/proguard/io/DataEntryRewriter.java | 2 +- src/proguard/io/DataEntryWriter.java | 2 +- src/proguard/io/DirectoryPump.java | 2 +- src/proguard/io/DirectoryWriter.java | 2 +- src/proguard/io/FileDataEntry.java | 2 +- src/proguard/io/FilteredDataEntryReader.java | 2 +- src/proguard/io/FilteredDataEntryWriter.java | 2 +- src/proguard/io/Finisher.java | 2 +- src/proguard/io/JarReader.java | 2 +- src/proguard/io/JarWriter.java | 2 +- src/proguard/io/ParentDataEntryWriter.java | 2 +- src/proguard/io/RenamedDataEntry.java | 2 +- src/proguard/io/ZipDataEntry.java | 2 +- src/proguard/obfuscate/AttributeShrinker.java | 2 +- src/proguard/obfuscate/AttributeUsageMarker.java | 2 +- src/proguard/obfuscate/ClassObfuscator.java | 60 +- src/proguard/obfuscate/ClassOpener.java | 127 --- src/proguard/obfuscate/ClassRenamer.java | 21 +- src/proguard/obfuscate/DictionaryNameFactory.java | 21 +- src/proguard/obfuscate/MapCleaner.java | 2 +- src/proguard/obfuscate/MappingKeeper.java | 2 +- src/proguard/obfuscate/MappingPrinter.java | 2 +- src/proguard/obfuscate/MappingProcessor.java | 2 +- src/proguard/obfuscate/MappingReader.java | 2 +- src/proguard/obfuscate/MemberNameCleaner.java | 2 +- src/proguard/obfuscate/MemberNameCollector.java | 2 +- .../obfuscate/MemberNameConflictFixer.java | 2 +- src/proguard/obfuscate/MemberObfuscator.java | 2 +- .../obfuscate/MemberSpecialNameFilter.java | 2 +- src/proguard/obfuscate/MultiMappingProcessor.java | 2 +- src/proguard/obfuscate/NameAndTypeShrinker.java | 2 +- src/proguard/obfuscate/NameAndTypeUsageMarker.java | 2 +- src/proguard/obfuscate/NameFactory.java | 2 +- src/proguard/obfuscate/NameFactoryResetter.java | 2 +- src/proguard/obfuscate/NameMarker.java | 53 +- src/proguard/obfuscate/Obfuscator.java | 51 +- src/proguard/obfuscate/SimpleNameFactory.java | 2 +- src/proguard/obfuscate/SourceFileRenamer.java | 10 +- src/proguard/obfuscate/SpecialNameFactory.java | 2 +- src/proguard/obfuscate/Utf8Shrinker.java | 2 +- src/proguard/obfuscate/Utf8UsageMarker.java | 2 +- src/proguard/optimize/ChangedCodePrinter.java | 2 +- src/proguard/optimize/ConstantMemberFilter.java | 20 +- .../optimize/DuplicateInitializerFixer.java | 13 +- .../DuplicateInitializerInvocationFixer.java | 31 +- src/proguard/optimize/KeepMarker.java | 2 +- .../optimize/MemberDescriptorSpecializer.java | 16 +- .../optimize/MethodDescriptorShrinker.java | 37 +- src/proguard/optimize/MethodStaticizer.java | 2 +- .../optimize/OptimizationInfoMemberFilter.java | 16 +- src/proguard/optimize/Optimizer.java | 307 ++++--- src/proguard/optimize/ParameterShrinker.java | 16 +- src/proguard/optimize/TailRecursionSimplifier.java | 335 +++++++ .../optimize/UnusedParameterInvocationUnit.java | 132 --- src/proguard/optimize/WriteOnlyFieldFilter.java | 2 +- .../optimize/evaluation/EvaluationSimplifier.java | 995 +++++++++++++-------- .../optimize/evaluation/LivenessAnalyzer.java | 16 +- .../optimize/evaluation/LoadingInvocationUnit.java | 83 +- .../optimize/evaluation/PartialEvaluator.java | 19 +- .../optimize/evaluation/StoringInvocationUnit.java | 25 +- .../optimize/evaluation/TracedBranchUnit.java | 2 +- .../optimize/evaluation/VariableOptimizer.java | 16 +- src/proguard/optimize/info/AccessMethodMarker.java | 16 +- .../optimize/info/BackwardBranchMarker.java | 2 +- .../optimize/info/CatchExceptionMarker.java | 16 +- .../optimize/info/ClassOptimizationInfo.java | 63 +- .../info/ClassOptimizationInfoSetter.java} | 36 +- .../info/DotClassFilter.java} | 19 +- .../info/DotClassMarker.java} | 79 +- .../optimize/info/ExceptionInstructionChecker.java | 99 +- .../optimize/info/FieldOptimizationInfo.java | 16 +- .../info/InstanceofClassFilter.java} | 19 +- .../info/InstanceofClassMarker.java} | 80 +- .../info/InstantiationClassFilter.java} | 18 +- .../info/InstantiationClassMarker.java} | 80 +- .../info/MemberOptimizationInfoSetter.java | 2 +- .../optimize/info/MethodInvocationMarker.java | 16 +- .../optimize/info/MethodOptimizationInfo.java | 2 +- .../optimize/info/NoSideEffectMethodMarker.java | 2 +- .../optimize/info/NonPrivateMemberMarker.java | 2 +- ...PackageVisibleMemberContainingClassMarker.java} | 38 +- .../PackageVisibleMemberInvokingClassMarker.java | 81 ++ .../optimize/info/ParameterUsageMarker.java | 30 +- .../optimize/info/ReadWriteFieldMarker.java | 2 +- .../info/SideEffectInstructionChecker.java | 16 +- .../optimize/info/SideEffectMethodMarker.java | 2 +- .../optimize/info/SingleImplementationMarker.java | 179 ---- .../optimize/info/SuperInvocationMarker.java | 16 +- .../optimize/info/VariableUsageMarker.java | 2 +- .../optimize/peephole/BranchTargetFinder.java | 11 +- src/proguard/optimize/peephole/ClassFinalizer.java | 2 +- src/proguard/optimize/peephole/ClassMerger.java | 541 +++++++++++ .../optimize/peephole/GotoCommonCodeReplacer.java | 2 +- .../optimize/peephole/GotoGotoReplacer.java | 2 +- .../optimize/peephole/GotoReturnReplacer.java | 2 +- .../optimize/peephole/HorizontalClassMerger.java | 90 ++ .../peephole/InstructionSequenceConstants.java | 268 +++++- .../peephole/InstructionSequenceReplacer.java | 2 +- .../peephole/InstructionSequencesReplacer.java | 2 +- .../optimize/peephole/LoadStoreRemover.java | 2 +- .../optimize/peephole/MemberPrivatizer.java | 2 +- src/proguard/optimize/peephole/MethodInliner.java | 81 +- src/proguard/optimize/peephole/NopRemover.java | 2 +- .../optimize/peephole/PeepholeOptimizer.java | 2 +- src/proguard/optimize/peephole/PushPopRemover.java | 2 +- .../optimize/peephole/ReachableCodeMarker.java | 2 +- .../RetargetedInnerClassAttributeRemover.java | 140 +++ .../peephole/SingleImplementationFixer.java | 169 ---- .../peephole/SingleImplementationInliner.java | 307 ------- .../optimize/peephole/StoreLoadReplacer.java | 2 +- .../optimize/peephole/TargetClassChanger.java | 439 +++++++++ .../optimize/peephole/UnreachableCodeRemover.java | 2 +- .../peephole/UnreachableExceptionRemover.java | 2 +- .../optimize/peephole/VariableShrinker.java | 16 +- .../optimize/peephole/VerticalClassMerger.java | 88 ++ src/proguard/preverify/CodePreverifier.java | 66 +- src/proguard/preverify/CodeSubroutineInliner.java | 16 +- src/proguard/preverify/Preverifier.java | 2 +- src/proguard/preverify/SubroutineInliner.java | 16 +- src/proguard/retrace/MANIFEST.MF | 3 + src/proguard/retrace/ReTrace.java | 2 +- src/proguard/retrace/StackTrace.java | 2 +- src/proguard/retrace/StackTraceItem.java | 2 +- src/proguard/shrink/AnnotationUsageMarker.java | 16 +- src/proguard/shrink/ClassShrinker.java | 77 +- src/proguard/shrink/InnerUsageMarker.java | 33 +- src/proguard/shrink/InterfaceUsageMarker.java | 58 +- src/proguard/shrink/ShortestUsageMark.java | 28 +- src/proguard/shrink/ShortestUsageMarker.java | 28 +- src/proguard/shrink/ShortestUsagePrinter.java | 4 +- src/proguard/shrink/Shrinker.java | 3 +- src/proguard/shrink/UsageMarker.java | 139 +-- src/proguard/shrink/UsagePrinter.java | 2 +- src/proguard/shrink/UsedClassFilter.java | 2 +- src/proguard/shrink/UsedMemberFilter.java | 16 +- src/proguard/util/AndMatcher.java | 2 +- src/proguard/util/ClassNameParser.java | 2 +- src/proguard/util/EmptyStringMatcher.java | 2 +- src/proguard/util/ExtensionMatcher.java | 2 +- src/proguard/util/FileNameParser.java | 2 +- src/proguard/util/FixedStringMatcher.java | 7 +- src/proguard/util/ListMatcher.java | 2 +- src/proguard/util/ListParser.java | 2 +- src/proguard/util/ListUtil.java | 2 +- src/proguard/util/NameParser.java | 2 +- src/proguard/util/NotMatcher.java | 2 +- src/proguard/util/OrMatcher.java | 2 +- src/proguard/util/SettableMatcher.java | 4 +- src/proguard/util/StringMatcher.java | 2 +- src/proguard/util/StringParser.java | 2 +- src/proguard/util/VariableStringMatcher.java | 2 +- src/proguard/wtk/ProGuardObfuscator.java | 2 +- src/proguard/wtk/default.pro | 1 + 603 files changed, 13693 insertions(+), 6923 deletions(-) diff --cc debian/changelog index 48bce27,0000000..08e2fa5 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,69 -1,0 +1,77 @@@ ++proguard (4.3-1) unstable; urgency=low ++ ++ * New upstream release ++ * Bump standards version to 3.8.1 ++ * Remove build-depend on jikes (use javac instead) ++ ++ -- Sam Clegg <[email protected]> Wed, 20 May 2009 08:21:13 +0100 ++ +proguard (4.2-1) unstable; urgency=low + + * New upstream release + * Fix build of ant task (Closes: #459829) + Thanks to Hans van Kranenburg <[email protected]> + + -- Sam Clegg <[email protected]> Thu, 15 May 2008 10:39:48 +0100 + +proguard (4.1-1) unstable; urgency=low + + * New upstream release + * fix watch file. Closes: #450042 + + -- Sam Clegg <[email protected]> Thu, 03 Jan 2008 00:18:30 +0000 + +proguard (3.9-1) unstable; urgency=low + + * New upstream release + * Bump standard version to 3.7.2. + * Add ant task jar file. Closes: #423009 + * Fix file names in jar files. Closes: #435808 + + -- Sam Clegg <[email protected]> Mon, 06 Aug 2007 10:34:24 +0100 + +proguard (3.7-1) unstable; urgency=low + + * New upstream release + * debian/control: make Arch: all (Closes: #360115) + * use "$@" rather then $* in shell startup scripts (Closes: #364962) + + -- Sam Clegg <[email protected]> Sat, 13 Jan 2007 12:27:45 +0000 + +proguard (3.4-1) unstable; urgency=low + + * New upstream release (Closes: #338355) + * debian/control: bump standards version + * debian/copyright: update FSF address + * increase java stack size for proguard and proguardgui + + -- Sam Clegg <[email protected]> Sun, 13 Nov 2005 09:42:59 +0000 + +proguard (3.3.2-1) unstable; urgency=low + + * New upstream release + * Build-Depend on ant rather than libant-java (Closes: #326434) + + -- Sam Clegg <[email protected]> Sun, 4 Sep 2005 14:59:21 +0100 + +proguard (3.2-3) unstable; urgency=low + + * debian/rules: fix FTBFS (Closes: #312024) + * debian/control: fix FTBFS by added Build-Depend on fastjar + - Thanks to Regis Boudin <[email protected]> + + -- Sam Clegg <[email protected]> Fri, 17 Jun 2005 14:25:24 +0100 + +proguard (3.2-2) unstable; urgency=low + + * fix java executable name in proguard and proguardgui shell + scripts (Closes: #311966) + + -- Sam Clegg <[email protected]> Sat, 4 Jun 2005 21:17:01 +0100 + +proguard (3.2-1) unstable; urgency=low + + * Initial Release (Closes: #310044). + + -- Sam Clegg <[email protected]> Thu, 2 Jun 2005 17:01:06 +0100 + diff --cc debian/compat index b8626c4,0000000..7f8f011 mode 100644,000000..100644 --- a/debian/compat +++ b/debian/compat @@@ -1,1 -1,0 +1,1 @@@ - 4 ++7 diff --cc debian/control index cfd1802,0000000..bb6a8ac mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,17 -1,0 +1,17 @@@ +Source: proguard +Section: devel +Priority: optional +Maintainer: Sam Clegg <[email protected]> - Build-Depends: debhelper (>= 4.1.0), cdbs, jikes-classpath, ant, fastjar - Standards-Version: 3.7.3 ++Build-Depends: debhelper (>= 7.0.15), cdbs, gcj-4.3, ant, fastjar ++Standards-Version: 3.8.1 + +Package: proguard +Architecture: all +Depends: ${misc:Depends}, kaffe | java-virtual-machine +Description: java class file shrinker, optimizer, and obfuscator + ProGuard is a free Java class file shrinker, optimizer, and + obfuscator. It can detect and remove unused classes, fields, + methods, and attributes. It can then optimize bytecode and remove + unused instructions. Finally, it can rename the remaining classes, + fields, and methods using short meaningless names. The resulting jars + are smaller and harder to reverse-engineer. diff --cc debian/copyright index 234c50e,0000000..8242f43 mode 100644,000000..100644 --- a/debian/copyright +++ b/debian/copyright @@@ -1,26 -1,0 +1,26 @@@ +This package was debianized by Sam Clegg <[email protected]> on +Tue, 17 May 2005 12:25:04 +0100. + +It was downloaded from http://proguard.sourceforge.net/ + - Copyright Holder: Eric Lafortune <[email protected]>. ++Proguard is Copyright (C) 2002-2008 Eric Lafortune <[email protected]>. + +License: + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) any +later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. diff --cc debian/rules index d4ba74f,0000000..fac72c2 mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,28 -1,0 +1,28 @@@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/cdbs/1/rules/buildcore.mk +include /usr/share/cdbs/1/rules/debhelper.mk + - JAVA_COMPILER = jikes-classpath +E +Z0 - JAR = jar - ANTJAR = /usr/share/ant/lib/ant.jar ++JAVA_COMPILER=javac ++JAR=jar ++ANTJAR=/usr/share/ant/lib/ant.jar + +build: + mkdir -p build + mkdir -p lib + ${JAVA_COMPILER} -d build/retrace -sourcepath src src/proguard/retrace/ReTrace.java + ${JAVA_COMPILER} -d build/proguard -sourcepath src src/proguard/ProGuard.java + ${JAVA_COMPILER} -d build/proguardgui -cp build/proguard -sourcepath src src/proguard/gui/ProGuardGUI.java + ${JAVA_COMPILER} -d build/proguardtask -sourcepath src -cp ${ANTJAR} src/proguard/ant/ProGuardTask.java src/proguard/ProGuard.java + ${JAR} cfm lib/proguard.jar proguard.manifest -C build/proguard proguard + ${JAR} cfm lib/proguardgui.jar proguardgui.manifest -C build/proguardgui proguard + ${JAR} cfm lib/ant-proguard.jar proguard.manifest -C build/proguardtask proguard + cd src && ${JAR} uf ../lib/proguardgui.jar proguard/gui/vtitle.gif proguard/gui/arrow.gif proguard/gui/default.pro proguard/gui/GUIResources.properties proguard/gui/boilerplate.pro + cd src && ${JAR} uf ../lib/ant-proguard.jar proguard/ant/task.properties + +clean:: + rm -rf build/ + rm -rf lib/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/proguard.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
