reverted: --- proguard-4.3/proguardgui.manifest +++ proguard-4.3.orig/proguardgui.manifest @@ -1 +0,0 @@ -Main-Class: proguard.gui.ProGuardGUI reverted: --- proguard-4.3/proguard.manifest +++ proguard-4.3.orig/proguard.manifest @@ -1 +0,0 @@ -Main-Class: proguard.ProGuard reverted: --- proguard-4.3/debian/links +++ proguard-4.3.orig/debian/links @@ -1 +0,0 @@ -usr/share/java/ant-proguard.jar usr/share/ant/lib/ant-proguard.jar diff -u proguard-4.3/debian/changelog proguard-4.3/debian/changelog --- proguard-4.3/debian/changelog +++ proguard-4.3/debian/changelog @@ -1,3 +1,32 @@ +proguard (4.3-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Merge from Ubuntu. (Closes: #534029) + + -- Onkar Shinde Fri, 11 Sep 2009 10:35:50 +0530 + +proguard (4.3-1ubuntu1) karmic; urgency=low + + * Use upstream ant build script. Fixes FTBFS. + * debian/control + - Add build dependency default-jdk. Remove gcj-4.3, fastjar. + - Set runtime dependency to 'default-jre | java2-runtime'. + - Update standard version to 3.8.3. No change needed. + * debian/rules + - Refresh to use upstream ant build script with help of cdbs ant class. + * debian/install + - Remove ant-proguard.jar. Add retrace.jar + * debian/README.Debian + - Add notes about using ant task. + * debian/links + - Remove. Explained in README.Debian. + * debian/*.manifest + - Delete. Not needed anymore. + * debian/watch + - User better regular expression. + + -- Onkar Shinde Fri, 04 Sep 2009 09:50:26 +0530 + proguard (4.3-1) unstable; urgency=low * New upstream release diff -u proguard-4.3/debian/rules proguard-4.3/debian/rules --- proguard-4.3/debian/rules +++ proguard-4.3/debian/rules @@ -6,23 +6,7 @@ -include /usr/share/cdbs/1/rules/buildcore.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk -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/ +JAVA_HOME := /usr/lib/jvm/default-java +DEB_ANT_BUILDFILE := build/build.xml +DEB_ANT_BUILD_TARGET := basic anttask +DEB_ANT_ARGS := -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 diff -u proguard-4.3/debian/install proguard-4.3/debian/install --- proguard-4.3/debian/install +++ proguard-4.3/debian/install @@ -1,5 +1,5 @@ lib/proguard.jar /usr/share/java lib/proguardgui.jar /usr/share/java -lib/ant-proguard.jar /usr/share/java +lib/retrace.jar /usr/share/java proguard /usr/bin proguardgui /usr/bin diff -u proguard-4.3/debian/control proguard-4.3/debian/control --- proguard-4.3/debian/control +++ proguard-4.3/debian/control @@ -2,12 +2,12 @@ Section: devel Priority: optional Maintainer: Sam Clegg -Build-Depends: debhelper (>= 7.0.15), cdbs, gcj-4.3, ant, fastjar -Standards-Version: 3.8.1 +Build-Depends: debhelper (>= 7.0.15), cdbs, default-jdk, ant +Standards-Version: 3.8.3 Package: proguard Architecture: all -Depends: ${misc:Depends}, kaffe | java-virtual-machine +Depends: ${misc:Depends}, default-jre | java2-runtime 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, diff -u proguard-4.3/debian/watch proguard-4.3/debian/watch --- proguard-4.3/debian/watch +++ proguard-4.3/debian/watch @@ -3 +3 @@ -http://sf.net/proguard/proguard([0-9.]*)\.tar\.gz +http://sf.net/proguard/proguard([\d\.]+)\.tar\.gz only in patch2: unchanged: --- proguard-4.3.orig/debian/README.Debian +++ proguard-4.3/debian/README.Debian @@ -0,0 +1,10 @@ +We are now using the upstream ant build.xml for building proguard. This adds +the classes for ant task in proguard.jar file itself. Hence there is no +separate ant-proguard.jar now. + +Ant upstream authors recommend using classpath attribute for optional ant tasks +which in this case is the proguard task.[1] Hence the symlink to the proguard +jar files in ant's lib directory has been removed. +[1] http://ant.apache.org/manual/install.html#optionalTasks + + -- Onkar Shinde Fri, 04 Sep 2009 10:28:58 +0530