The following commit has been merged in the master branch: commit 93fada5c5146cf070b13c9a7898fd5bc6abdfb3e Author: Felix Natter <fnat...@gmx.net> Date: Sun Feb 24 12:33:27 2013 +0100
include classpath in SimplyHTML.jar instead of in simplyhtml.sh (fixes lintian "missing-classpath" warning) diff --git a/debian/patches/30_manifest.patch b/debian/patches/30_manifest.patch deleted file mode 100644 index 1ac2980..0000000 --- a/debian/patches/30_manifest.patch +++ /dev/null @@ -1,9 +0,0 @@ -adapt Class-Path: in MANIFEST.MF ---- simplyhtml-0.12.2.obsolete.0.734595390343205/src/MANIFEST.MF 2008-06-14 12:53:12.000000000 +0200 -+++ simplyhtml-0.12.2/src/MANIFEST.MF 2008-08-03 14:21:44.000000000 +0200 -@@ -1,5 +1,4 @@ - Manifest-Version: 1.0 - Main-Class: com.lightdev.app.shtm.App --Class-Path: SimplyHTML.jar jhall.jar SimplyHTMLHelp.jar gnu-regexp.jar - Created-By: Dimitri Polivaev - diff --git a/debian/patches/series b/debian/patches/series index c925f8a..c50dbcc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 10_build_xml.patch -30_manifest.patch 40_fix_codeless_jar.patch diff --git a/debian/simplyhtml.sh b/debian/simplyhtml.sh index cc81f8e..35fae10 100755 --- a/debian/simplyhtml.sh +++ b/debian/simplyhtml.sh @@ -112,11 +112,11 @@ output_info # The CLASSPATH also lets one specify additional jars, which is good, if # you want to add a new Look&Feel jar (the motif one is so ugly...). # -CLASSPATH="${ADD_JARS}:${CLASSPATH}:\ -/usr/share/java/gnu-regexp.jar:\ -/usr/share/java/jhall.jar:\ -/usr/share/java/SimplyHTMLHelp.jar:\ -/usr/share/java/SimplyHTML.jar:" +#CLASSPATH="${ADD_JARS}:${CLASSPATH}:\ +#/usr/share/java/gnu-regexp.jar:\ +#/usr/share/java/jhall.jar:\ +#/usr/share/java/SimplyHTMLHelp.jar:\ +#/usr/share/java/SimplyHTML.jar:" -_debug "Calling: '${JAVACMD} -cp ${CLASSPATH} com.lightdev.app.shtm.App $@'." -"${JAVACMD}" -cp "${CLASSPATH}" com.lightdev.app.shtm.App "$@" +_debug "Calling: '${JAVACMD} -jar /usr/share/java/SimplyHTML.jar com.lightdev.app.shtm.App $@'." +"${JAVACMD}" -jar /usr/share/java/SimplyHTML.jar com.lightdev.app.shtm.App "$@" -- simplyhtml packaging _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits