[med-svn] r20217 - in trunk/packages/elastix/trunk/debian: . patches

[Gert Wollny]

Author: gert-guest
Date: 2015-10-12 12:19:48 +0000 (Mon, 12 Oct 2015)
New Revision: 20217

Modified:
   trunk/packages/elastix/trunk/debian/changelog
   trunk/packages/elastix/trunk/debian/copyright
   trunk/packages/elastix/trunk/debian/patches/build-static-ann.patch
Log:
Prepare upload of the new 4.8 release. 

d/changelog - updated 
d/copyright - update to new Apache-2.0 license 
dpatches/build-static-ann.patch remove fuzz from patch 



Modified: trunk/packages/elastix/trunk/debian/changelog
===================================================================
--- trunk/packages/elastix/trunk/debian/changelog	2015-10-10 15:24:47 UTC (rev 20216)
+++ trunk/packages/elastix/trunk/debian/changelog	2015-10-12 12:19:48 UTC (rev 20217)
@@ -1,3 +1,11 @@
+elastix (4.8-1) UNRELEASED; urgency=medium
+
+  * New upstram version 
+  * update patch build-static-ann.patch
+  * d/copyright: Update upstream license (now Apache-2.0) 
+
+ -- Gert Wollny <gw.fossdev at gmail.com>  Mon, 12 Oct 2015 12:55:54 +0200
+
 elastix (4.7-2) unstable; urgency=medium
 
   * Build-Depends: libfftw3-dev

Modified: trunk/packages/elastix/trunk/debian/copyright
===================================================================
--- trunk/packages/elastix/trunk/debian/copyright	2015-10-10 15:24:47 UTC (rev 20216)
+++ trunk/packages/elastix/trunk/debian/copyright	2015-10-12 12:19:48 UTC (rev 20217)
@@ -1,16 +1,24 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: elastix
-Source: http://elastix.isi.uu.nl/
-Upstream-Contacte: Stefan Klein and Marius Staring
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: elastix Source: http://elastix.isi.uu.nl/ Upstream-Contacte: 
+Stefan Klein and Marius Staring
 
 Files: *
-Copyright: 2004-2011 University Medical Center Utrecht, All rights reserved.
- Elastix Copyright Notice:
+Copyright: UMC Utrecht and contributors
+License: Apache 2.0 
  .
- Elastix was initially developed by Stefan Klein and Marius Staring
- under contract to the Image Sciences Institute, University Medical
- Center Utrecht, The Netherlands.
-License: BSD-simplified
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+       http://www.apache.org/licenses/LICENSE-2.0.txt
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems this license may be found in file
+ /usr/share/common-licenses/Apache-2.0.  
 
 Files: Common/KNN/ann_1.1/*
 Copyright: 1997-2005 University of Maryland and Sunil Arya and David Mount

Modified: trunk/packages/elastix/trunk/debian/patches/build-static-ann.patch
===================================================================
--- trunk/packages/elastix/trunk/debian/patches/build-static-ann.patch	2015-10-10 15:24:47 UTC (rev 20216)
+++ trunk/packages/elastix/trunk/debian/patches/build-static-ann.patch	2015-10-12 12:19:48 UTC (rev 20217)
@@ -8,32 +8,30 @@
 NOT install it, and therefore it must be built statically.
 
 
-
---- elastix-4.4.orig/src/Common/KNN/ann_1.1/CMakeLists.txt
-+++ elastix-4.4/src/Common/KNN/ann_1.1/CMakeLists.txt
-@@ -25,7 +25,7 @@
+--- elastix-upstream/src/Common/KNN/ann_1.1/CMakeLists.txt	2015-09-10 18:29:08.000000000 +0200
++++ elastix-upstream.new/src/Common/KNN/ann_1.1/CMakeLists.txt	2015-10-12 12:51:44.673929761 +0200
+@@ -40,7 +40,7 @@
  )
  
  # Create the ANNlib library
--ADD_LIBRARY( ANNlib SHARED ${ANN_SRCS} )
-+ADD_LIBRARY( ANNlib STATIC ${ANN_SRCS} )
+-add_library( ANNlib SHARED ${ANN_SRCS} )
++add_library( ANNlib STATIC ${ANN_SRCS} )
  
  # Necessary, because in windows dll_export is needed for creating the
  # dll, but dll_import for using it in a program.
-@@ -34,16 +34,3 @@
+@@ -49,16 +49,4 @@
  # Group in IDE's like Visual Studio
- SET_PROPERTY( TARGET ANNlib PROPERTY FOLDER "libraries" )
+ set_property( TARGET ANNlib PROPERTY FOLDER "libraries" )
  
 -# Install
--IF( WIN32 )
--  INSTALL( TARGETS ANNlib
+-if( WIN32 )
+-  install( TARGETS ANNlib
 -    RUNTIME DESTINATION .
 -    LIBRARY DESTINATION . )
 -    #COMPONENT libraries )
--ELSE()
--  INSTALL( TARGETS ANNlib
+-else()
+-  install( TARGETS ANNlib
 -    RUNTIME DESTINATION bin
 -    LIBRARY DESTINATION lib )
 -    #COMPONENT libraries )
--ENDIF()
--
+-endif()