Author: gregsharp-guest Date: 2011-07-25 03:45:24 +0000 (Mon, 25 Jul 2011) New Revision: 7325
Modified: trunk/packages/plastimatch/trunk/debian/changelog trunk/packages/plastimatch/trunk/debian/copyright trunk/packages/plastimatch/trunk/debian/get-orig-source trunk/packages/plastimatch/trunk/debian/watch Log: Fix copyright issues; fix scripts to match upstream tarball Modified: trunk/packages/plastimatch/trunk/debian/changelog =================================================================== --- trunk/packages/plastimatch/trunk/debian/changelog 2011-07-24 23:48:42 UTC (rev 7324) +++ trunk/packages/plastimatch/trunk/debian/changelog 2011-07-25 03:45:24 UTC (rev 7325) @@ -1,5 +1,5 @@ -plastimatch (1.5.0-1) experimental; urgency=low +plastimatch (1.5.2-1) experimental; urgency=low * Initial release (Closes: #629344) - -- Gregory C. Sharp <[email protected]> Sun, 05 Jun 2011 13:25:16 -0400 + -- Gregory C. Sharp <[email protected]> Sun, 24 Jul 2011 22:30:24 -0400 Modified: trunk/packages/plastimatch/trunk/debian/copyright =================================================================== --- trunk/packages/plastimatch/trunk/debian/copyright 2011-07-24 23:48:42 UTC (rev 7324) +++ trunk/packages/plastimatch/trunk/debian/copyright 2011-07-25 03:45:24 UTC (rev 7325) @@ -1,23 +1,25 @@ -Name: plastimatch -Maintainer: Greg Sharp +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: plastimatch +Upstream-Contact: Gregory C. Sharp <[email protected]> Source: http://plastimatch.org + +Files: * Copyright: (c) 2004-2011 Massachusetts General Hospital - -Plastimatch Software License ("Software License") Version 1.0 - -This Software License covers downloads from the Plastimatch project -("Plastimatch") maintained by The General Hospital Corporation -Inc. ("MGH"). - -Your downloading, copying, modifying, displaying, distributing or use -of any software and/or data from Plastimatch (collectively, the -"Software") constitutes acceptance of all of the terms and conditions -of this Software License. If you do not agree to such terms and -conditions, you have no right to download, copy, modify, display, -distribute or use the Software. - - -1. As used in this Software License, "you" means the individual +License: Plastimatch license + Plastimatch Software License ("Software License") Version 1.0 + . + This Software License covers downloads from the Plastimatch project + ("Plastimatch") maintained by The General Hospital Corporation + Inc. ("MGH"). + . + Your downloading, copying, modifying, displaying, distributing or use + of any software and/or data from Plastimatch (collectively, the + "Software") constitutes acceptance of all of the terms and conditions + of this Software License. If you do not agree to such terms and + conditions, you have no right to download, copy, modify, display, + distribute or use the Software. + . + 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 @@ -27,10 +29,10 @@ (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 @@ -39,20 +41,20 @@ following words: "All or portions of this licensed product (such portions are the "Software") have been obtained under license from MGH 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 under this Software License includes without + . + 2. The license granted under 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 @@ -61,8 +63,8 @@ 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 + . + 3. This Software License does not grant any rights with respect to third party software, except those rights that MGH has been authorized by a third party to grant to you, and accordingly you are solely responsible for (i) obtaining any permissions from third @@ -70,8 +72,8 @@ 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 + . + 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 @@ -81,8 +83,8 @@ 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 MGH nor any + . + 5. The Software is provided "AS IS" and neither MGH nor any contributor to the software (each a "Contributor") shall have any obligation to provide maintenance, support, updates, enhancements or modifications thereto. MGH AND ALL CONTRIBUTORS SPECIFICALLY @@ -99,20 +101,85 @@ LICENSE OR DISTRIBUTION OF THE SOFTWARE AND AGREE TO INDEMNIFY AND HOLD HARMLESS MGH 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 MGH or any of MGH's + . + 6. None of the names, logos or trademarks of MGH or any of MGH'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 + . + 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 + . + 8. This Software License does not grant any rights in or to any intellectual property owned by MGH or any Contributor except those rights expressly granted hereunder. +Files: debian/* +Copyright: 2011 Gregory C. Sharp <[email protected]> +License: BSD-3-Clause + +Files: libs/bstrlib-05122010/* +Copyright: 2002-2008 Paul Hsieh +License: BSD-3-Clause + +Files: libs/devillard/* +Copyright: 1998 Nicholas Devillard +License: public-domain + +Files: libs/dlib-17.34/* +Copyright: 2003-2011 Davis E. King +License: BSL-1.0 + +Files: libs/itk-3.20.0/* +Copyright: 1999-2003 Insight Software Consortium +License: BSD-3-Clause + +Files: libs/liblbfgs-1.9/* +Copyright: 1990 Jorge Nocedal, 2007-2010 Naoaki Okazaki +License: MIT + +Files: libs/nocedal/* +Copyright: 1990 Jorge Nocedal +License: BSD-3-Clause + +Files: libs/nSIFT/* +Copyright: 2005-2007 Warren Cheung +License: nSIFT license + 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. + * The name of the Insight Consortium, nor the names of any consortium members, + nor of any contributors, may be used to endorse or promote products derived + from this software without specific prior written permission. + * Modified source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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. + +Files: libs/ransac/* +Copyright: 2010 Ziv Yaniv +License: BSD-3-Clause + +Files: libs/specfun/* +Copyright: 1996 John Wiley & Sons, Inc. +License: Specfun license + All the programs and subroutines contained in this archive are + copyrighted. However, we give permission to the user who downloads + these routines to incorporate any of these routines into his or her + programs provided that the copyright is acknowledged. Modified: trunk/packages/plastimatch/trunk/debian/get-orig-source =================================================================== --- trunk/packages/plastimatch/trunk/debian/get-orig-source 2011-07-24 23:48:42 UTC (rev 7324) +++ trunk/packages/plastimatch/trunk/debian/get-orig-source 2011-07-25 03:45:24 UTC (rev 7325) @@ -1,7 +1,7 @@ #!/bin/sh # This lets us use a different (local) tarball during debugging. -# Just put file nam on the command line. +# Just put file name on the command line. if test -z "$1"; then download_name=`uscan --verbose --force-download | grep Source | head -n 2 | tail -n 1 | sed -e 's/.*\///'`; echo Downloaded $download_name @@ -35,7 +35,7 @@ rm -rf src/ise rm -rf src/oraifutils rm -rf src/slicer -rm -rf src/uno-2-3-reg +rm -rf src/reg-2-3 rm -rf libs/getopt rm -rf libs/libf2c rm -rf libs/msinttypes @@ -46,5 +46,5 @@ GZIP="--best --no-name" tar -czf "$PKG"_"$VERSION".orig.tar.gz "$PKG"-"$VERSION" rm -rf $base rm -rf "$PKG"-"$VERSION" -rm ../plastimatch_1.5.0.orig.tar.bz2 2> /dev/null +rm ../"$PKG"_"$VERSION".orig.tar.bz2 2> /dev/null mv "$PKG"_"$VERSION".orig.tar.gz .. Modified: trunk/packages/plastimatch/trunk/debian/watch =================================================================== --- trunk/packages/plastimatch/trunk/debian/watch 2011-07-24 23:48:42 UTC (rev 7324) +++ trunk/packages/plastimatch/trunk/debian/watch 2011-07-25 03:45:24 UTC (rev 7325) @@ -1,3 +1,3 @@ version=3 http://forge.abcd.harvard.edu/gf/project/plastimatch/frs/ \ - .*/plastimatch-(.+)-.*-Source.tar.bz2 + .*/plastimatch-(.+)-Source.tar.bz2 _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
