Author: malat-guest Date: 2011-08-19 17:37:54 +0000 (Fri, 19 Aug 2011) New Revision: 7507
Added: trunk/packages/ctk/debian/ctk.lintian-overrides trunk/packages/ctk/debian/libctk-dev.dirs trunk/packages/ctk/debian/libctk-dev.lintian-overrides trunk/packages/ctk/debian/libctk.substvars trunk/packages/ctk/debian/libctk0.1-dbg.lintian-overrides trunk/packages/ctk/debian/libctk0.1.lintian-overrides trunk/packages/ctk/debian/patches/debian-changes-0.1.0-2 trunk/packages/ctk/debian/patches/debian-changes-0.1.0-3 trunk/packages/ctk/debian/patches/debian-changes-0.1.0-4 Removed: trunk/packages/ctk/debian/README.Debian trunk/packages/ctk/debian/README.source trunk/packages/ctk/debian/docs trunk/packages/ctk/debian/libctkcore0-dev.install trunk/packages/ctk/debian/libctkcore0.1.install trunk/packages/ctk/debian/patches/cmakebuildsystem.patch Modified: trunk/packages/ctk/debian/changelog trunk/packages/ctk/debian/compat trunk/packages/ctk/debian/control trunk/packages/ctk/debian/copyright trunk/packages/ctk/debian/get-orig-source trunk/packages/ctk/debian/patches/series trunk/packages/ctk/debian/rules Log: Merge diff with current experimental package Deleted: trunk/packages/ctk/debian/README.Debian =================================================================== --- trunk/packages/ctk/debian/README.Debian 2011-08-19 17:37:37 UTC (rev 7506) +++ trunk/packages/ctk/debian/README.Debian 2011-08-19 17:37:54 UTC (rev 7507) @@ -1,6 +0,0 @@ -CommonTK for Debian -------------------- - -in order to build CTK in a debian way, we are switching the default SuperBuild option to OFF - - -- Mathieu Malaterre <[email protected]> Sat, 05 Mar 2011 16:34:12 +0100 Deleted: trunk/packages/ctk/debian/README.source =================================================================== --- trunk/packages/ctk/debian/README.source 2011-08-19 17:37:37 UTC (rev 7506) +++ trunk/packages/ctk/debian/README.source 2011-08-19 17:37:54 UTC (rev 7507) @@ -1,6 +0,0 @@ -commontk for Debian -------------------- - -This packages uses a patch system. Please read -/usr/share/doc/quilt/README.source for more informations. - Modified: trunk/packages/ctk/debian/changelog =================================================================== --- trunk/packages/ctk/debian/changelog 2011-08-19 17:37:37 UTC (rev 7506) +++ trunk/packages/ctk/debian/changelog 2011-08-19 17:37:54 UTC (rev 7507) @@ -1,5 +1,20 @@ -commontk (0.1.0-1) unstable; urgency=low +ctk (0.1.0-4) experimental; urgency=low - * Initial release (Closes: #617337) + * Changed maintainer and uploader + * build with -DCTK_APP_ctkCLIPluginExplorer:BOOL=ON - -- Mathieu Malaterre <[email protected]> Sat, 05 Mar 2011 16:34:12 +0100 + -- Dominique Belhachemi <[email protected]> Tue, 26 Jul 2011 20:04:04 -0400 + +ctk (0.1.0-3) experimental; urgency=low + + * compile log4qt with -fPIC on all archs (Closes: #634780) + * build with -DCTK_LIB_ImageProcessing/ITK/Core:BOOL=ON + * build with -DCTK_LIB_Widgets:BOOL=ON + + -- Dominique Belhachemi <[email protected]> Fri, 22 Jul 2011 19:48:05 -0400 + +ctk (0.1.0-2) experimental; urgency=low + + * Initial release (Closes: #601180) + + -- Dominique Belhachemi <[email protected]> Thu, 27 Jan 2011 19:25:00 -0500 Modified: trunk/packages/ctk/debian/compat =================================================================== --- trunk/packages/ctk/debian/compat 2011-08-19 17:37:37 UTC (rev 7506) +++ trunk/packages/ctk/debian/compat 2011-08-19 17:37:54 UTC (rev 7507) @@ -1 +1 @@ -7 +8 Modified: trunk/packages/ctk/debian/control =================================================================== --- trunk/packages/ctk/debian/control 2011-08-19 17:37:37 UTC (rev 7506) +++ trunk/packages/ctk/debian/control 2011-08-19 17:37:54 UTC (rev 7507) @@ -1,53 +1,66 @@ -Source: commontk -Section: libs -Priority: extra +Source: ctk +Priority: optional Maintainer: Debian Med Packaging Team <[email protected]> +Uploaders: Mathieu Malaterre <[email protected]> DM-Upload-Allowed: yes -Uploaders: Mathieu Malaterre <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), cmake, quilt (>= 0.46-7~), libpythonqt2-dev (>= 2.0.1), liblog4qt0-dev (>= 0.3), binutils-dev -Standards-Version: 3.9.1 -Homepage: http://commontk.org -Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/commontk/trunk/?rev=0&sc=0 -Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/commontk/trunk/ +Build-Depends: debhelper (>= 8), cmake (>= 2.8.2), cdbs, libqt4-dev, libdcmtk2-dev, + libinsighttoolkit3-dev, libgdcm2-dev, zlib1g-dev +#, libvtk5-dev +#, libpythonqt2-dev, python-dev +Standards-Version: 3.9.2 +Section: libs +Homepage: http://www.commontk.org/ +#Vcs-Git: git://git.debian.org/collab-maint/ctk.git +#Vcs-Browser: http://git.debian.org/?p=collab-maint/ctk.git;a=summary -Package: libctkcore0.1 +Package: libctk-dev +Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Common ToolKit for medical image analysis (core) - The Common Toolkit is a community effort to provide support code for medical - image analysis, surgical navigation, and related projects. - The goal of CTK are as follows: - Provide a unified set of basic programming constructs that are useful for - medical imaging applications development +Depends: libctk0.1 (= ${binary:Version}), ${misc:Depends} +Description: toolkit for medical imaging apllication development - devel + The goals of CTK are as follows: + * Provide a unified set of basic programming constructs that are useful for + medical imaging applications development + * Facilitate the exchange and combination of code and data + * Document, integrate, and adapt successful solutions + * Avoid the duplication of code and data + * Continuously extend to new tasks within the scope of the toolkit + (medical imaging) without burdening existing tasks . - Facilitate the exchange and combination of code and data - . - Document, integrate, and adapt successful solutions - . - Avoid the duplication of code and data - . - Continuously extend to new tasks within the scope of the toolkit (medical - imaging) without burdening existing tasks - . - This is the CTK Core plugin + This package provides the CTK header files required to compile C++ programs + that use CTK. -Package: libctkcore0-dev +Package: libctk0.1 +Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Common ToolKit for medical image analysis (core development) - The Common Toolkit is a community effort to provide support code for medical - image analysis, surgical navigation, and related projects. - The goal of CTK are as follows: - Provide a unified set of basic programming constructs that are useful for - medical imaging applications development +Description: toolkit for medical imaging apllication development - runtime + The goals of CTK are as follows: + * Provide a unified set of basic programming constructs that are useful for + medical imaging applications development + * Facilitate the exchange and combination of code and data + * Document, integrate, and adapt successful solutions + * Avoid the duplication of code and data + * Continuously extend to new tasks within the scope of the toolkit + (medical imaging) without burdening existing tasks . - Facilitate the exchange and combination of code and data + This package provides the runtime binaries for CTK + +Package: libctk0.1-dbg +Architecture: any +Section: debug +Priority: extra +Depends: + libctk0.1 (= ${binary:Version}), + ${misc:Depends} +Description: debugging symbols for libctk0.1 + The goals of CTK are as follows: + * Provide a unified set of basic programming constructs that are useful for + medical imaging applications development + * Facilitate the exchange and combination of code and data + * Document, integrate, and adapt successful solutions + * Avoid the duplication of code and data + * Continuously extend to new tasks within the scope of the toolkit + (medical imaging) without burdening existing tasks . - Document, integrate, and adapt successful solutions - . - Avoid the duplication of code and data - . - Continuously extend to new tasks within the scope of the toolkit (medical - imaging) without burdening existing tasks - . - This is the CTK Core plugin development files + This package contains the debugging symbols for libctk0.1 Modified: trunk/packages/ctk/debian/copyright =================================================================== --- trunk/packages/ctk/debian/copyright 2011-08-19 17:37:37 UTC (rev 7506) +++ trunk/packages/ctk/debian/copyright 2011-08-19 17:37:54 UTC (rev 7507) @@ -1,35 +1,281 @@ -This work was packaged for Debian by: +Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=166 - Mathieu Malaterre <[email protected]> on Sat, 05 Mar 2011 16:34:12 +0100 +Files: * +Copyright: + Martin Heinrich + Sandia Corporation. + Mathieu Malaterre <[email protected]> + Sandia Corporation, Kitware Inc. + Junio C Hamano + Brigham and Women's Hospital (BWH) + CISTIB - Universtitat Pompeu Fabra + German Cancer Research Center + Isomics Inc. + Ken Martin, Will Schroeder, Bill Lorensen + Kitware Inc. + Mint Medical GmbH +License: Apache License, Version 2.0 -It was downloaded from: - http://commontk.org +Files: + ./Libs/Core/ctkBinaryFileDescriptor.cpp + ./Libs/Core/ctkBinaryFileDescriptor.h +Copyright: + Brigham and Women's Hospital (BWH) + Kitware Inc. +License: + Apache License, Version 2.0 + 3D Slicer license, Version 1.0 -Upstream Author(s): - Commontk members (http://github.com/commontk) - +Files: + ./Libs/Widgets/ctkSettings.cpp + ./Libs/Widgets/ctkCheckableHeaderView.h + ./Libs/Widgets/ctkCheckBoxPixmaps.h + ./Libs/Widgets/ctkConsole.h + ./Libs/Widgets/ctkCheckBoxPixmaps.cpp + ./Libs/Widgets/ctkCheckableHeaderView.cpp + ./Libs/Widgets/ctkSettings.h + ./Libs/Widgets/ctkToolTipTrapper.cpp + ./Libs/Widgets/ctkConsole.cpp + ./Libs/Widgets/ctkToolTipTrapper.h + ./Libs/Scripting/Python/Widgets/ctkPythonConsole.cpp + ./Libs/Scripting/Python/Widgets/ctkPythonConsole.h + ./Libs/Core/ctkCheckableModelHelper.h Copyright: + 2005-2008 Sandia Corporation + Kitware Inc. +License: + Apache License, Version 2.0 + ParaView license version 1.2 - Copyright (c) German Cancer Research Center - Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen - Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc. - Copyright (c) Mint Medical GmbH - Copyright (c) Kitware Inc. - Copyright 2008 Sandia Corporation. - Copyright 2009 Mathieu Malaterre <[email protected]> -License: +Files: debian/* +Copyright: 2010-2011 Dominique Belhachemi <[email protected]> +License: Apache License, Version 2.0 - All code is offered under the Apache License (2.0) - On Debian systems, the Apache license is available at - `/usr/share/common-licenses/Apache-2.0'. -The Debian packaging is: - Copyright (C) 2011 Mathieu Malaterre <[email protected]> +License: ParaView license version 1.2 + Downloaded from http://www.paraview.org/paraview/project/license.html + . + Sandia National Laboratories, New Mexico PO Box 5800 Albuquerque, NM 87185 + . + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + . + Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive license for use of this work by or on behalf of the U.S. Government. + . + 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 Kitware 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 AUTHORS 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. -and is licensed under the Apache license version 2.0, -see "/usr/share/common-licenses/Apache-2.0". + +License: 3D Slicer License, Version 1.0 + 3D Slicer Contribution and Software License Agreement ("Agreement") + Version 1.0 (December 20, 2005) + . + This Agreement covers contributions to and downloads from the 3D + Slicer project ("Slicer") maintained by The Brigham and Women's + Hospital, Inc. ("Brigham"). Part A of this Agreement applies to + contributions of software and/or data to Slicer (including making + revisions of or additions to code and/or data already in Slicer). Part + B of this Agreement applies to downloads of software and/or data from + Slicer. Part C of this Agreement applies to all transactions with + Slicer. If you distribute Software (as defined below) downloaded from + Slicer, all of the paragraphs of Part B of this Agreement must be + included with and apply to such Software. + . + Your contribution of software and/or data to Slicer (including prior + to the date of the first publication of this Agreement, each a + "Contribution") and/or downloading, copying, modifying, displaying, + distributing or use of any software and/or data from Slicer + (collectively, the "Software") constitutes acceptance of all of the + terms and conditions of this Agreement. If you do not agree to such + terms and conditions, you have no right to contribute your + Contribution, or to download, copy, modify, display, distribute or use + the Software. + . + PART A. CONTRIBUTION AGREEMENT - License to Brigham with Right to + Sublicense ("Contribution Agreement"). + . + 1. As used in this Contribution Agreement, "you" means the individual + contributing the Contribution to Slicer and the institution or + entity which employs or is otherwise affiliated with such + individual in connection with such Contribution. + . + 2. This Contribution Agreement applies to all Contributions made to + Slicer, including without limitation Contributions made prior to + the date of first publication of this Agreement. If at any time you + make a Contribution to Slicer, you represent that (i) you are + legally authorized and entitled to make such Contribution and to + grant all licenses granted in this Contribution Agreement with + respect to such Contribution; (ii) if your Contribution includes + any patient data, all such data is de-identified in accordance with + U.S. confidentiality and security laws and requirements, including + but not limited to the Health Insurance Portability and + Accountability Act (HIPAA) and its regulations, and your disclosure + of such data for the purposes contemplated by this Agreement is + properly authorized and in compliance with all applicable laws and + regulations; and (iii) you have preserved in the Contribution all + applicable attributions, copyright notices and licenses for any + third party software or data included in the Contribution. + . + 3. Except for the licenses granted in this Agreement, you reserve all + right, title and interest in your Contribution. + . + 4. You hereby grant to Brigham, with the right to sublicense, a + perpetual, worldwide, non-exclusive, no charge, royalty-free, + irrevocable license to use, reproduce, make derivative works of, + display and distribute the Contribution. If your Contribution is + protected by patent, you hereby grant to Brigham, with the right to + sublicense, a perpetual, worldwide, non-exclusive, no-charge, + royalty-free, irrevocable license under your interest in patent + rights covering the Contribution, to make, have made, use, sell and + otherwise transfer your Contribution, alone or in combination with + any other code. + . + 5. You acknowledge and agree that Brigham may incorporate your + Contribution into Slicer and may make Slicer available to members + of the public on an open source basis under terms substantially in + accordance with the Software License set forth in Part B of this + Agreement. You further acknowledge and agree that Brigham shall + have no liability arising in connection with claims resulting from + your breach of any of the terms of this Agreement. + . + 6. YOU WARRANT THAT TO THE BEST OF YOUR KNOWLEDGE YOUR CONTRIBUTION + DOES NOT CONTAIN ANY CODE THAT REQURES OR PRESCRIBES AN "OPEN + SOURCE LICENSE" FOR DERIVATIVE WORKS (by way of non-limiting + example, the GNU General Public License or other so-called + "reciprocal" license that requires any derived work to be licensed + under the GNU General Public License or other "open source + license"). + . + PART B. DOWNLOADING AGREEMENT - License from Brigham with Right to + Sublicense ("Software License"). + . + 1. As used in this Software License, "you" means the individual + downloading and/or using, reproducing, modifying, displaying and/or + distributing the Software and the institution or entity which + employs or is otherwise affiliated with such individual in + connection therewith. The Brigham and Women?s Hospital, + Inc. ("Brigham") hereby grants you, with right to sublicense, with + respect to Brigham's rights in the software, and data, if any, + which is the subject of this Software License (collectively, the + "Software"), a royalty-free, non-exclusive license to use, + reproduce, make derivative works of, display and distribute the + Software, provided that: + . + (a) you accept and adhere to all of the terms and conditions of this + Software License; + . + (b) in connection with any copy of or sublicense of all or any portion + of the Software, all of the terms and conditions in this Software + License shall appear in and shall apply to such copy and such + sublicense, including without limitation all source and executable + forms and on any user documentation, prefaced with the following + words: "All or portions of this licensed product (such portions are + the "Software") have been obtained under license from The Brigham and + Women's Hospital, Inc. and are subject to the following terms and + conditions:" + . + (c) you preserve and maintain all applicable attributions, copyright + notices and licenses included in or applicable to the Software; + . + (d) modified versions of the Software must be clearly identified and + marked as such, and must not be misrepresented as being the original + Software; and + . + (e) you consider making, but are under no obligation to make, the + source code of any of your modifications to the Software freely + available to others on an open source basis. + . + 2. The license granted in this Software License includes without + limitation the right to (i) incorporate the Software into + proprietary programs (subject to any restrictions applicable to + such programs), (ii) add your own copyright statement to your + modifications of the Software, and (iii) provide additional or + different license terms and conditions in your sublicenses of + modifications of the Software; provided that in each case your use, + reproduction or distribution of such modifications otherwise + complies with the conditions stated in this Software License. + . + 3. This Software License does not grant any rights with respect to + third party software, except those rights that Brigham has been + authorized by a third party to grant to you, and accordingly you + are solely responsible for (i) obtaining any permissions from third + parties that you need to use, reproduce, make derivative works of, + display and distribute the Software, and (ii) informing your + sublicensees, including without limitation your end-users, of their + obligations to secure any such required permissions. + . + 4. The Software has been designed for research purposes only and has + not been reviewed or approved by the Food and Drug Administration + or by any other agency. YOU ACKNOWLEDGE AND AGREE THAT CLINICAL + APPLICATIONS ARE NEITHER RECOMMENDED NOR ADVISED. Any + commercialization of the Software is at the sole risk of the party + or parties engaged in such commercialization. You further agree to + use, reproduce, make derivative works of, display and distribute + the Software in compliance with all applicable governmental laws, + regulations and orders, including without limitation those relating + to export and import control. + . + 5. The Software is provided "AS IS" and neither Brigham nor any + contributor to the software (each a "Contributor") shall have any + obligation to provide maintenance, support, updates, enhancements + or modifications thereto. BRIGHAM AND ALL CONTRIBUTORS SPECIFICALLY + DISCLAIM ALL EXPRESS AND IMPLIED WARRANTIES OF ANY KIND INCLUDING, + BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR + A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + BRIGHAM OR ANY CONTRIBUTOR BE LIABLE TO ANY PARTY FOR DIRECT, + INDIRECT, SPECIAL, INCIDENTAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY ARISING IN ANY WAY + RELATED TO THE SOFTWARE, EVEN IF BRIGHAM OR ANY CONTRIBUTOR HAS + BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. TO THE MAXIMUM + EXTENT NOT PROHIBITED BY LAW OR REGULATION, YOU FURTHER ASSUME ALL + LIABILITY FOR YOUR USE, REPRODUCTION, MAKING OF DERIVATIVE WORKS, + DISPLAY, LICENSE OR DISTRIBUTION OF THE SOFTWARE AND AGREE TO + INDEMNIFY AND HOLD HARMLESS BRIGHAM AND ALL CONTRIBUTORS FROM AND + AGAINST ANY AND ALL CLAIMS, SUITS, ACTIONS, DEMANDS AND JUDGMENTS + ARISING THEREFROM. + . + 6. None of the names, logos or trademarks of Brigham or any of + Brigham's affiliates or any of the Contributors, or any funding + agency, may be used to endorse or promote products produced in + whole or in part by operation of the Software or derived from or + based on the Software without specific prior written permission + from the applicable party. + . + 7. Any use, reproduction or distribution of the Software which is not + in accordance with this Software License shall automatically revoke + all rights granted to you under this Software License and render + Paragraphs 1 and 2 of this Software License null and void. + . + 8. This Software License does not grant any rights in or to any + intellectual property owned by Brigham or any Contributor except + those rights expressly granted hereunder. + . + PART C. MISCELLANEOUS + . + This Agreement shall be governed by and construed in accordance with + the laws of The Commonwealth of Massachusetts without regard to + principles of conflicts of law. This Agreement shall supercede and + replace any license terms that you may have agreed to previously with + respect to Slicer. + + Added: trunk/packages/ctk/debian/ctk.lintian-overrides =================================================================== --- trunk/packages/ctk/debian/ctk.lintian-overrides (rev 0) +++ trunk/packages/ctk/debian/ctk.lintian-overrides 2011-08-19 17:37:54 UTC (rev 7507) @@ -0,0 +1,2 @@ +# Upstream is mentioning the "GNU General Public License" in their non-GPL license +ctk: copyright-should-refer-to-common-license-file-for-gpl Deleted: trunk/packages/ctk/debian/docs =================================================================== --- trunk/packages/ctk/debian/docs 2011-08-19 17:37:37 UTC (rev 7506) +++ trunk/packages/ctk/debian/docs 2011-08-19 17:37:54 UTC (rev 7507) @@ -1 +0,0 @@ -README Modified: trunk/packages/ctk/debian/get-orig-source =================================================================== --- trunk/packages/ctk/debian/get-orig-source 2011-08-19 17:37:37 UTC (rev 7506) +++ trunk/packages/ctk/debian/get-orig-source 2011-08-19 17:37:54 UTC (rev 7507) @@ -1,12 +1,30 @@ #!/bin/sh +set -ex -VERSION=0.1.0 +PACKAGE=ctk -# Clone from github: -git clone git://github.com/commontk/CTK.git commontk-$VERSION +VERSION=${VERSION:-$2} +TARFILE=${TARFILE:-$3} -# remove .git dir -rm -rf commontk-$VERSION/.git +if [ -z ${VERSION}]; then +VERSION=`dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$/\1/p'` +fi -GZIP=-9 tar cfz commontk_"$VERSION".orig.tar.gz commontk-"$VERSION" -#rm -rf commontk-"$VERSION" +REVISION=`echo $VERSION | sed -e 's/^.*svn//g'` + + +if [ -z ${TARFILE}]; then +TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz +fi + +FOLDER=${PACKAGE}-${VERSION} + + +git clone https://github.com/commontk/CTK.git ${FOLDER} +rm -rf ${FOLDER}/.git +git clone https://github.com/commontk/Log4Qt.git ${FOLDER}/Utilities/Log4Qt +rm -rf ${FOLDER}/Utilities/Log4Qt/.git + + +GZIP=-9 tar czf ${TARFILE} ${FOLDER} +rm -rf ${FOLDER} Added: trunk/packages/ctk/debian/libctk-dev.dirs =================================================================== --- trunk/packages/ctk/debian/libctk-dev.dirs (rev 0) +++ trunk/packages/ctk/debian/libctk-dev.dirs 2011-08-19 17:37:54 UTC (rev 7507) @@ -0,0 +1,2 @@ +usr/lib +usr/include Added: trunk/packages/ctk/debian/libctk-dev.lintian-overrides =================================================================== --- trunk/packages/ctk/debian/libctk-dev.lintian-overrides (rev 0) +++ trunk/packages/ctk/debian/libctk-dev.lintian-overrides 2011-08-19 17:37:54 UTC (rev 7507) @@ -0,0 +1,3 @@ +# Upstream is mentioning the "GNU General Public License" in their non-GPL license +libctk-dev: copyright-should-refer-to-common-license-file-for-gpl + Added: trunk/packages/ctk/debian/libctk.substvars =================================================================== Added: trunk/packages/ctk/debian/libctk0.1-dbg.lintian-overrides =================================================================== --- trunk/packages/ctk/debian/libctk0.1-dbg.lintian-overrides (rev 0) +++ trunk/packages/ctk/debian/libctk0.1-dbg.lintian-overrides 2011-08-19 17:37:54 UTC (rev 7507) @@ -0,0 +1,3 @@ +# Upstream is mentioning the "GNU General Public License" in their non-GPL license +libctk0.1-dbg: copyright-should-refer-to-common-license-file-for-gpl + Added: trunk/packages/ctk/debian/libctk0.1.lintian-overrides =================================================================== --- trunk/packages/ctk/debian/libctk0.1.lintian-overrides (rev 0) +++ trunk/packages/ctk/debian/libctk0.1.lintian-overrides 2011-08-19 17:37:54 UTC (rev 7507) @@ -0,0 +1,4 @@ +libctk0.1: package-name-doesnt-match-sonames libCTKCore0.1 libCTKDummyPlugin0.1 libCTKPluginFramework0.1 +# Upstream is mentioning the "GNU General Public License" in their non-GPL license +libctk0.1: copyright-should-refer-to-common-license-file-for-gpl + Deleted: trunk/packages/ctk/debian/libctkcore0-dev.install =================================================================== --- trunk/packages/ctk/debian/libctkcore0-dev.install 2011-08-19 17:37:37 UTC (rev 7506) +++ trunk/packages/ctk/debian/libctkcore0-dev.install 2011-08-19 17:37:54 UTC (rev 7507) @@ -1,2 +0,0 @@ -usr/lib/ctk-0.1/libCTK*.so usr/lib -usr/include/ctk-0.1/*.h Deleted: trunk/packages/ctk/debian/libctkcore0.1.install =================================================================== --- trunk/packages/ctk/debian/libctkcore0.1.install 2011-08-19 17:37:37 UTC (rev 7506) +++ trunk/packages/ctk/debian/libctkcore0.1.install 2011-08-19 17:37:54 UTC (rev 7507) @@ -1 +0,0 @@ -usr/lib/ctk-0.1/libCTK*.so.* usr/lib Deleted: trunk/packages/ctk/debian/patches/cmakebuildsystem.patch =================================================================== --- trunk/packages/ctk/debian/patches/cmakebuildsystem.patch 2011-08-19 17:37:37 UTC (rev 7506) +++ trunk/packages/ctk/debian/patches/cmakebuildsystem.patch 2011-08-19 17:37:54 UTC (rev 7507) @@ -1,12 +0,0 @@ -Index: ctk-0.1/Libs/Core/CMakeLists.txt -=================================================================== ---- ctk-0.1.orig/Libs/Core/CMakeLists.txt 2011-03-08 09:48:58.000000000 +0100 -+++ ctk-0.1/Libs/Core/CMakeLists.txt 2011-03-08 09:49:32.000000000 +0100 -@@ -105,6 +105,7 @@ - - ctkFunctionGetTargetLibraries(KIT_target_libraries) - -+list(APPEND KIT_target_libraries "/usr/lib/libLog4Qt.so") - ctkMacroBuildLib( - NAME ${PROJECT_NAME} - EXPORT_DIRECTIVE ${KIT_export_directive} Added: trunk/packages/ctk/debian/patches/debian-changes-0.1.0-2 =================================================================== --- trunk/packages/ctk/debian/patches/debian-changes-0.1.0-2 (rev 0) +++ trunk/packages/ctk/debian/patches/debian-changes-0.1.0-2 2011-08-19 17:37:54 UTC (rev 7507) @@ -0,0 +1,59 @@ +Description: Upstream changes introduced in version 0.1.0-2 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + ctk (0.1.0-2) experimental; urgency=low + . + * Initial release (Closes: #601180) + . + The person named in the Author field signed this changelog entry. +Author: Dominique Belhachemi <[email protected]> +Bug-Debian: http://bugs.debian.org/601180 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- ctk-0.1.0.orig/CMakeLists.txt ++++ ctk-0.1.0/CMakeLists.txt +@@ -57,6 +57,8 @@ endif() + PROJECT(CTK) + #----------------------------------------------------------------------------- + ++ADD_SUBDIRECTORY(Utilities/Log4Qt) ++ + #----------------------------------------------------------------------------- + # Library mode: SHARED (default) or STATIC + # +@@ -136,7 +138,7 @@ IF(NOT CTK_INSTALL_BIN_DIR) + SET(CTK_INSTALL_BIN_DIR "bin") + ENDIF() + IF(NOT CTK_INSTALL_LIB_DIR) +- SET(CTK_INSTALL_LIB_DIR "lib/ctk-${CTK_MAJOR_VERSION}.${CTK_MINOR_VERSION}") ++ SET(CTK_INSTALL_LIB_DIR "lib") + ENDIF() + IF(NOT CTK_INSTALL_INCLUDE_DIR) + SET(CTK_INSTALL_INCLUDE_DIR "include/ctk-${CTK_MAJOR_VERSION}.${CTK_MINOR_VERSION}") +--- ctk-0.1.0.orig/Libs/Core/CMakeLists.txt ++++ ctk-0.1.0/Libs/Core/CMakeLists.txt +@@ -3,7 +3,9 @@ PROJECT(CTKCore) + # + # 3rd party dependencies + # +-INCLUDE(${Log4Qt_USE_FILE}) ++INCLUDE_DIRECTORIES(${Log4Qt_SOURCE_DIR}/src) ++LINK_DIRECTORIES(${Log4Qt_BINARY_DIR}/bin) ++SET(Log4Qt_LIBRARIES ${Log4Qt_BINARY_DIR}/bin/libLog4Qt.a) + + # CMake modules + SET(CMAKE_MODULE_PATH ${CTKCore_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH}) Added: trunk/packages/ctk/debian/patches/debian-changes-0.1.0-3 =================================================================== --- trunk/packages/ctk/debian/patches/debian-changes-0.1.0-3 (rev 0) +++ trunk/packages/ctk/debian/patches/debian-changes-0.1.0-3 2011-08-19 17:37:54 UTC (rev 7507) @@ -0,0 +1,91 @@ +Description: Upstream changes introduced in version 0.1.0-3 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + ctk (0.1.0-3) experimental; urgency=low + . + * compile log4qt with -fPIC on all archs (Closes: #634780) + * build with -DCTK_LIB_ImageProcessing/ITK/Core:BOOL=ON + * build with -DCTK_LIB_Widgets:BOOL=ON + . + The person named in the Author field signed this changelog entry. +Author: Dominique Belhachemi <[email protected]> +Bug-Debian: http://bugs.debian.org/634780 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- ctk-0.1.0.orig/Libs/ImageProcessing/ITK/Core/target_libraries.cmake ++++ ctk-0.1.0/Libs/ImageProcessing/ITK/Core/target_libraries.cmake +@@ -5,6 +5,6 @@ + # + + SET(target_libraries +- ITK_LIBRARIES ++# ITK_LIBRARIES + CTKCore + ) +--- ctk-0.1.0.orig/Libs/ImageProcessing/ITK/Core/CMakeLists.txt ++++ ctk-0.1.0/Libs/ImageProcessing/ITK/Core/CMakeLists.txt +@@ -3,6 +3,7 @@ PROJECT(CTKImageProcessingITKCore) + # + # 3rd party dependencies + # ++FIND_PACKAGE(ITK REQUIRED) + INCLUDE(${ITK_USE_FILE}) + + # +@@ -40,7 +41,7 @@ ctkMacroBuildLib( + SRCS ${KIT_SRCS} + MOC_SRCS ${KIT_MOC_SRCS} + UI_FORMS ${KIT_UI_FORMS} +- TARGET_LIBRARIES ${KIT_target_libraries} ++ TARGET_LIBRARIES ${KIT_target_libraries} ITKCommon + RESOURCES ${KIT_resources} + LIBRARY_TYPE ${CTK_LIBRARY_MODE} + ) +--- ctk-0.1.0.orig/Libs/Core/CMakeLists.txt ++++ ctk-0.1.0/Libs/Core/CMakeLists.txt +@@ -5,7 +5,7 @@ PROJECT(CTKCore) + # + INCLUDE_DIRECTORIES(${Log4Qt_SOURCE_DIR}/src) + LINK_DIRECTORIES(${Log4Qt_BINARY_DIR}/bin) +-SET(Log4Qt_LIBRARIES ${Log4Qt_BINARY_DIR}/bin/libLog4Qt.a) ++SET(Log4Qt_LIBRARIES ${Log4Qt_BINARY_DIR}/bin/libLog4Qt.a)# + + # CMake modules + SET(CMAKE_MODULE_PATH ${CTKCore_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH}) +--- ctk-0.1.0.orig/Utilities/Log4Qt/CMakeLists.txt ++++ ctk-0.1.0/Utilities/Log4Qt/CMakeLists.txt +@@ -18,7 +18,7 @@ ENDFOREACH() + #----------------------------------------------------------------------------- + # Library type - Statically built + # +-set(BUILD_SHARED_LIBS FALSE) ++set(BUILD_SHARED_LIBS FALSE)# + + #----------------------------------------------------------------------------- + # Set symbol visibility Flags +@@ -118,9 +118,9 @@ add_library(${PROJECT_NAME} + # used when making a shared object; recompile with -fPIC + # See http://www.cmake.org/pipermail/cmake/2007-May/014350.html + # +-IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" ) ++#IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" ) + SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-fPIC") +-ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" ) ++#ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" ) + + #----------------------------------------------------------------------------- + # Install rules Added: trunk/packages/ctk/debian/patches/debian-changes-0.1.0-4 =================================================================== --- trunk/packages/ctk/debian/patches/debian-changes-0.1.0-4 (rev 0) +++ trunk/packages/ctk/debian/patches/debian-changes-0.1.0-4 2011-08-19 17:37:54 UTC (rev 7507) @@ -0,0 +1,115 @@ +Description: Upstream changes introduced in version 0.1.0-4 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + ctk (0.1.0-4) experimental; urgency=low + . + * Changed maintainer and uploader + * build with -DCTK_APP_ctkCLIPluginExplorer:BOOL=ON + . + The person named in the Author field signed this changelog entry. +Author: Dominique Belhachemi <[email protected]> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- ctk-0.1.0.orig/Libs/Visualization/VTK/Core/target_libraries.cmake ++++ ctk-0.1.0/Libs/Visualization/VTK/Core/target_libraries.cmake +@@ -5,6 +5,5 @@ + # + + SET(target_libraries +- VTK_LIBRARIES + CTKCore +- ) +\ No newline at end of file ++ ) +--- ctk-0.1.0.orig/Libs/Visualization/VTK/Core/CMakeLists.txt ++++ ctk-0.1.0/Libs/Visualization/VTK/Core/CMakeLists.txt +@@ -3,6 +3,7 @@ PROJECT(CTKVisualizationVTKCore) + # + # 3rd party dependencies + # ++FIND_PACKAGE(VTK REQUIRED) + INCLUDE(${VTK_USE_FILE}) + + # +@@ -79,7 +80,7 @@ ctkMacroBuildLib( + SRCS ${KIT_SRCS} + MOC_SRCS ${KIT_MOC_SRCS} + UI_FORMS ${KIT_UI_FORMS} +- TARGET_LIBRARIES ${KIT_target_libraries} ++ TARGET_LIBRARIES ${KIT_target_libraries} vtkCommon vtkFiltering vtkHybrid + RESOURCES ${KIT_resources} + LIBRARY_TYPE ${CTK_LIBRARY_MODE} + ) +--- ctk-0.1.0.orig/Libs/Scripting/Python/Core/CMakeLists.txt ++++ ctk-0.1.0/Libs/Scripting/Python/Core/CMakeLists.txt +@@ -50,6 +50,8 @@ CONFIGURE_FILE( + # The following macro will read the target libraries from the file 'target_libraries.cmake' + ctkFunctionGetTargetLibraries(KIT_target_libraries) + ++INCLUDE_DIRECTORIES(/usr/include/PythonQt/) ++ + # Link against vtkPython if required + IF(CTK_LIB_Scripting/Python/Core_PYTHONQT_USE_VTK) + LIST(APPEND KIT_target_libraries vtkPythonCore) +--- ctk-0.1.0.orig/Libs/DICOM/Core/ctkDICOMIndexer.cpp ++++ ctk-0.1.0/Libs/DICOM/Core/ctkDICOMIndexer.cpp +@@ -31,6 +31,14 @@ + #include <QDebug> + #include <QPixmap> + ++#define DCM_PatientsName DcmTagKey(0x0010, 0x0010) ++#define DCM_PatientsBirthDate DcmTagKey(0x0010, 0x0030) ++#define DCM_PatientsBirthTime DcmTagKey(0x0010, 0x0032) ++#define DCM_PatientsSex DcmTagKey(0x0010, 0x0040) ++#define DCM_PatientsAge DcmTagKey(0x0010, 0x1010) ++#define DCM_PerformingPhysiciansName DcmTagKey(0x0008, 0x1050) ++#define DCM_ReferringPhysiciansName DcmTagKey(0x0008, 0x0090) ++ + + // ctkDICOM includes + #include "ctkDICOMIndexer.h" +--- ctk-0.1.0.orig/Libs/DICOM/Core/CMakeLists.txt ++++ ctk-0.1.0/Libs/DICOM/Core/CMakeLists.txt +@@ -84,6 +84,9 @@ set (DCMQRSCP_STORE_DIR ${CMAKE_CURRENT_ + CONFIGURE_FILE( Resources/dcmqrscp.cfg.in dcmqrscp.cfg ) + set (DCMQRSCP_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/dcmqrscp.cfg) + ++INCLUDE_DIRECTORIES( /usr/include/dcmtk/dcmimgle/ ) ++INCLUDE_DIRECTORIES( /usr/include/dcmtk/dcmdata/ ) ++ + ctkMacroBuildLib( + NAME ${PROJECT_NAME} + EXPORT_DIRECTIVE ${KIT_export_directive} +--- ctk-0.1.0.orig/Libs/DICOM/Core/ctkDICOMDatabase.cpp ++++ ctk-0.1.0/Libs/DICOM/Core/ctkDICOMDatabase.cpp +@@ -20,6 +20,16 @@ + + #include <stdexcept> + ++ ++#define DCM_PatientsName DcmTagKey(0x0010, 0x0010) ++#define DCM_PatientsBirthDate DcmTagKey(0x0010, 0x0030) ++#define DCM_PatientsBirthTime DcmTagKey(0x0010, 0x0032) ++#define DCM_PatientsSex DcmTagKey(0x0010, 0x0040) ++#define DCM_PatientsAge DcmTagKey(0x0010, 0x1010) ++#define DCM_PerformingPhysiciansName DcmTagKey(0x0008, 0x1050) ++#define DCM_ReferringPhysiciansName DcmTagKey(0x0008, 0x0090) ++ ++ + // Qt includes + #include <QSqlQuery> + #include <QSqlRecord> Modified: trunk/packages/ctk/debian/patches/series =================================================================== --- trunk/packages/ctk/debian/patches/series 2011-08-19 17:37:37 UTC (rev 7506) +++ trunk/packages/ctk/debian/patches/series 2011-08-19 17:37:54 UTC (rev 7507) @@ -1 +1,3 @@ -cmakebuildsystem.patch +debian-changes-0.1.0-2 +debian-changes-0.1.0-3 +debian-changes-0.1.0-4 Modified: trunk/packages/ctk/debian/rules =================================================================== --- trunk/packages/ctk/debian/rules 2011-08-19 17:37:37 UTC (rev 7506) +++ trunk/packages/ctk/debian/rules 2011-08-19 17:37:54 UTC (rev 7507) @@ -1,19 +1,46 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +DH_VERBOSE=0 -%: - dh --parallel --with quilt --buildsystem=cmake $@ +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk -override_dh_auto_configure: - dh_auto_configure -- -DCTK_SUPERBUILD:BOOL=OFF -DBUILD_TESTING:BOOL=OFF +DEB_CMAKE_EXTRA_FLAGS = \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_BUILD_TYPE:STRING=Debug \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \ + -DCMAKE_SKIP_RPATH:BOOL=OFF \ + -DBUILD_TESTING:BOOL=ON \ + -DCTK_APP_ctkCLIPluginExplorer:BOOL=ON \ + -DCTK_LIB_ImageProcessing/ITK/Core:BOOL=ON \ + -DCTK_LIB_Widgets:BOOL=ON \ + -DCTK_LIB_Scripting/Python/Core:BOOL=OFF \ + -DCTK_LIB_DICOM/Core:BOOL=OFF \ + -DCTK_LIB_Visualization/VTK/Core:BOOL=OFF \ + -DCTK_SUPERBUILD:BOOL=OFF \ + +build/libctk0.1:: + - cd $(DEB_BUILDDIR) && LD_LIBRARY_PATH=`pwd`/bin:$$LD_LIBRARY_PATH ctest -VV + +install/libctk0.1:: + dh_install -plibctk0.1 debian/tmp/usr/lib/*.so.* usr/lib + dh_install -plibctk0.1 debian/tmp/usr/lib/*.a usr/lib + + +install/libctk-dev:: + dh_install -plibctk-dev debian/tmp/usr/include/ctk-0.1/* usr/include/ctk + dh_install -plibctk-dev debian/tmp/usr/lib/*.so usr/lib +# dh_install -plibctk-dev debian/tmp/usr/lib/ctk-0.1/*.cmake usr/lib/ctk-0.1 + +#install/ctk-examples:: +# dh_installexamples -popenigtlink-examples Examples/ + +#install/ctk-doc:: +# doxygen -u $(DEB_BUILDDIR)/doxygen.config +# doxygen $(DEB_BUILDDIR)/doxygen.config +# dh_install -plibctk-doc $(DEB_BUILDDIR)/Documents/Doxygen/html usr/share/doc/ctk-doc + + get-orig-source: - ./debian/get-orig-source + /bin/sh $(CURDIR)/debian/get-orig-source _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
