[simplyhtml] 04/09: fix / refresh patches
Felix Natter
fnatter-guest at moszumanska.debian.org
Sun Dec 20 11:11:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository simplyhtml.
commit 5b0d5290adb520b222de717eee45cfe30be5cdea
Author: Felix Natter <fnatter at gmx.net>
Date: Sun Dec 20 11:31:32 2015 +0100
fix / refresh patches
---
debian/patches/10_build_xml.patch | 13 +++++++------
debian/patches/40_fix_codeless_jar.patch | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/debian/patches/10_build_xml.patch b/debian/patches/10_build_xml.patch
index f37db23..6b57b7b 100644
--- a/debian/patches/10_build_xml.patch
+++ b/debian/patches/10_build_xml.patch
@@ -1,18 +1,19 @@
adapt paths to jar dependencies (/usr/share/java/*.jar)
--- a/src/build.xml
+++ b/src/build.xml
-@@ -10,15 +10,15 @@
+@@ -10,16 +10,16 @@
<property name="dist.src" value="${dist}/src" />
<property name="dist.help" value="${dist}/help" />
<property name="dist.lib" value="${dist}/lib" />
- <property name="SimplyHTML.jar" value="${dist.lib}/SimplyHTML.jar"/>
- <property name="SimplyHTMLHelp.jar" value="${dist.lib}/SimplyHTMLHelp.jar"/>
-+ <property name="SimplyHTML.jar" value="${dist.lib}/SimplyHTML-0.16.08.jar"/>
-+ <property name="SimplyHTMLHelp.jar" value="${dist.lib}/SimplyHTMLHelp-0.16.08.jar"/>
++ <property name="SimplyHTML.jar" value="${dist.lib}/SimplyHTML-0.16.11.jar"/>
++ <property name="SimplyHTMLHelp.jar" value="${dist.lib}/SimplyHTMLHelp-0.16.11.jar"/>
+ <property name="SimplyHTMLsources.jar" value="${dist.lib}/SimplyHTML-sources.jar"/>
<property name="post" value="../post" />
<property name="debug" value="on" />
- <property name="java_source_version" value="1.5" />
- <property name="java_target_version" value="1.5" />
+ <property name="java_source_version" value="1.6" />
+ <property name="java_target_version" value="1.6" />
<property name="build.compiler" value="modern" />
- <property name="jhall.jar" value="..\lib\jhall.jar" />
- <property name="gnu-regexp.jar" value="..\lib\gnu-regexp-1.1.4.jar" />
@@ -20,4 +21,4 @@ adapt paths to jar dependencies (/usr/share/java/*.jar)
+ <property name="gnu-regexp.jar" value="/usr/share/java/gnu-regexp.jar" />
<property name="classpath" value="${jhall.jar}:${gnu-regexp.jar}"/>
- <target name="build" depends="clean">
+ <target name="srcjar">
diff --git a/debian/patches/40_fix_codeless_jar.patch b/debian/patches/40_fix_codeless_jar.patch
index 57a08aa..6581cf0 100644
--- a/debian/patches/40_fix_codeless_jar.patch
+++ b/debian/patches/40_fix_codeless_jar.patch
@@ -3,7 +3,7 @@ this will not create a manifest file. This fixes a lintian "codeless jar" warnin
--- a/src/build.xml
+++ b/src/build.xml
-@@ -93,12 +93,12 @@
+@@ -100,12 +100,12 @@
<include name="com/lightdev/app/shtm/resources/**"/>
</fileset>
</jar>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git
More information about the pkg-java-commits
mailing list