[sikuli] 05/08: First attempt at packaging release 1.1.0~beta4-1

Gilles Filippini pini at moszumanska.debian.org
Sun Oct 26 22:21:42 GMT 2014 

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

pini pushed a commit to branch master
in repository sikuli.

commit e68173c16053e68b513cf11ec5ba6fe4aef4d5d7
Author: Gilles Filippini <pini at debian.org>
Date:   Sat Oct 25 17:11:55 2014 +0200

    First attempt at packaging release 1.1.0~beta4-1
---
 debian/changelog                                   | 20 ++++++++++
 debian/control                                     | 37 ++++++++++---------
 debian/libsikulix-script-doc.doc-base.api          |  9 -----
 debian/libsikulix-script-doc.install               |  1 -
 debian/libsikulix-script-java.install              |  1 -
 debian/libsikulix-script-jni.install.in            |  1 -
 debian/libsikulixapi-doc.doc-base.api              |  9 +++++
 debian/libsikulixapi-doc.install                   |  1 +
 ...rrides => libsikulixapi-java.lintian-overrides} |  2 +-
 ...ix-script-java.poms => libsikulixapi-java.poms} |  0
 debian/libsikulixapi-jni.install.in                |  1 +
 debian/maven.ignoreRules.full                      |  2 +
 debian/maven.properties                            |  2 +-
 debian/maven.publishedRules                        |  1 +
 debian/patches/autotoolize-vision-proxy.patch      | 12 +++---
 debian/patches/dependency-opencv.patch             | 20 ++++++++++
 debian/patches/fix-image-path.patch                | 14 +++++++
 debian/patches/native.patch                        |  2 +-
 debian/patches/series                              |  3 ++
 debian/rules                                       | 20 +++++-----
 debian/sikulix-ide.1                               | 12 ------
 debian/sikulix-ide.install                         |  2 -
 debian/sikulix-ide.manpages                        |  1 -
 debian/sikulix.1                                   | 43 ++--------------------
 debian/sikulix.install                             |  2 +
 ...kulix-script-java.manpages => sikulix.manpages} |  0
 debian/{sikulix-ide.poms => sikulix.poms}          |  0
 debian/tmp.poms                                    |  8 ++--
 debian/wrappers/sikulix                            |  2 +-
 debian/wrappers/sikulix-ide                        |  2 -
 30 files changed, 119 insertions(+), 111 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c21971a..b8df7a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+sikulix (1.1.0~beta4-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Yet another source tree restructuration.
+  * Patches updated accordingly.
+  * Packages' names changed to reflect the new upstream layout:
+    - sikulix: everything needed to support any script running plus the
+      IDE
+    - libsikulixapi-java: the Java level API (including the thin layers
+      to support external Jython and JRuby usages)
+  * Only one launcher to run the IDE or an existing sikuli script.
+
+  * New patches:
+    - dependency-opencv.patch: use Debian opencv-java instead of the
+      upstream embedded one.
+    - fix-image-path.patch: backport of an upstream bug fix related to
+      the images path.
+
+ -- Gilles Filippini <pini at debian.org>  Mon, 06 Oct 2014 21:54:08 +0200
+
 sikulix (1.1.0~beta3-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 3279bcc..18d0f9c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: extra
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Gilles Filippini <pini at debian.org>
 Build-Depends: debhelper (>= 9~), cdbs, default-jdk (>= 2:1.6)
- , maven-debian-helper, libmaven-exec-plugin-java, jython, jruby, swig
+ , maven-debian-helper, libmaven-exec-plugin-java, libmaven-source-plugin-java
+ , libmaven-javadoc-plugin-java, jython, jruby, swig
  , libopencv-dev, libtesseract-dev, libjxgrabkey-java, libcommons-cli-java
  , libswing-layout-java, libswingx-java, libjgoodies-forms-java
  , libjson-simple-java, libmac-widgets-java , libjackson2-core-java
@@ -12,7 +13,7 @@ Build-Depends: debhelper (>= 9~), cdbs, default-jdk (>= 2:1.6)
  , libbytelist-java, libjruby-joni-java, libjoda-time-java
  , autoconf, automake, libtool
 # We only use the docs from java packages kept in the 'Depends' field of
-# libsikulix-script-java
+# libsikulixapi-java
 # No doc package exist for: libbsh-java, libcommons-cli-java, jruby
 # No need for: junit4-doc
  , default-jdk-doc, jython-doc, libswing-layout-java-doc, libjavassist-java-doc, libjxgrabkey-doc
@@ -21,11 +22,11 @@ Homepage: http://www.sikulix.com
 Vcs-Git: git://anonscm.debian.org/pkg-java/sikuli.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/sikuli.git;a=summary
 
-Package: sikulix-ide
+Package: sikulix
 Architecture: all
 Replaces: sikuli-ide (<< 1.1.0~)
 Breaks: sikuli-ide (<< 1.1.0~)
-Depends: ${maven:Depends}, ${misc:Depends}, default-jre (>= 2:1.6) | java6-runtime, libsikulix-script-java (= ${binary:Version}), libmac-widgets-java
+Depends: ${maven:Depends}, ${misc:Depends}, default-jre (>= 2:1.6) | java6-runtime, libsikulixapi-java (= ${binary:Version}), libmac-widgets-java
 Description: IDE to develop SikuliX scripts
  SikuliX mixes image recognition into Jython or JRuby scripting to automate
  interactions with graphical user interfaces.
@@ -36,14 +37,14 @@ Description: IDE to develop SikuliX scripts
  This package features SikuliX IDE, the integrated development environment
  for writing SikuliX Jython visual scripts with screenshots.
 
-Package: libsikulix-script-java
+Package: libsikulixapi-java
 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.6) | java6-runtime, libsikulix-script-jni (>= ${binary:Version}), libsikulix-script-jni (<< ${source:Version}+), jython, wmctrl, xdotool, tesseract-ocr-eng
+Depends: ${maven:Depends}, ${misc:Depends}, default-jre (>= 2:1.6) | java6-runtime, libsikulixapi-jni (>= ${binary:Version}), libsikulixapi-jni (<< ${source:Version}+), jython, wmctrl, xdotool, tesseract-ocr-eng
 # The script sikuli2html.py needs python
  , python
-Suggests: libsikulix-script-doc
+Suggests: libsikulixapi-doc
 Description: Visual scripting API for Jython and JRuby
  SikuliX mixes image recognition into Jython or JRuby scripting to automate
  interactions with graphical user interfaces.
@@ -51,62 +52,62 @@ Description: Visual scripting API for Jython and JRuby
  With SikuliX it is very easy to programmatically control a web page, a
  desktop application, or even an iphone application running in an emulator.
  .
- This package features the Jython and JRuby SikuliX visual scripting APIs
- and the SikuliX script interpreter.
+ This package features the SikuliX Java API plus the support fori
+ external usage from Jython and JRuby.
 
-Package: libsikulix-script-jni
+Package: libsikulixapi-jni
 Architecture: any
 Multi-Arch: same
 Replaces: libsikuli-script-jni (<< 1.1.0~)
 Breaks: libsikuli-script-jni (<< 1.1.0~)
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Native libs for libsikulix-script-java
+Description: Native libs for libsikulixapi-java
  SikuliX mixes image recognition into Jython or JRuby scripting to automate
  interactions with graphical user interfaces.
  .
  This package holds the architecture dependent jni backend of the java
  library.
 
-Package: libsikulix-script-doc
+Package: libsikulixapi-doc
 Section: doc
 Architecture: all
 Replaces: libsikuli-script-doc (<< 1.1.0~)
 Breaks: libsikuli-script-doc (<< 1.1.0~)
 Depends: ${misc:Depends}
 Recommends: ${maven:DocDepends}
-Description: Documentation for libsikulix-script-java
+Description: Documentation for libsikulixapi-java
  SikuliX mixes image recognition into Jython or JRuby scripting to automate
  interactions with graphical user interfaces.
  .
  This package contains the javadoc API documentation for the java library
- libsikulix-script-java.
+ libsikulixapi-java.
 
 # Transitional packages related to the old upstream name Sikuli
 Package: sikuli-ide
 Architecture: all
 Section: oldlibs
-Depends: ${misc:Depends}, sikulix-ide
+Depends: ${misc:Depends}, sikulix
 Description: transitional dummy package
  This is a transitional dummy package. It can safely be removed.
 
 Package: libsikuli-script-java
 Architecture: all
 Section: oldlibs
-Depends: ${misc:Depends}, libsikulix-script-java
+Depends: ${misc:Depends}, libsikulixapi-java
 Description: transitional dummy package
  This is a transitional dummy package. It can safely be removed.
 
 Package: libsikuli-script-jni
 Architecture: all
 Section: oldlibs
-Depends: ${misc:Depends}, libsikulix-script-jni
+Depends: ${misc:Depends}, libsikulixapi-jni
 Description: transitional dummy package
  This is a transitional dummy package. It can safely be removed.
 
 Package: libsikuli-script-doc
 Architecture: all
 Section: oldlibs
-Depends: ${misc:Depends}, libsikulix-script-doc
+Depends: ${misc:Depends}, libsikulixapi-doc
 Description: transitional dummy package
  This is a transitional dummy package. It can safely be removed.
diff --git a/debian/libsikulix-script-doc.doc-base.api b/debian/libsikulix-script-doc.doc-base.api
deleted file mode 100644
index d8d981a..0000000
--- a/debian/libsikulix-script-doc.doc-base.api
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: libsikulix-script-doc-api
-Title: Programmer API for SikuliX Script
-Author: Massachusetts Institute of Technology
-Abstract: Javadocs for SikuliX Script, a Jython + JRuby visual scripting API.
-Section: Programming/Java
-
-Format: HTML
-Index: /usr/share/doc/libsikulix-script-doc/api/index.html
-Files: /usr/share/doc/libsikulix-script-doc/api/*.html
diff --git a/debian/libsikulix-script-doc.install b/debian/libsikulix-script-doc.install
deleted file mode 100644
index bbb6033..0000000
--- a/debian/libsikulix-script-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-doc/* usr/share/doc/libsikulix-script-doc/api
diff --git a/debian/libsikulix-script-java.install b/debian/libsikulix-script-java.install
deleted file mode 100644
index 462c1a5..0000000
--- a/debian/libsikulix-script-java.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/wrappers/sikulix usr/bin
diff --git a/debian/libsikulix-script-jni.install.in b/debian/libsikulix-script-jni.install.in
deleted file mode 100644
index 4907bd7..0000000
--- a/debian/libsikulix-script-jni.install.in
+++ /dev/null
@@ -1 +0,0 @@
-Natives/src/main/native/Vision/dist/@DEB_HOST_GNU_TYPE@/* usr/lib/@DEB_HOST_MULTIARCH@/jni
diff --git a/debian/libsikulixapi-doc.doc-base.api b/debian/libsikulixapi-doc.doc-base.api
new file mode 100644
index 0000000..d22ab1c
--- /dev/null
+++ b/debian/libsikulixapi-doc.doc-base.api
@@ -0,0 +1,9 @@
+Document: libsikulixapi-doc-api
+Title: Programmer API for SikuliX API
+Author: Massachusetts Institute of Technology
+Abstract: Javadocs for SikuliX API, a Java visual scripting API.
+Section: Programming/Java
+
+Format: HTML
+Index: /usr/share/doc/libsikulixapi-doc/api/index.html
+Files: /usr/share/doc/libsikulixapi-doc/api/*.html
diff --git a/debian/libsikulixapi-doc.install b/debian/libsikulixapi-doc.install
new file mode 100644
index 0000000..a23b2ad
--- /dev/null
+++ b/debian/libsikulixapi-doc.install
@@ -0,0 +1 @@
+doc/* usr/share/doc/libsikulixapi-doc/api
diff --git a/debian/libsikulix-script-java.lintian-overrides b/debian/libsikulixapi-java.lintian-overrides
similarity index 80%
rename from debian/libsikulix-script-java.lintian-overrides
rename to debian/libsikulixapi-java.lintian-overrides
index 0bde619..27eb3a1 100644
--- a/debian/libsikulix-script-java.lintian-overrides
+++ b/debian/libsikulixapi-java.lintian-overrides
@@ -2,4 +2,4 @@
 # a stand-alone app as well as a library. And splitting the package
 # doesn't worth the effort: the resulting package for the executable
 # would be ridiculously small.
-libsikulix-script-java binary: needless-dependency-on-jre
+libsikulixapi-java binary: needless-dependency-on-jre
diff --git a/debian/libsikulix-script-java.poms b/debian/libsikulixapi-java.poms
similarity index 100%
rename from debian/libsikulix-script-java.poms
rename to debian/libsikulixapi-java.poms
diff --git a/debian/libsikulixapi-jni.install.in b/debian/libsikulixapi-jni.install.in
new file mode 100644
index 0000000..57be349
--- /dev/null
+++ b/debian/libsikulixapi-jni.install.in
@@ -0,0 +1 @@
+Libsvision/src/main/java/native/Vision/dist/@DEB_HOST_GNU_TYPE@/* usr/lib/@DEB_HOST_MULTIARCH@/jni
diff --git a/debian/maven.ignoreRules.full b/debian/maven.ignoreRules.full
index 7cd9550..4fd7974 100644
--- a/debian/maven.ignoreRules.full
+++ b/debian/maven.ignoreRules.full
@@ -3,6 +3,8 @@ com.melloware jintellitype jar * * *
 com.nativelibs4java bridj jar * * *
 net.java.dev.jai-imageio jai-imageio-core-standalone jar * * *
 org.sikuli * jar * * *
+com.sikulix * jar * * *
 org.python jython-standalone jar debian * *
 com.explodingpixels mac_widgets jar debian * *
+opencv opencv jar debian * * *
 rubygems * * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
index 37dea91..be1360a 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1,3 +1,3 @@
 # Include here properties to pass to Maven during the build.
 # For example:
-# maven.test.skip=true
+maven.test.skip=true
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
index e69de29..8b13789 100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@ -0,0 +1 @@
+
diff --git a/debian/patches/autotoolize-vision-proxy.patch b/debian/patches/autotoolize-vision-proxy.patch
index 8e43858..257bc18 100644
--- a/debian/patches/autotoolize-vision-proxy.patch
+++ b/debian/patches/autotoolize-vision-proxy.patch
@@ -23,7 +23,7 @@ Index: sikuli/Libsvision/pom.xml
 +								<argument>-c</argument>
 +								<argument>
 +set -e
-+cd src/main/native/Vision
++cd src/main/java/native/Vision
 +mkdir -p m4
 +autoreconf -i
 +automake
@@ -40,7 +40,7 @@ Index: sikuli/Libsvision/pom.xml
 +							<executable>/usr/bin/make</executable>
 +							<arguments>
 +								<argument>-C</argument>
-+								<argument>src/main/native/Vision</argument>
++								<argument>src/main/java/native/Vision</argument>
 +								<argument>all</argument>
 +							</arguments>
 +						</configuration>
@@ -53,7 +53,7 @@ Index: sikuli/Libsvision/pom.xml
 +							<executable>/usr/bin/make</executable>
 +							<arguments>
 +								<argument>-C</argument>
-+								<argument>src/main/native/Vision</argument>
++								<argument>src/main/java/native/Vision</argument>
 +								<argument>install</argument>
 +							</arguments>
 +						</configuration>
@@ -68,7 +68,7 @@ Index: sikuli/Libsvision/pom.xml
 +								<argument>-c</argument>
 +								<argument>
 +set -e
-+cd src/main/native/Vision
++cd src/main/java/native/Vision
 +[ ! -f Makefile ] || /usr/bin/make clean
 +rm -fr configure Makefile Makefile.in aclocal.m4 m4 config.* compile missing libtool ltmain.sh install-sh depcomp
 +								</argument>
@@ -99,14 +99,14 @@ Index: sikuli/Libsvision/src/main/java/native/Vision/Makefile.am
 +libVisionProxy_la_LDFLAGS = -module -avoid-version -shared
 +
 +SWIGSRC := vision.swig
-+SWIGOUT := ../../org/sikuli/natives
++SWIGOUT := ../../org/sikuli/libsvision
 +SWIGJAVAFILES := DebugCategories.java FindInput.java FindResult.java FindResults.java Mat.java \
 +		 OCR.java OCRChar.java OCRChars.java OCRLine.java OCRLines.java OCRParagraph.java \
 +		 OCRParagraphs.java OCRRect.java OCRText.java OCRWord.java OCRWords.java \
 +		 TARGET_TYPE.java Vision.java VisionProxy.java VisionProxyJNI.java
 +
 +vision_wrap.cxx: vision.swig
-+	$(SWIG) -c++ -java -package org.sikuli.natives -outdir $(SWIGOUT) $< || ( $(MAKE) cleanswig && false )
++	$(SWIG) -c++ -java -package org.sikuli.libsvision -outdir $(SWIGOUT) $< || ( $(MAKE) cleanswig && false )
 +
 +# We don't want the .la file
 +install-data-hook:
diff --git a/debian/patches/dependency-opencv.patch b/debian/patches/dependency-opencv.patch
new file mode 100644
index 0000000..1fb9a14
--- /dev/null
+++ b/debian/patches/dependency-opencv.patch
@@ -0,0 +1,20 @@
+Description: use Debian package for opencv-java instead of the upstream
+ embedded one.
+Index: sikuli/API/pom.xml
+===================================================================
+--- sikuli.orig/API/pom.xml
++++ sikuli/API/pom.xml
+@@ -34,6 +34,13 @@
+ 			<version>1.0</version>
+ 		</dependency>
+ 		<dependency>
++			<groupId>opencv</groupId>
++			<artifactId>opencv</artifactId>
++			<version>2.4.9</version>
++			<scope>system</scope>
++			<systemPath>/usr/share/java/opencv.jar</systemPath>
++		</dependency>
++		<dependency>
+ 			<!-- BridJ aims to be the ultimate Java / native interoperability library
+ 			Call C, C++, ObjectiveC libraries without compiling native code
+ 			https://code.google.com/p/bridj/ -->
diff --git a/debian/patches/fix-image-path.patch b/debian/patches/fix-image-path.patch
new file mode 100644
index 0000000..f432f88
--- /dev/null
+++ b/debian/patches/fix-image-path.patch
@@ -0,0 +1,14 @@
+Description: backport fix from upstream commit 9c8aa74
+Index: sikuli/API/src/main/java/org/sikuli/script/ImagePath.java
+===================================================================
+--- sikuli.orig/API/src/main/java/org/sikuli/script/ImagePath.java
++++ sikuli/API/src/main/java/org/sikuli/script/ImagePath.java
+@@ -314,7 +314,7 @@ public class ImagePath {
+    */
+   public static boolean add(String mainPath, String altPath) {
+ 		mainPath = FileManager.normalize(mainPath);
+-		mainPath = FileManager.normalize(altPath);
++		altPath = FileManager.normalize(altPath);
+     PathEntry path = makePathURL(mainPath, altPath);
+     if (path != null) {
+       if (hasPath(path) < 0) {
diff --git a/debian/patches/native.patch b/debian/patches/native.patch
index 7db98e9..e0cd717 100644
--- a/debian/patches/native.patch
+++ b/debian/patches/native.patch
@@ -117,7 +117,7 @@ Index: sikuli/API/src/main/java/org/sikuli/basics/ResourceLoader.java
        return false;
      }
 +    // Debian package: do nothing
-+    return;
++    initDone = true;
  
  		if (initDone) {
        return true;
diff --git a/debian/patches/series b/debian/patches/series
index f8e6d63..24c79eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,6 @@ pom-removed-modules.patch
 jruby-compat-1.9.patch
 python-shebang.patch
 #no-gem-maven-plugin.patch
+dependency-opencv.patch
+
+fix-image-path.patch
diff --git a/debian/rules b/debian/rules
index 3b20ffc..abb707c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,31 +44,31 @@ DEB_JAR_PACKAGE := tmp
 
 export VP_CONFIGURE_FLAGS=--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 
-configure/libsikulix-script-jni::
+configure/libsikulixapi-jni::
 	[ -z "$(DEB_FAIL)" ]
-	sed "s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g;s/@DEB_HOST_GNU_TYPE@/$(DEB_HOST_GNU_TYPE)/g" debian/libsikulix-script-jni.install.in > debian/libsikulix-script-jni.install
+	sed "s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g;s/@DEB_HOST_GNU_TYPE@/$(DEB_HOST_GNU_TYPE)/g" debian/libsikulixapi-jni.install.in > debian/libsikulixapi-jni.install
 
 clean::
-	rm -f debian/libsikulix-script-jni.install
+	rm -f debian/libsikulixapi-jni.install
 	# This ugly line because of #638001 and #723919
-	grep -vwE '(debian|^org\.sikuli)' debian/maven.ignoreRules.full >debian/maven.ignoreRules
+	grep -vwE '(debian|^org\.sikuli|^com\.sikulix)' debian/maven.ignoreRules.full >debian/maven.ignoreRules
 	# We don't want our maven.rules file changed with broken published rules
 	cp debian/maven.rules.ours debian/maven.rules
 
 # ${maven:Depends} for each package
 # Because '--package=<package>' in debian/*.poms files doesn't work for
 # .substvars files.
-install/sikulix-ide::
-	ln IDE/target/SikuliX-IDE-1.1.0.jar IDE/target/SikuliX-IDE.jar
+install/sikulix::
+	ln IDE/target/sikulix-1.1.0-*.jar IDE/target/sikulix.jar
 	cp debian/maven.ignoreRules.full debian/maven.ignoreRules
-	mh_resolve_dependencies --non-interactive --offline -psikulix-ide  --base-directory=$(CURDIR) --non-explore
+	mh_resolve_dependencies --non-interactive --offline -psikulix  --base-directory=$(CURDIR) --non-explore
 
-install/libsikulix-script-java::
+install/libsikulixapi-java::
 	cp debian/maven.ignoreRules.full debian/maven.ignoreRules
-	mh_resolve_dependencies --non-interactive --offline -plibsikulix-script-java --base-directory=$(CURDIR) --non-explore
+	mh_resolve_dependencies --non-interactive --offline -plibsikulixapi-java --base-directory=$(CURDIR) --non-explore
 
 # Generate doc the good old way
-install/libsikulix-script-doc::
+install/libsikulixapi-doc::
 	javadoc -windowtitle "Javadoc of Sikuli Script" \
 		-encoding UTF-8 \
 		-sourcepath Natives/src/main/java:Basics/src/main/java:Jython/src/main/java:JRuby/src/main/java:API/src/main/java \
diff --git a/debian/sikulix-ide.1 b/debian/sikulix-ide.1
deleted file mode 100644
index 63f5d85..0000000
--- a/debian/sikulix-ide.1
+++ /dev/null
@@ -1,12 +0,0 @@
-.TH SIKULIX-IDE "1" "june 2014" "sikulix-ide 1.1.0" "User Commands"
-.SH NAME
-sikulix-ide \- Integrated development environment for the SikuliX visual script Jython API
-.SH "SEE ALSO"
-.IR sikulix (1)
-
-.SH AUTHOR
-SikuliX was started as a research project of the User Interface Design Group, MIT Computer Science and Artificial Intelligence Laboratory (CSAIL) and was discontinued in late 2011.
-.PP
-Starting from 2012 it is now maintained by Raimund Hocke <rmhdevelop at me.com>.
-.PP
-This manual page was written by Gilles Filippini <pini at debian.org>, for the Debian project (but may be used by others).
diff --git a/debian/sikulix-ide.install b/debian/sikulix-ide.install
deleted file mode 100644
index 5a81544..0000000
--- a/debian/sikulix-ide.install
+++ /dev/null
@@ -1,2 +0,0 @@
-IDE/target/SikuliX-IDE.jar usr/share/sikulix
-debian/wrappers/sikulix-ide usr/bin
diff --git a/debian/sikulix-ide.manpages b/debian/sikulix-ide.manpages
deleted file mode 100644
index 95ef970..0000000
--- a/debian/sikulix-ide.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/sikulix-ide.1
diff --git a/debian/sikulix.1 b/debian/sikulix.1
index 57135fb..f0bb85b 100644
--- a/debian/sikulix.1
+++ b/debian/sikulix.1
@@ -1,45 +1,8 @@
-.TH SIKULIX "1" "June 2014" "sikulix 1.1.0" "User Commands"
+.TH SIKULIX "1" "june 2014" "sikulix 1.1.0" "User Commands"
 .SH NAME
-sikuli \- run SikuliX scripts
-.SH SYNOPSIS
-.B sikulix
-[\-d <debug level>] [\-f <SikuliX logfile>] [\-h] [\-i <[runner (jython)]>] [\-r <foobar.sikuli>] [\-t <foobar.sikuli>] [\-u <User logfile>] [\-\- <args>]
-.SH DESCRIPTION
-.B sikulix
-runs the specified SikuliX script.
-.SH OPTIONS
-.TP
-\fB\-d\fR <debug level>
-positive integer (1)
-.TP
-\fB\-f\fR <SikuliX logfile>
-a valid filename
-(WorkingDir/SikuliXLog.txt)
-.TP
-\fB\-h\fR
-print this help message
-.TP
-\fB\-i\fR <[runner (jython)]>
-start interactive session and/or select
-ScriptRunner
-.TP
-\fB\-r\fR <foobar.sikuli>
-run script
-.TP
-\fB\-t\fR <foobar.sikuli>
-runs script as unittest
-.TP
-\fB\-u\fR <User logfile>
-a valid filename
-(WorkingDir/UserLog.txt)
-.TP
-\fB\-\-\fR <args>
-anything after \-\- or after something beginning with \-\- go to script as user parameters (respecting enclosing ")
-.SH "SEE ALSO"
-.IR sikulix-ide (1)
+sikulix-ide \- Integrated development environment for the SikuliX visual scripting API
 .SH AUTHOR
-SikuliX
-was started as a research project of the User Interface Design Group, MIT Computer Science and Artificial Intelligence Laboratory (CSAIL) and was discontinued in late 2011.
+SikuliX was started as a research project of the User Interface Design Group, MIT Computer Science and Artificial Intelligence Laboratory (CSAIL) and was discontinued in late 2011.
 .PP
 Starting from 2012 it is now maintained by Raimund Hocke <rmhdevelop at me.com>.
 .PP
diff --git a/debian/sikulix.install b/debian/sikulix.install
new file mode 100644
index 0000000..976d81d
--- /dev/null
+++ b/debian/sikulix.install
@@ -0,0 +1,2 @@
+IDE/target/sikulix.jar usr/share/sikulix
+debian/wrappers/sikulix usr/bin
diff --git a/debian/libsikulix-script-java.manpages b/debian/sikulix.manpages
similarity index 100%
rename from debian/libsikulix-script-java.manpages
rename to debian/sikulix.manpages
diff --git a/debian/sikulix-ide.poms b/debian/sikulix.poms
similarity index 100%
rename from debian/sikulix-ide.poms
rename to debian/sikulix.poms
diff --git a/debian/tmp.poms b/debian/tmp.poms
index c308a9a..e890afd 100644
--- a/debian/tmp.poms
+++ b/debian/tmp.poms
@@ -26,9 +26,9 @@
 #     Empty by default. [mh_install]
 #
 pom.xml --ignore-pom
-Libsvision/pom.xml --package=libsikulix-script-java --java-lib
-Tesseract4SikuliX/pom.xml --package=libsikulix-script-java --java-lib
-API/pom.xml --package=libsikulix-script-java --java-lib
-Jygments4SikuliX/pom.xml --package=sikulix-ide --java-lib
+Libsvision/pom.xml --package=libsikulixapi-java --java-lib
+Tesseract4SikuliX/pom.xml --package=libsikulixapi-java --java-lib
+API/pom.xml --package=libsikulixapi-java --java-lib
+Jygments4SikuliX/pom.xml --package=sikulix --java-lib
 # Don't install maven files for IDE
 IDE/pom.xml --ignore-pom
diff --git a/debian/wrappers/sikulix b/debian/wrappers/sikulix
index 59656e5..7d58b2d 100755
--- a/debian/wrappers/sikulix
+++ b/debian/wrappers/sikulix
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec /usr/bin/java -cp "/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/guava.jar:/usr/share/java/jython.jar:/usr/share/java/SikuliX-Jython.jar:/usr/share/java/opencv.jar:/usr/share/java/SikuliX-JRuby.jar:/usr/share/java/SikuliX-API.jar" -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.cachedir=$HOME/.jython-cache -Dsikuli.FromCommandLine org.sikuli.basics.SikuliScript "$@"
+LC_NUMERIC=C exec /usr/bin/java -cp "/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/guava.jar:/usr/share/java/jython.jar:/usr/share/java/mac_widgets.jar:/usr/share/java/opencv.jar:/usr/share/sikulix/sikulix.jar" -Dsikuli.console=true -Dsikuli.debug=0 -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.cachedir=$HOME/.jython-cache org.sikuli.ide.SikuliIDE "$@"
diff --git a/debian/wrappers/sikulix-ide b/debian/wrappers/sikulix-ide
deleted file mode 100755
index 713d6d9..0000000
--- a/debian/wrappers/sikulix-ide
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-LC_NUMERIC=C exec /usr/bin/java -cp "/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/guava.jar:/usr/share/java/jython.jar:/usr/share/java/mac_widgets.jar:/usr/share/java/opencv.jar:/usr/share/sikulix/SikuliX-IDE.jar" -Dsikuli.console=true -Dsikuli.debug=0 -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.cachedir=$HOME/.jython-cache org.sikuli.ide.SikuliIDE "$@"

-- 
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