[sikuli] 04/06: patch target-java-6.patch

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch 1.0_x_rc3
in repository sikuli.

commit 0ec18bb70de136f969b1581bf2e973158e7f798f
Author: Gilles Filippini <pini at debian.org>
Date:   Sat May 23 11:05:03 2015 +0200

    patch target-java-6.patch
    
    to force java6 bytecode.
---
 debian/changelog                   |  6 +++--
 debian/patches/series              |  1 +
 debian/patches/target-java-6.patch | 53 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0660569..5f6c613 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ sikuli (1.0~x~rc3.tesseract3-dfsg1-9) UNRELEASED; urgency=medium
     - replace deprecated libconstantine-java.jar with jnr-constants.jar
       (closes: #785720)
   * Update patch setTextAndMnemonic.patch accordingly
-  * New patch no-adsense.patch to remove links to google-analytics from
-    documentation
+  * New patches:
+    - no-adsense.patch to remove links to google-analytics from
+      documentation
+    - target-java-6 patch: force java6 compatible bytecode
   * Bump Standards-Version to 3.9.6 (no changes)
 
  -- Gilles Filippini <pini at debian.org>  Sat, 23 May 2015 09:25:23 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 3f9b857..1fe1ded 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ gcc-4.7.patch
 no-opencv-surf-module.patch
 setTextAndMnemonic.patch
 no-adsense.patch
+target-java-6.patch
diff --git a/debian/patches/target-java-6.patch b/debian/patches/target-java-6.patch
new file mode 100644
index 0000000..acc9d9d
--- /dev/null
+++ b/debian/patches/target-java-6.patch
@@ -0,0 +1,53 @@
+Description: force java6 compatible bytecode.
+Index: sikuli/sikuli-ide/src/main/java/CMakeLists.txt
+===================================================================
+--- sikuli.orig/sikuli-ide/src/main/java/CMakeLists.txt
++++ sikuli/sikuli-ide/src/main/java/CMakeLists.txt
+@@ -67,7 +67,7 @@ SET(JAVA_SOURCE_FILES
+ )
+ 
+ add_custom_target( ${PROJECT_NAME}.classes
+-    COMMAND ${JAVA_COMPILE} -d ${BINARY_CLASS_DIR} -classpath "${CLASSPATH}"
++    COMMAND ${JAVA_COMPILE} -d ${BINARY_CLASS_DIR} -classpath "${CLASSPATH}" -source 1.6 -target 6
+             ${JAVA_SOURCE_FILES}
+     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+      
+Index: sikuli/sikuli-ide/src/test/java/CMakeLists.txt
+===================================================================
+--- sikuli.orig/sikuli-ide/src/test/java/CMakeLists.txt
++++ sikuli/sikuli-ide/src/test/java/CMakeLists.txt
+@@ -7,7 +7,7 @@ SET(JAVA_TEST_FILES
+ )
+ 
+ add_custom_target( ${PROJECT_NAME}.test.classes
+-    COMMAND ${JAVA_COMPILE} -d ${TEST_CLASS_DIR} -classpath "${CLASSPATH}${SEP}${JUNIT_JAR}${SEP}${BINARY_CLASS_DIR}"
++    COMMAND ${JAVA_COMPILE} -d ${TEST_CLASS_DIR} -classpath "${CLASSPATH}${SEP}${JUNIT_JAR}${SEP}${BINARY_CLASS_DIR}" -source 1.6 -target 6
+             ${JAVA_TEST_FILES}
+     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+      
+Index: sikuli/sikuli-script/src/main/java/CMakeLists.txt
+===================================================================
+--- sikuli.orig/sikuli-script/src/main/java/CMakeLists.txt
++++ sikuli/sikuli-script/src/main/java/CMakeLists.txt
+@@ -69,7 +69,7 @@ SET(JAVA_SOURCE_FILES
+ )
+ 
+ add_custom_target( ${PROJECT_NAME}.classes
+-    COMMAND ${JAVA_COMPILE} -d ${BINARY_CLASS_DIR} -classpath "${CLASSPATH}"
++    COMMAND ${JAVA_COMPILE} -d ${BINARY_CLASS_DIR} -classpath "${CLASSPATH}" -source 1.6 -target 6
+             ${JAVA_SOURCE_FILES}
+     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+      
+Index: sikuli/sikuli-script/src/test/java/CMakeLists.txt
+===================================================================
+--- sikuli.orig/sikuli-script/src/test/java/CMakeLists.txt
++++ sikuli/sikuli-script/src/test/java/CMakeLists.txt
+@@ -7,7 +7,7 @@ SET(JAVA_TEST_FILES
+ )
+ 
+ add_custom_target( ${PROJECT_NAME}.test.classes
+-    COMMAND ${JAVA_COMPILE} -d ${TEST_CLASS_DIR} -classpath "${TEST_CLASSPATH}"
++    COMMAND ${JAVA_COMPILE} -d ${TEST_CLASS_DIR} -classpath "${TEST_CLASSPATH}" -source 1.6 -target 6
+             ${JAVA_TEST_FILES}
+     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+      

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git