UPDATING UPSTREAM SOURCE TREE
-----------------------------
With release 1.1.0~beta upstream changed back from several GitHub projects
to only one:
 <https://github.com/RaiMan/SikuliX-2014.git>

I managed to keep the upstream git history by doing a kind of
'git merge -s theirs' with this method from [1]:

git remote add SikuliX-2014 https://github.com/RaiMan/SikuliX-2014.git
git fetch SikuliX-2014 master
git checkout -b tmp SikuliX-2014/master
git merge -s ours upstream	# ignoring all changes from downstream
[remove unwanted parts from upstream source tree; see below]
git checkout upstream
git merge --squash tmp		# apply changes from tmp but not as merge
#record upstream 2nd merge head
git rev-parse SikuliX-2014/master > .git/MERGE_HEAD
git commit -m "Merging SikuliX-2014..."	# make the commit
git branch -D tmp

[1] <http://stackoverflow.com/questions/4911794/git-command-for-making-one-branch-like-another/4912267#4912267>
    (Simulation #2)

To update the source tree for a new release:
git fetch SikuliX-2014 master
git checkout upstream
git merge SikuliX-2014/master

REMOVED PARTS FROM UPSTREAM SOURCE TREE
---------------------------------------
API/lib/com/tigervnc/			pre-built TigerVNC java client
API/src/main/java/jxgrabkey/		embedded JXGrabKey source
API/src/main/java/org/opencv/		pre-built OpenCV package
API/src/main/java/org/sikuli/natives/!(CommandExecutor)*!(Util).java
					swig generated files
API/src/main/resources/Lib/xl*		MS Excel processing python modules
API/src/main/resources/Lib/zxJDBC.jar
API/src/main/resources/com/jcraft/	embedded SSH v2 java implementation
API/src/main/resources/com/tigervnc/	emedded TigerVNC java client source
API/src/main/resources/Lib/robot/	embedded Robot Framework source (python)
IDE/src/main/java/org/jdesktop/swingx/	embedded swinglabs-swingx
Libslux/src/main/resources/sikulixlibs/	placeholder for pre-builts native libraries
Libslux/src/main/resources/srcnativelibs/Include/OpenCV
					embedded OpenCV headers
Libslux/src/main/resources/srcnativelibs/Include/Tesseract
					embedded Tesseract headers
Libslux/src/main/resources/srcnativelibs/Vision/visionJAVA_wrap.cxx
					swig generated file
Libsmac/				placeholder for pre-builts native libraries
Libswin/				placeholder for pre-builts native libraries
Setup/src/main/resources/sikulixtessdata
					embedded Tesseract config files
StuffContainer/				random stuff
TestScripts/csvread.sikuli.zip
TestScripts/showcaseJS.zip

PACKAGING TO-DO
---------------
* Find out how to deal with non-mavenized dependencies (libmac-widgets, jython).
* Properly handle build-arch, !build-indep, ...?
* Guide extension?
* Check Tesseract usage
* sikuli2html : use /usr/bin/python as shebang

