Package: bootchart-view Version: 0.10~svn407-3 Severity: wishlist Tags: patch
Hi Jörg, Ages ago we talked about bootchart using jlibeps for EPS rendering and I see that bootchart is now using jlibeps rather than the rather difficult-to-find EPSGraphics2D library. Now that jlibeps is available in Debian as a separate package, it would be preferable to use it in bootchart-view rather than an internal copy of the jlibeps library. The attached patch changes the build-depends for the package to use libjlibeps-java and adds the private copy of jlibeps to the list of internal libaries to be removed at build time. It also brings in libjlibeps-java as a dependency of bootchart-view. Let me know if you have any queries or comments about switching over to use jlibeps. regards Stuart
diff -u bootchart-0.10~svn407/debian/rules bootchart-0.10~svn407/debian/rules --- bootchart-0.10~svn407/debian/rules +++ bootchart-0.10~svn407/debian/rules @@ -9,7 +9,7 @@ # Force ant to use gcj as JDK to make the build more reproducible export JAVA_HOME=/usr/lib/jvm/java-gcj -export CLASSPATH=/usr/share/java/commons-cli.jar:/usr/share/java/commons-compress.jar +export CLASSPATH=/usr/share/java/commons-cli.jar:/usr/share/java/commons-compress.jar:/usr/share/java/net.sourceforge.jlibeps.jar # This has to be exported to make some magic below work. export DH_OPTIONS diff -u bootchart-0.10~svn407/debian/control bootchart-0.10~svn407/debian/control --- bootchart-0.10~svn407/debian/control +++ bootchart-0.10~svn407/debian/control @@ -4,7 +4,7 @@ Maintainer: Jörg Sommer <jo...@alea.gnuu.de> Build-Depends: debhelper, dpatch Build-Depends-Indep: ant, java-gcj-compat-dev, libcommons-cli-java, - libcommons-compress-java + libcommons-compress-java, libjlibeps-java Standards-Version: 3.7.3 Homepage: http://www.bootchart.org/ Vcs-Browser: http://git.debian.org/?p=users/jo-guest/bootchart.git @@ -26,7 +26,7 @@ Package: bootchart-view Architecture: all Depends: java-gcj-compat | java-runtime | java2-runtime, libcommons-cli-java, - libcommons-compress-java + libcommons-compress-java, libjlibeps-java Recommends: bootchart Suggests: gqview, librsvg2-bin, gimp-svg Description: Boot process performance analyser (visualisation) diff -u bootchart-0.10~svn407/debian/bin/bootchart bootchart-0.10~svn407/debian/bin/bootchart --- bootchart-0.10~svn407/debian/bin/bootchart +++ bootchart-0.10~svn407/debian/bin/bootchart @@ -1,7 +1,7 @@ #!/bin/sh MAIN_CLASS="org.bootchart.Main" -CLASSPATH="/usr/share/bootchart-view/bootchart.jar:/usr/share/java/commons-cli.jar:/usr/share/java/commons-compress.jar" +CLASSPATH="/usr/share/bootchart-view/bootchart.jar:/usr/share/java/commons-cli.jar:/usr/share/java/commons-compress.jar:/usr/share/java/net.sourceforge.jlibeps.jar" PROPERTY="java.awt.headless=true" exec java -D"$PROPERTY" -classpath "$CLASSPATH" $MAIN_CLASS "$@" diff -u bootchart-0.10~svn407/debian/patches/remove-internal-libs.dpatch bootchart-0.10~svn407/debian/patches/remove-internal-libs.dpatch --- bootchart-0.10~svn407/debian/patches/remove-internal-libs.dpatch +++ bootchart-0.10~svn407/debian/patches/remove-internal-libs.dpatch @@ -6,8 +6,8 @@ dpatch_patch () { - tar vcf debian/patched/remove-internal-libs.tar lib/org/apache - rm -r lib/org/apache + tar vcf debian/patched/remove-internal-libs.tar lib/org/apache lib/org/sourceforge/jlibeps + rm -r lib/org/apache lib/org/sourceforge/jlibeps } dpatch_unpatch ()
