[proguard] 09/13: Imported Debian patch 4.2-1

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Apr 10 08:59:19 UTC 2014


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

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

commit fbd3930b7dcb3b995ece469a24fbc78c7c676f38
Merge: 9d70fc0 bc52db2
Author: Sam Clegg <samo at debian.org>
Date:   Thu May 15 10:39:48 2008 +0100

    Imported Debian patch 4.2-1

 debian/changelog                                   |    8 +
 debian/rules                                       |    3 +-
 docs/FAQ.html                                      |   20 +-
 docs/acknowledgements.html                         |    2 +-
 docs/downloads.html                                |   26 +
 docs/manual/ant.html                               |    6 +-
 docs/manual/examples.html                          |   15 +-
 docs/manual/limitations.html                       |   13 +-
 docs/manual/troubleshooting.html                   |  184 +-
 docs/quality.html                                  |    2 +-
 docs/title.html                                    |    2 +-
 examples/annotations/lib/annotations.jar           |  Bin 6123 -> 6123 bytes
 examples/ant/proguard.xml                          |   11 +-
 examples/midlets.pro                               |    3 +-
 examples/proguardgui.pro                           |   17 +-
 src/proguard/ProGuard.java                         |    2 +-
 src/proguard/ant/ConfigurationTask.java            |    4 +-
 src/proguard/classfile/ClassConstants.java         |   41 +-
 .../classfile/editor/ClassReferenceFixer.java      |   14 +-
 .../classfile/editor/CodeAttributeComposer.java    |   76 +-
 .../classfile/editor/CodeAttributeEditor.java      |   53 +-
 .../classfile/editor/MethodInvocationFixer.java    |    4 +-
 src/proguard/classfile/editor/VariableEditor.java  |   11 +-
 .../classfile/editor/VariableSizeUpdater.java      |   12 +-
 src/proguard/classfile/io/ProgramClassReader.java  |    2 +-
 .../classfile/util/ClassReferenceInitializer.java  |    5 +-
 src/proguard/classfile/util/ClassUtil.java         |   66 +-
 .../classfile/util/DescriptorClassEnumeration.java |  164 +-
 .../classfile/util/InternalTypeEnumeration.java    |  152 +-
 src/proguard/classfile/visitor/ClassPrinter.java   |    4 +-
 src/proguard/evaluation/BasicInvocationUnit.java   |    6 +-
 src/proguard/evaluation/TracedStack.java           |  251 +--
 src/proguard/evaluation/TracedVariables.java       |   92 +-
 src/proguard/gui/ClassSpecificationDialog.java     |   30 +-
 src/proguard/gui/GUIResources.properties           |    2 +-
 src/proguard/gui/MemberSpecificationDialog.java    |    2 +-
 src/proguard/gui/ProGuardGUI.java                  |    4 +-
 src/proguard/gui/boilerplate.pro                   |    4 +-
 src/proguard/io/DataEntryRenamer.java              |   61 +-
 src/proguard/obfuscate/ClassObfuscator.java        |    2 +-
 .../optimize/DuplicateInitializerFixer.java        |  212 +++
 .../DuplicateInitializerInvocationFixer.java       |  123 ++
 .../optimize/MethodDescriptorShrinker.java         |  119 +-
 src/proguard/optimize/Optimizer.java               |   84 +-
 src/proguard/optimize/ParameterShrinker.java       |   26 +-
 .../optimize/evaluation/EvaluationSimplifier.java  | 1923 +++++++++++---------
 .../optimize/evaluation/PartialEvaluator.java      |  103 +-
 .../optimize/evaluation/VariableOptimizer.java     |   17 +-
 .../optimize/info/ParameterUsageMarker.java        |   13 +-
 .../optimize/info/VariableUsageMarker.java         |   13 -
 .../peephole/InstructionSequenceConstants.java     |   36 +-
 src/proguard/optimize/peephole/MethodInliner.java  |   85 +-
 .../optimize/peephole/VariableShrinker.java        |   24 +-
 src/proguard/preverify/CodeSubroutineInliner.java  |  167 +-
 src/proguard/shrink/ClassShrinker.java             |   76 +-
 55 files changed, 2571 insertions(+), 1826 deletions(-)

diff --cc debian/changelog
index 29290ce,0000000..48bce27
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,61 -1,0 +1,69 @@@
++proguard (4.2-1) unstable; urgency=low
++
++  * New upstream release
++  * Fix build of ant task (Closes: #459829)
++    Thanks to Hans van Kranenburg <debian at knorrie.org>
++
++ -- Sam Clegg <samo at debian.org>  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 <samo at debian.org>  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 <samo at debian.org>  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 <samo at debian.org>  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 <samo at debian.org>  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 <samo at debian.org>  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 <regis at boudin.name>
 +
 + -- Sam Clegg <samo at debian.org>  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 <samo at debian.org>  Sat,  4 Jun 2005 21:17:01 +0100
 +
 +proguard (3.2-1) unstable; urgency=low
 +
 +  * Initial Release (Closes: #310044).
 +
 + -- Sam Clegg <samo at debian.org>  Thu,  2 Jun 2005 17:01:06 +0100
 +
diff --cc debian/rules
index d1f189e,0000000..d4ba74f
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,27 -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
 +
 +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
- 	cp lib/proguard.jar lib/ant-proguard.jar
++	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



More information about the pkg-java-commits mailing list