[electric] 07/09: Update build.patch. Build for Java 7 and change the srcdir to
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Nov 1 10:30:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository electric.
commit 56c5a6a31cafa42b05dcfb3eefe562092b76b5ac
Author: Markus Koschany <apo at debian.org>
Date: Mon Oct 30 22:30:50 2017 +0100
Update build.patch. Build for Java 7 and change the srcdir to
com explicitly to avoid a FTBFS due to Debian's .pc directory. The compiler
complains about duplicate classes.
---
debian/patches/build.patch | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 8ca094b..fb0174f 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/build.xml b/build.xml
-index 88371c8..be0bdcd 100644
+index 88371c8..57e5fbf 100644
--- a/build.xml
+++ b/build.xml
@@ -26,7 +26,7 @@
@@ -37,8 +37,8 @@ index 88371c8..be0bdcd 100644
- <classpath>
- <pathelement location="${packaging}" />
- <pathelement location="${AppleJava}" />
-+ <javac encoding="UTF-8" debug="true" includeantruntime="false" destdir="${antBuild}" srcdir="${ElectricJavaLoc}"
-+ fork="true" memoryMaximumSize="1024m" source="1.6" target="1.6">
++ <javac encoding="UTF-8" debug="true" includeantruntime="false" destdir="${antBuild}" srcdir="com"
++ fork="true" memoryMaximumSize="1024m" source="1.7" target="1.7">
+ <classpath>
+ <pathelement location="/usr/share/java/bsh.jar" />
+ <pathelement location="/usr/share/java/vecmath.jar" />
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/electric.git
More information about the pkg-java-commits
mailing list