Author: tfmoraes-guest Date: 2017-08-14 12:55:01 +0000 (Mon, 14 Aug 2017) New Revision: 23898
Modified: trunk/packages/invesalius/trunk/debian/changelog trunk/packages/invesalius/trunk/debian/control trunk/packages/invesalius/trunk/debian/copyright trunk/packages/invesalius/trunk/debian/docs trunk/packages/invesalius/trunk/debian/invesalius.install trunk/packages/invesalius/trunk/debian/links trunk/packages/invesalius/trunk/debian/patches/10_import_cython_modules.patch trunk/packages/invesalius/trunk/debian/patches/10_sample_path.patch trunk/packages/invesalius/trunk/debian/rules Log: New InVesalius upstream version Modified: trunk/packages/invesalius/trunk/debian/changelog =================================================================== --- trunk/packages/invesalius/trunk/debian/changelog 2017-08-11 21:13:19 UTC (rev 23897) +++ trunk/packages/invesalius/trunk/debian/changelog 2017-08-14 12:55:01 UTC (rev 23898) @@ -1,8 +1,8 @@ -invesalius (3.1.0-1) UNRELEASED; urgency=low +invesalius (3.1.1-1) UNRELEASED; urgency=low * New upstream version - -- Thiago Franco de Moraes <[email protected]> Wed, 21 Sep 2016 11:43:34 -0300 + -- Thiago Franco de Moraes <[email protected]> Mon, 14 Aug 2017 14:59:34 -0300 invesalius (3.0.1-1) unstable; urgency=low Modified: trunk/packages/invesalius/trunk/debian/control =================================================================== --- trunk/packages/invesalius/trunk/debian/control 2017-08-11 21:13:19 UTC (rev 23897) +++ trunk/packages/invesalius/trunk/debian/control 2017-08-14 12:55:01 UTC (rev 23898) @@ -8,8 +8,7 @@ python-all-dev, cython, python-numpy -Build-Depends-Indep: python, - python-casmoothing +Build-Depends-Indep: python Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/invesalius/trunk/ Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/invesalius/trunk/ @@ -27,18 +26,19 @@ python-imaging, python-gdcm, python-vtkgdcm, - python-casmoothing, + python-vtk6, python-nibabel, python-serial, python-psutil, + python-configparser, python-concurrent.futures, invesalius-bin Description: 3D medical imaging reconstruction software InVesalius generates 3D medical imaging reconstructions based on a sequence of 2D DICOM files acquired with CT or MRI equipments. InVesalius is internationalized (currently available in English, Portuguese, French, - Spanish, Turkish, Italian, Czesh, Catalan, Korean, Romanian and German) and - provides several tools: + Spanish, Turkish, Italian, Czesh, Japanese, Catalan, Korean, Romanian and + German) and provides several tools: * DICOM support including: (a) ACR-NEMA version 1 and 2; (b) DICOM version 3.0 (including various encodings of JPEG -lossless and lossy-, RLE) * Image manipulation features (zoom, pan, rotation, brightness/contrast, Modified: trunk/packages/invesalius/trunk/debian/copyright =================================================================== --- trunk/packages/invesalius/trunk/debian/copyright 2017-08-11 21:13:19 UTC (rev 23897) +++ trunk/packages/invesalius/trunk/debian/copyright 2017-08-14 12:55:01 UTC (rev 23898) @@ -1,19 +1,19 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: InVesalius -Upstream-Contact: InVesalius Team <[email protected]> +Upstream-Contact: InVesalius Team <[email protected]> + Paulo Henrique Junqueira Amorim <[email protected]> + Thiago Franco de Moraes <[email protected]> Tatiana Al-Chueyr <[email protected]> - Thiago Franco de Moraes <[email protected]> - Paulo Henrique Junqueira Amorim <[email protected]> Guilherme Cesar Soares Ruppert <[email protected]> Fabio de Souza Azevedo <[email protected]> Jorge Vicente Lopes da Silva <[email protected]> Source: https://github.com/invesalius/invesalius3.git Files: * -Copyright: © 2008-2010 Centro de Tecnologia da Informação Renato Archer <[email protected]> - Tatiana Al-Chueyr Pereira Martins <[email protected]>, +Copyright: © 2008-2017 Centro de Tecnologia da Informação Renato Archer <[email protected]> Paulo Henrique Junqueira Amorim <[email protected]>, Thiago Franco de Moraes <[email protected]> + Tatiana Al-Chueyr Pereira Martins <[email protected]>, License: GPL-2 Files: presets/raycasting/* @@ -25,12 +25,18 @@ licensed as LGPL-3 and these files seem to be as well, but it is not explicit, so I'm not sure. -Files: invesalius/gui/widgets/platebtn.py -Copyright: © 2007 Cody Precord <[email protected]> +Files: invesalius/gui/widgets/listctrl.py +Copyright: © 2001 by Total Control Software License: WXwindows +Files: invesalius/data/transformations.py +Copyright: © 2006-2015, Christoph Gohlke + © 2006-2015, The Regents of the University of California + Produced at the Laboratory for Fluorescence Dynamics +License: BSD-3-Clause + Files: debian/* -Copyright: © 2009-2010 Centro de Tecnologia da Informação Renato Archer <[email protected]> +Copyright: © 2009-2017 Centro de Tecnologia da Informação Renato Archer <[email protected]> Andreas Tille <[email protected]> License: GPL-2 @@ -100,3 +106,29 @@ choice whether to permit this exception to apply to your modifications. If you do not wish that, you must delete the exception notice from such code and/or adjust the licensing conditions notice accordingly. + + +License: BSD-3-Clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the copyright holders nor the names of any + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. Modified: trunk/packages/invesalius/trunk/debian/docs =================================================================== --- trunk/packages/invesalius/trunk/debian/docs 2017-08-11 21:13:19 UTC (rev 23897) +++ trunk/packages/invesalius/trunk/debian/docs 2017-08-14 12:55:01 UTC (rev 23898) @@ -1,5 +1,5 @@ -AUTHORS.txt +AUTHORS.md HEADER.txt LICENSE.pt.txt LICENSE.txt -NEWS.txt +changelog.md Modified: trunk/packages/invesalius/trunk/debian/invesalius.install =================================================================== --- trunk/packages/invesalius/trunk/debian/invesalius.install 2017-08-11 21:13:19 UTC (rev 23897) +++ trunk/packages/invesalius/trunk/debian/invesalius.install 2017-08-14 12:55:01 UTC (rev 23898) @@ -1,8 +1,9 @@ -invesalius-3.0 /usr/bin/ +invesalius3 /usr/bin/ icons /usr/share/invesalius locale /usr/share/invesalius/ presets /usr/share/invesalius/ docs/user_guide_pt_BR.pdf /usr/share/invesalius/docs/ +docs/user_guide_en.pdf /usr/share/invesalius/docs/ app.py /usr/share/invesalius/ @@ -24,5 +25,5 @@ invesalius/gui/widgets/*.py /usr/share/invesalius/invesalius/gui/widgets/ invesalius/data/*.py /usr/share/invesalius/invesalius/data/ -debian/invesalius-3.0.desktop /usr/share/applications +debian/invesalius.desktop /usr/share/applications debian/invesalius.xpm /usr/share/pixmaps Modified: trunk/packages/invesalius/trunk/debian/links =================================================================== --- trunk/packages/invesalius/trunk/debian/links 2017-08-11 21:13:19 UTC (rev 23897) +++ trunk/packages/invesalius/trunk/debian/links 2017-08-14 12:55:01 UTC (rev 23898) @@ -1 +1,2 @@ usr/share/invesalius/docs/user_guide_pt_BR.pdf usr/share/doc/invesalius/user_guide_pt_BR.pdf +usr/share/invesalius/docs/user_guide_en.pdf usr/share/doc/invesalius/user_guide_en.pdf Modified: trunk/packages/invesalius/trunk/debian/patches/10_import_cython_modules.patch =================================================================== --- trunk/packages/invesalius/trunk/debian/patches/10_import_cython_modules.patch 2017-08-11 21:13:19 UTC (rev 23897) +++ trunk/packages/invesalius/trunk/debian/patches/10_import_cython_modules.patch 2017-08-14 12:55:01 UTC (rev 23898) @@ -1,7 +1,3 @@ -Author: Thiago Franco de Moraes -Date: Thu, 06 Oct 2016 11:22:46 -0200 -Description: Moving cython compiled modules to /usr/lib/invesalius folder and -adapts invesalius to run this way. diff --git a/invesalius/data/mask.py b/invesalius/data/mask.py index d00d22e..be9423a 100644 --- a/invesalius/data/mask.py @@ -16,7 +12,7 @@ from wx.lib.pubsub import pub as Publisher from scipy import ndimage diff --git a/invesalius/data/slice_.py b/invesalius/data/slice_.py -index 65433bb..07d9eff 100644 +index 48f6f46..59bdf7f 100644 --- a/invesalius/data/slice_.py +++ b/invesalius/data/slice_.py @@ -31,9 +31,9 @@ import invesalius.session as ses @@ -32,10 +28,10 @@ OTHER=0 PLIST=1 diff --git a/invesalius/data/styles.py b/invesalius/data/styles.py -index c82ba40..5cfeac5 100644 +index fc3b67f..8063b59 100644 --- a/invesalius/data/styles.py +++ b/invesalius/data/styles.py -@@ -46,7 +46,7 @@ from skimage import filter +@@ -45,7 +45,7 @@ from skimage.morphology import watershed import invesalius.gui.dialogs as dialogs from invesalius.data.measures import MeasureData @@ -44,11 +40,24 @@ import invesalius.data.watershed_process as watershed_process import invesalius.utils as utils +diff --git a/invesalius/data/surface.py b/invesalius/data/surface.py +index 8845085..603c20c 100644 +--- a/invesalius/data/surface.py ++++ b/invesalius/data/surface.py +@@ -37,7 +37,7 @@ import invesalius.data.surface_process as surface_process + import invesalius.utils as utl + import invesalius.data.vtk_utils as vu + +-from invesalius.data import cy_mesh ++from invesalius_cy import cy_mesh + # TODO: Verificar ReleaseDataFlagOn and SetSource + + class Surface(): diff --git a/setup.py b/setup.py -index c9223db..c466a29 100644 +index cc05315..6913ec4 100644 --- a/setup.py +++ b/setup.py -@@ -11,22 +11,22 @@ import numpy +@@ -11,26 +11,26 @@ import numpy if sys.platform == 'linux2': setup( cmdclass = {'build_ext': build_ext}, @@ -74,4 +83,9 @@ + Extension("invesalius_cy.floodfill", ["invesalius_cy/floodfill.pyx"], include_dirs=[numpy.get_include()], language='c++',), - ]) + +- Extension("invesalius.data.cy_mesh", ["invesalius/data/cy_mesh.pyx"], ++ Extension("invesalius_cy.cy_mesh", ["invesalius_cy/cy_mesh.pyx"], + include_dirs=[numpy.get_include()], + extra_compile_args=['-fopenmp', '-std=c++11'], + extra_link_args=['-fopenmp', '-std=c++11'], Modified: trunk/packages/invesalius/trunk/debian/patches/10_sample_path.patch =================================================================== --- trunk/packages/invesalius/trunk/debian/patches/10_sample_path.patch 2017-08-11 21:13:19 UTC (rev 23897) +++ trunk/packages/invesalius/trunk/debian/patches/10_sample_path.patch 2017-08-14 12:55:01 UTC (rev 23898) @@ -1,16 +1,13 @@ -Author: Thiago Franco de Moraes <[email protected]> -Description: Adjust path to samples to the known Debian location - diff --git a/invesalius/constants.py b/invesalius/constants.py -index 64745ae..ff76a89 100644 +index 05cbc6b..d9e05ab 100644 --- a/invesalius/constants.py +++ b/invesalius/constants.py -@@ -332,7 +332,7 @@ if hasattr(sys,"frozen") and (sys.frozen == "windows_exe"\ - folder=RAYCASTING_PRESETS_DIRECTORY= os.path.join(abs_path, "presets", "raycasting") +@@ -350,7 +350,7 @@ if hasattr(sys,"frozen") and (sys.frozen == "windows_exe"\ + else: - ICON_DIR = os.path.abspath(os.path.join(FILE_PATH, '..', 'icons')) -- SAMPLE_DIR = os.path.abspath(os.path.join(FILE_PATH,'..', 'samples')) -+ SAMPLE_DIR = "/usr/share/doc/invesalius-examples/examples/" - DOC_DIR = os.path.abspath(os.path.join(FILE_PATH,'..', 'docs')) + ICON_DIR = os.path.abspath(os.path.join(FILE_PATH, u'..', u'icons')) +- SAMPLE_DIR = os.path.abspath(os.path.join(FILE_PATH, u'..', u'samples')) ++ SAMPLE_DIR = u"/usr/share/doc/invesalius-examples/examples/" + DOC_DIR = os.path.abspath(os.path.join(FILE_PATH, u'..', u'docs')) - folder=RAYCASTING_PRESETS_DIRECTORY= os.path.abspath(os.path.join(".", + folder=RAYCASTING_PRESETS_DIRECTORY= os.path.abspath(os.path.join(u".", Modified: trunk/packages/invesalius/trunk/debian/rules =================================================================== --- trunk/packages/invesalius/trunk/debian/rules 2017-08-11 21:13:19 UTC (rev 23897) +++ trunk/packages/invesalius/trunk/debian/rules 2017-08-14 12:55:01 UTC (rev 23898) @@ -33,11 +33,11 @@ cp invesalius/data/*.pxd invesalius_cy create-launcher: - echo '#!/bin/sh' > invesalius-3.0 - echo 'export PYTHONPATH=$$PYTHONPATH:"/usr/lib/invesalius"' >> invesalius-3.0 - echo 'export INVESALIUS_LIBRARY_PATH="/usr/share/invesalius/"' >> invesalius-3.0 - echo 'cd $$INVESALIUS_LIBRARY_PATH' >> invesalius-3.0 - echo 'python app.py $$@' >> invesalius-3.0 + echo '#!/bin/sh' > invesalius3 + echo 'export PYTHONPATH=$$PYTHONPATH:"/usr/lib/invesalius"' >> invesalius3 + echo 'export INVESALIUS_LIBRARY_PATH="/usr/share/invesalius/"' >> invesalius3 + echo 'cd $$INVESALIUS_LIBRARY_PATH' >> invesalius3 + echo 'python app.py $$@' >> invesalius3 override_dh_install: create-launcher dh_install _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
