[SCM] simplyhtml packaging branch, master, updated. upstream/0.16.05-14-g2642d23

Felix Natter fnatter at gmx.net
Thu Feb 21 14:29:39 UTC 2013


The following commit has been merged in the master branch:
commit 2642d23ad02f19422fa15bec2157b8fbc5899abf
Author: Felix Natter <fnatter at gmx.net>
Date:   Thu Feb 21 15:27:50 2013 +0100

    fix lintian "codeless jar" warning by creating SimplyHTMLHelp-XX.jar without a manifest

diff --git a/debian/patches/40_fix_codeless_jar.patch b/debian/patches/40_fix_codeless_jar.patch
new file mode 100644
index 0000000..57a08aa
--- /dev/null
+++ b/debian/patches/40_fix_codeless_jar.patch
@@ -0,0 +1,20 @@
+use <zip> ant target for SimplyHTMLHelp-XXX.jar because (as opposed to <jar>)
+this will not create a manifest file. This fixes a lintian "codeless jar" warning.
+
+--- a/src/build.xml
++++ b/src/build.xml
+@@ -93,12 +93,12 @@
+  				<include name="com/lightdev/app/shtm/resources/**"/>
+ 			</fileset>
+ 		</jar>
+-		<jar jarfile="${SimplyHTMLHelp.jar}"
++		<zip destfile="${SimplyHTMLHelp.jar}"
+ 			update="true">
+ 			<fileset dir="${src}">
+ 				<include name="com/lightdev/app/shtm/help/**"/>
+ 			</fileset>
+-		</jar>
++		</zip>
+ 		<copy file="${jhall.jar}" tofile="${dist.lib}/jhall.jar" />
+ 		<copy file="${gnu-regexp.jar}" tofile="${dist.lib}/gnu-regexp.jar" />
+ 		<zip destfile="${dist}/SimplyHTML_bin_${version}.zip">
diff --git a/debian/patches/series b/debian/patches/series
index 7b54d0d..c925f8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 10_build_xml.patch
 30_manifest.patch
+40_fix_codeless_jar.patch

-- 
simplyhtml packaging



More information about the pkg-java-commits mailing list