[sikuli] 02/30: Update copyright info and source tree update.

[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 87342313be7aa7cb0f53bf2c04556d0261e74853
Author: Gilles Filippini <pini at debian.org>
Date:   Thu Oct 31 11:39:33 2013 +0100

    Update copyright info and source tree update.
---
 debian/README.source |   64 +++++++++++++++++++-------------------------------
 debian/copyright     |   17 +++++++++-----
 2 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 7fe58d4..5d9104a 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,40 +1,24 @@
-sikuli for Debian
------------------
-
-1- Source tarball
-1.1- Obtaining upstream source
-
-Upstream has its source code repository on github:
- https://github.com/sikuli/sikuli
-
-Our git repo has the upstream one set as remote.
-
-1.2- Removing non DFSG parts
-
-Upstream source comes with files which shouldn't be part of a source tarball,
-such as external java libraries already packaged for Debian.
-
-Since we need to remove these files, we also remove other unneeded parts:
-* win32 and OS-X target files
-* mx-native-loader
-  Native JNI library loader ; let's use System.loadLibrary().
-* presentation made with MS-Powerpoint
-* utils dir (upstream dev tools, coverage tests, useless for the end-user)
-* extensions (see below)
-
-The removal is done manually when merging upstream's 'master' branch into
-our local 'upstream' branch.
-
-Paths to remove are listed into debian/orig-tar.exclude.
-
-Note: We don't use jh_repack because it would only remove jar files, here.
-
-2- Extensions
-
-Extensions such as Guide follow their own versionning scheme and should
-be shipped into via separate source packages as such.
-
-That's why I remove the 'extensions' subdirectory as well from the source
-tarball.
-
-Sikuli Guide will need its own ITP.
+SOURCE TREE
+-----------
+
+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>
+
+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).
+
+Then, these branches are aggregated as subdirs into the 'upstream' branch
+using git-subtree.
+
+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
diff --git a/debian/copyright b/debian/copyright
index e2a2edd..dfdb28a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,22 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Sikuli
-Upstream-Contact: Tsung-Hsiang Chang <vgod at mit.edu>
-                  Tom Yeh <tomyeh at umiacs.umd.edu>
-Source: https://github.com/sikuli/sikuli
- See debian/README.source for details as well as for removed parts from
- upstream source.
+Upstream-Contact: Raimund Hocke <rmhdevelop at me.com>
+Source: gathered from five upstream github repositories:
+ https://github.com/RaiMan/SikuliX-API.git
+ https://github.com/RaiMan/SikuliX-IDE.git
+ https://github.com/RaiMan/SikuliX-Jython.git
+ https://github.com/RaiMan/SikuliX-Basics.git
+ https://github.com/RaiMan/SikuliX-VisionProxy.git
+ .
+ See debian/README.source for details.
 
 Files: *
 Copyright: 2009-2012 Massachusetts Institute of Technology
+           2011-2013 Raimund Hocke <rmhdevelop at me.com>
 License: MIT
 
 Files: debian/*
-Copyright: 2010-2012 Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Copyright: 2010-2013 Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 License: GPL-3+
 
 License: MIT

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