[sikuli] 43/53: Acknowledge upstream source tree changes

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository sikuli.

commit c15e39455b3d86dcca918451c7e4bc0bdea88bd9
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Jun 2 22:56:23 2014 +0200

    Acknowledge upstream source tree changes
---
 debian/README.source | 59 ++++++++++++++++++++++++++++------------------------
 debian/changelog     |  6 ++++--
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 677150e..df12e77 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,44 +1,49 @@
 TO-DO
 -----
 
-* Update SOURCE TREE section below
+* Update source package name to sikulix
 * Check Tesseract usage
-* Check all other patches starting from autotoolize-vision-proxy.patch
-* Drop file Natives/src/main/java/org/sikuli/natives/SWIGTYPE_p_cv__Rect.java?
-  (not re-generated by SWIG and not used)
 * Depends: python because /usr/share/sikuli/scripts/sikuli2html.py
 * copyright jygment (threecrickets.com)
 * sikuli2html : use /usr/bin/python as shebang
-* Guide?
 
-SOURCE TREE
------------
+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>
 
-The Sikuli source tree is an addition of its five subprojects' source trees
-from their respective github repositories:
-<https://github.com/RaiMan/SikuliX-VisionProxy>
-<https://github.com/RaiMan/SikuliX-Basics>
-<https://github.com/RaiMan/SikuliX-Jython>
-<https://github.com/RaiMan/SikuliX-API>
-<https://github.com/RaiMan/SikuliX-IDE>
+I managed to keep the upstream git history by doing a kind of
+'git merge -s theirs' with this method from [1]:
 
-Each of these repo is fetched into a distinct upstream-* branch of this source
-package's repository: vision-proxy, basics, jython, api, ide. The 'basics'
-must have its embedded shared libs removed (subdir src/main/resources-libs).
+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
 
-Then, these branches are aggregated as subdirs into the 'upstream' branch
-using git-subtree.
+[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:
-For each subproject:
-1- fetch the remote repo
-2- merge the remote master into the corresponding upstream-* branch
-3- git-subtree merge the upstream-* branch into the corresponding subdir in
-   the upstream branch
+git fetch SikuliX-2014 master
+git checkout upstream
+git merge SikuliX-2014/master
+
+REMOVED PARTS FROM UPSTREAM SOURCE TREE
+---------------------------------------
+Libs:       	placeholder for pre-builts native libraries
+MacApp:     	MacOS specific stuff
+OpenCV4SikuliX:	pre-built OpenCV package
+Tesseract:	data files from tesseract
 
 PACKAGING TO-DO
 ---------------
 * Find out how to deal with non-mavenized dependencies (libmac-widgets, jython).
-* Properly handle build-arch, !build-indep, ...?
-* Option --ignore-pom doesn't work as expected?
-* user guide?
+* Properly handle build-arch, !build-indep, ...?* Guide extension?
diff --git a/debian/changelog b/debian/changelog
index 367a930..84af9fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 sikuli (1.1.0~beta1-1) UNRELEASED; urgency=medium
 
-  * New upstream release:
-  to do...
+  * New upstream release
+  * New all in one upstream GitHub project (see d/README.source)
+  * Project name officially changed from Sikuli to SikuliX
+    Changing package's name accordingly (to do)
 
  -- Gilles Filippini <pini at debian.org>  Mon, 05 May 2014 19:40:40 +0200
 

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