[sikuli] 01/06: Adapt to maven integration of opencv java library
Gilles Filippini
pini at debian.org
Mon Nov 13 16:10:12 UTC 2017
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository sikuli.
commit 87349e778d85215f4d355f344e405c82a1b27b23
Author: Gilles Filippini <pini at debian.org>
Date: Mon Oct 30 22:37:27 2017 +0100
Adapt to maven integration of opencv java library
---
debian/changelog | 9 ++++++++
debian/control | 6 +++---
debian/patches/dependency-opencv.patch | 18 +++-------------
debian/patches/jxgrabkey-not-embedded.patch | 12 +++++------
debian/patches/no-jadb.patch | 32 ++++++++++++++---------------
debian/patches/no-vnc.patch | 24 +++++++++++-----------
6 files changed, 49 insertions(+), 52 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 81af9d1..e117fcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sikulix (1.1.1-4) unstable; urgency=medium
+
+ * Build-Depends: libopencv-dev (>= 3.3.0+dfsg-1~) to benefit from
+ its maven integration and drop hardcoded dependency on
+ libopencv3.2-java (closes: #877075)
+ * Update patches accordingly
+
+ -- Gilles Filippini <pini at debian.org> Mon, 30 Oct 2017 21:48:19 +0100
+
sikulix (1.1.1-3) unstable; urgency=medium
* Build against OpenCV 3.2 (closes: #877073)
diff --git a/debian/control b/debian/control
index df81313..651b91d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Gilles Filippini <pini at debian.org>
Build-Depends: debhelper (>= 9~), cdbs, default-jdk (>= 2:1.7)
, maven-debian-helper, libmaven-exec-plugin-java, libmaven-source-plugin-java
, libmaven-javadoc-plugin-java, jython (>= 2.7.1), jruby, swig
- , libopencv-dev, libtesseract-dev, libjxgrabkey-java, libcommons-cli-java
+ , libopencv-dev (>= 3.3.0+dfsg-1~), libtesseract-dev, libjxgrabkey-java, libcommons-cli-java
, libswing-layout-java, libswingx-java, libjgoodies-forms-java
, libjson-simple-java, libmac-widgets-java , libjackson2-core-java
, libjackson2-databind-java, junit4, libjavassist-java, libjna-java
@@ -45,8 +45,8 @@ Architecture: all
Replaces: libsikuli-script-java (<< 1.1.0~)
Breaks: libsikuli-script-java (<< 1.1.0~)
Depends: ${maven:Depends}, ${misc:Depends}, default-jre (>= 2:1.7) | java6-runtime, libsikulixapi-jni (>= ${binary:Version}), libsikulixapi-jni (<< ${source:Version}+), jython (>= 2.7.1), wmctrl, xdotool, tesseract-ocr-eng
-# These ones miss maven integration
- , libcommons-exec-java, libopencv3.2-java
+# This one misses maven integration
+ , libcommons-exec-java
# The script sikuli2html.py needs python
, python
# RunTime.java needs commands lsb-release and killall
diff --git a/debian/patches/dependency-opencv.patch b/debian/patches/dependency-opencv.patch
index 36a1e6a..d603ecf 100644
--- a/debian/patches/dependency-opencv.patch
+++ b/debian/patches/dependency-opencv.patch
@@ -4,27 +4,15 @@ Index: sikuli/API/pom.xml
===================================================================
--- sikuli.orig/API/pom.xml
+++ sikuli/API/pom.xml
-@@ -117,6 +117,13 @@
+@@ -117,6 +117,11 @@
<artifactId>vncviewer</artifactId>
<version>1.7.1</version>
</dependency>
+ <dependency>
-+ <groupId>opencv</groupId>
++ <groupId>org.opencv</groupId>
+ <artifactId>opencv</artifactId>
-+ <version>2.4.9</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/opencv.jar</systemPath>
++ <version>3.3.0</version>
+ </dependency>
</dependencies>
<build>
-@@ -157,6 +164,9 @@
- <manifest>
- <mainClass>org.sikuli.script.Sikulix</mainClass>
- </manifest>
-+ <manifestEntries>
-+ <Class-Path>/usr/share/java/opencv.jar</Class-Path>
-+ </manifestEntries>
- </archive>
- </configuration>
- </plugin>
diff --git a/debian/patches/jxgrabkey-not-embedded.patch b/debian/patches/jxgrabkey-not-embedded.patch
index 0891cc9..7add707 100644
--- a/debian/patches/jxgrabkey-not-embedded.patch
+++ b/debian/patches/jxgrabkey-not-embedded.patch
@@ -1,10 +1,10 @@
-Index: sikulix-1.1.1/API/pom.xml
+Index: sikuli/API/pom.xml
===================================================================
---- sikulix-1.1.1.orig/API/pom.xml
-+++ sikulix-1.1.1/API/pom.xml
-@@ -114,6 +114,11 @@
- <scope>system</scope>
- <systemPath>/usr/share/java/opencv.jar</systemPath>
+--- sikuli.orig/API/pom.xml
++++ sikuli/API/pom.xml
+@@ -112,6 +112,11 @@
+ <artifactId>opencv</artifactId>
+ <version>3.3.0</version>
</dependency>
+ <dependency>
+ <groupId>jxgrabkey</groupId>
diff --git a/debian/patches/no-jadb.patch b/debian/patches/no-jadb.patch
index 360bb8c..9e24a13 100644
--- a/debian/patches/no-jadb.patch
+++ b/debian/patches/no-jadb.patch
@@ -1,7 +1,7 @@
-Index: sikulix-1.1.1/API/pom.xml
+Index: sikuli/API/pom.xml
===================================================================
---- sikulix-1.1.1.orig/API/pom.xml
-+++ sikulix-1.1.1/API/pom.xml
+--- sikuli.orig/API/pom.xml
++++ sikuli/API/pom.xml
@@ -103,11 +103,6 @@
<version>0.7.0</version>
</dependency>
@@ -14,7 +14,7 @@ Index: sikulix-1.1.1/API/pom.xml
<groupId>com.sikulix</groupId>
<artifactId>${sikulix.libs}</artifactId>
<version>${project.version}</version>
-@@ -181,6 +176,7 @@
+@@ -176,6 +171,7 @@
<exclude>**/util/SysJNA.java</exclude>
<exclude>**/natives/WinUtil.java</exclude>
<exclude>**/natives/MacUtil.java</exclude>
@@ -22,10 +22,10 @@ Index: sikulix-1.1.1/API/pom.xml
</excludes>
</configuration>
</plugin>
-Index: sikulix-1.1.1/API/src/main/java/org/sikuli/script/Region.java
+Index: sikuli/API/src/main/java/org/sikuli/script/Region.java
===================================================================
---- sikulix-1.1.1.orig/API/src/main/java/org/sikuli/script/Region.java
-+++ sikulix-1.1.1/API/src/main/java/org/sikuli/script/Region.java
+--- sikuli.orig/API/src/main/java/org/sikuli/script/Region.java
++++ sikuli/API/src/main/java/org/sikuli/script/Region.java
@@ -16,8 +16,6 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -104,10 +104,10 @@ Index: sikulix-1.1.1/API/src/main/java/org/sikuli/script/Region.java
}
/**
-Index: sikulix-1.1.1/API/src/main/java/org/sikuli/script/Sikulix.java
+Index: sikuli/API/src/main/java/org/sikuli/script/Sikulix.java
===================================================================
---- sikulix-1.1.1.orig/API/src/main/java/org/sikuli/script/Sikulix.java
-+++ sikulix-1.1.1/API/src/main/java/org/sikuli/script/Sikulix.java
+--- sikuli.orig/API/src/main/java/org/sikuli/script/Sikulix.java
++++ sikuli/API/src/main/java/org/sikuli/script/Sikulix.java
@@ -6,7 +6,6 @@
package org.sikuli.script;
@@ -124,10 +124,10 @@ Index: sikulix-1.1.1/API/src/main/java/org/sikuli/script/Sikulix.java
ScreenHighlighter.closeAll();
Observing.cleanUp();
HotkeyManager.reset();
-Index: sikulix-1.1.1/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java
+Index: sikuli/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java
===================================================================
---- sikulix-1.1.1.orig/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java
-+++ sikulix-1.1.1/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java
+--- sikuli.orig/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java
++++ sikuli/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java
@@ -81,9 +81,6 @@ import org.jdesktop.swingx.JXCollapsible
import org.jdesktop.swingx.JXSearchField;
import org.jdesktop.swingx.JXTaskPane;
@@ -217,10 +217,10 @@ Index: sikulix-1.1.1/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java
//<editor-fold defaultstate="collapsed" desc="Init Help Menu">
private void initHelpMenu() throws NoSuchMethodException {
int scMask = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
-Index: sikulix-1.1.1/IDE/src/main/java/org/sikuli/ide/ButtonCapture.java
+Index: sikuli/IDE/src/main/java/org/sikuli/ide/ButtonCapture.java
===================================================================
---- sikulix-1.1.1.orig/IDE/src/main/java/org/sikuli/ide/ButtonCapture.java
-+++ sikulix-1.1.1/IDE/src/main/java/org/sikuli/ide/ButtonCapture.java
+--- sikuli.orig/IDE/src/main/java/org/sikuli/ide/ButtonCapture.java
++++ sikuli/IDE/src/main/java/org/sikuli/ide/ButtonCapture.java
@@ -5,7 +5,6 @@
*/
package org.sikuli.ide;
diff --git a/debian/patches/no-vnc.patch b/debian/patches/no-vnc.patch
index 8cdb5c7..4f02838 100644
--- a/debian/patches/no-vnc.patch
+++ b/debian/patches/no-vnc.patch
@@ -1,7 +1,7 @@
-Index: sikulix-1.1.1/API/pom.xml
+Index: sikuli/API/pom.xml
===================================================================
---- sikulix-1.1.1.orig/API/pom.xml
-+++ sikulix-1.1.1/API/pom.xml
+--- sikuli.orig/API/pom.xml
++++ sikuli/API/pom.xml
@@ -108,11 +108,6 @@
<version>${project.version}</version>
</dependency>
@@ -11,10 +11,10 @@ Index: sikulix-1.1.1/API/pom.xml
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <groupId>opencv</groupId>
+ <groupId>org.opencv</groupId>
<artifactId>opencv</artifactId>
- <version>2.4.9</version>
-@@ -177,6 +172,7 @@
+ <version>3.3.0</version>
+@@ -172,6 +167,7 @@
<exclude>**/natives/WinUtil.java</exclude>
<exclude>**/natives/MacUtil.java</exclude>
<exclude>**/android/*.java</exclude>
@@ -22,10 +22,10 @@ Index: sikulix-1.1.1/API/pom.xml
</excludes>
</configuration>
</plugin>
-Index: sikulix-1.1.1/API/src/main/java/org/sikuli/script/Sikulix.java
+Index: sikuli/API/src/main/java/org/sikuli/script/Sikulix.java
===================================================================
---- sikulix-1.1.1.orig/API/src/main/java/org/sikuli/script/Sikulix.java
-+++ sikulix-1.1.1/API/src/main/java/org/sikuli/script/Sikulix.java
+--- sikuli.orig/API/src/main/java/org/sikuli/script/Sikulix.java
++++ sikuli/API/src/main/java/org/sikuli/script/Sikulix.java
@@ -5,7 +5,6 @@
*/
package org.sikuli.script;
@@ -85,10 +85,10 @@ Index: sikulix-1.1.1/API/src/main/java/org/sikuli/script/Sikulix.java
- }
- }
}
-Index: sikulix-1.1.1/API/src/main/resources/Lib/sikuli/Sikuli.py
+Index: sikuli/API/src/main/resources/Lib/sikuli/Sikuli.py
===================================================================
---- sikulix-1.1.1.orig/API/src/main/resources/Lib/sikuli/Sikuli.py
-+++ sikulix-1.1.1/API/src/main/resources/Lib/sikuli/Sikuli.py
+--- sikuli.orig/API/src/main/resources/Lib/sikuli/Sikuli.py
++++ sikuli/API/src/main/resources/Lib/sikuli/Sikuli.py
@@ -480,21 +480,6 @@ def useRemote(adr, port=0):
else:
return None
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git
More information about the pkg-java-commits
mailing list