[CHANGE] - sorry for this but again, I had to move some doc files. This is now...

[CHANGE] - sorry for this but again, I had to move some doc files. This is now the final state and is the cleaneast way.

README

-We keep this README short, since we have much documentation and information
-online. So, for detailed information have a look at http://www.openwalnut.org.
+OpenWalnut
+----------
+
+OpenWalnut is an open source tool for multi-modal medical and brain data
+visualization. Its universality allows it to be easily extended and used in a
+large variety of application cases. It is both, a tool for the scientific user
+and a powerful framework for the visualization researcher.  OpenWalnut is
+licensed under the terms of the GNU Lesser General Public License. Written
+entirely in Standard C++ and using a number of portable libraries (e.g.
+OpenSceneGraph and  Qt), it runs on all Windows platforms, OSX, and
+GNU/Linux operating systems.
+
+- please refer to http://www.openwalnut.org for extensive documentation and information.
+
+AUTHORS AND CONTRIBUTORS
+========================
+
+See the files "AUTHORS" and "CONTRIBUTORS".
+
+LICENSE
+=======
+
+We provide dual licensing. You can choose to use either GPLv3 or LGPLv3.
+See "COPYING" and "COPYING.LESSER".
 
 CONTACT
 =======
@@ -42,8 +64,8 @@ make install -- this is optional
 
 After that, OpenWalnut can be used inside the build directory.
 
-Compilation on Windows:
------------------------
+Compilation on Windows and Mac:
+-------------------------------
 
 This is a little bit more complicated. We give you a step-by-step explanation
 on http://www.openwalnut.org.

doc/INSTALL

-THIS FILE CONTAINS ONLY INSTRUCTION FOR INSTALLATION ON LINUX SO FAR. INSTRUCTIONS FOR OTHER PLATFORMS MAY FOLLOW IN THE FUTURE.
-
-Building utilizes cmake and make.
-
-The project should be built in the "build" directory. Assuming 
-the currect working directory to be project's main directory, 
-the following steps should do the trick:
-
-> cd build
-> cmake ../src
-> make
-
-Now the subdirectory "bin" of the "build" directory should contain an executable named walnut.
-Inside "build" the program can be started with the following command:
-
-> bin/walnut
\ No newline at end of file

doc/articles.bib

-@article{Zhang-2008-IWF,
-    author     = {Song Zhang and Stephen Correia and David H. Laidlaw},
-    journal    = {IEEE Transactions on Visualization and Computer Graphics},
-    month      = {Sept-Oct},
-    number     = {5},
-    pages      = {1044--1053},
-    title      = {Identifying white-matter fiber bundles in DTI  data using an automated proximity-based  fiber-clustering method},
-    volume     = {14},
-    year       = {2008}
-}

doc/books.bib

-@book{Preim:2007:VMT,
-    author       = {Bernhard Preim and Dirk Bartz},
-    title        = {Visualization in Medicine: Theory, Algorithms, and Applications},
-    publisher    = {Morgan Kaufmann},
-    year         = {2007},
-    note         = {ISBN: 978-0-12-370596-9}
-}

resources/share/doc/openwalnut/ABOUT

-OpenWalnut is an open source tool for multi-modal medical and brain data
-visualization. Its universality allows it to be easily extended and used in a
-large variety of application cases. It is both, a tool for the scientific user
-and a powerful framework for the visualization researcher.  OpenWalnut is
-licensed under the terms of the GNU Lesser General Public License. Written
-entirely in Standard C++ and using a number of portable libraries (e.g.
-OpenSceneGraph and  Qt), it runs on all Windows platforms, OSX, and
-GNU/Linux operating systems.

resources/share/doc/openwalnut/COPYING.LESSER

-		   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

resources/share/doc/openwalnut/README

-OpenWalnut
-----------
-
-- please refer to http://www.openwalnut.org for extensive documentation and information.
-
-Authors and Contributors:
--------------------------
-
-See the files "AUTHORS" and "CONTRIBUTORS"
-
-License:
---------
-
-See "COPYING" and "COPYING.LESSER"
-

src/qt4gui/CMakeLists.txt

@@ -96,12 +96,12 @@ SETUP_TESTS( "${TARGET_TEST_FILES}" "${BinName}" "" )
 # Copy the help documents. This is not in the resource directory since it is qt4gui specific, so we need to copy it.
 ADD_CUSTOM_TARGET( help
     ALL
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/../doc/user/help/ ${OW_DOC_DIR}/${LibName}/
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/../doc/user/${LibName}/ ${OW_DOC_DIR}/${LibName}/
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/icons/ ${OW_DOC_DIR}/${LibName}/icons
     COMMENT "Copy the GUI Documentation"
 )
 # Also create an install target for this
-INSTALL( DIRECTORY ${PROJECT_SOURCE_DIR}/../doc/user/help/
+INSTALL( DIRECTORY ${PROJECT_SOURCE_DIR}/../doc/user/${LibName}/
          DESTINATION ${OW_DOC_DIR_RELATIVE}/${LibName} 
          COMPONENT "RUNTIME"
        )

tools/cmake/Packaging.cmake

@@ -37,11 +37,11 @@ SET( CPACK_GENERATOR TGZ STGZ )
 
 # Disallow CPack to create an top-level directory?
 # SET( CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0 )
-SET( CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/../resources/share/doc/openwalnut/ABOUT )
+SET( CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/../README )
 SET( CPACK_PACKAGE_VENDOR "OpenWalnut Community" )
 SET( CPACK_PACKAGE_CONTACT "Sebastian Eichelbaum <eichelbaum@informatik.uni-leipzig.de>" )
-SET( CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/../resources/share/doc/openwalnut/COPYING )
-SET( CPACK_RESOURCE_FILE_README ${PROJECT_SOURCE_DIR}/../resources/share/doc/openwalnut/README )
+SET( CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/../COPYING )
+SET( CPACK_RESOURCE_FILE_README ${PROJECT_SOURCE_DIR}/../README )
 
 # Version
 # TODO(all): we should somehot automate this (using hg or our VERSION file for example)