[med-svn] r15475 - trunk/packages/gdcm/trunk/debian

[Mathieu Malaterre]

Author: malat
Date: 2013-12-10 08:45:50 +0000 (Tue, 10 Dec 2013)
New Revision: 15475

Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/copyright
   trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base
   trunk/packages/gdcm/trunk/debian/gdcm-doc.docs
   trunk/packages/gdcm/trunk/debian/gdcm-doc.install
   trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install
   trunk/packages/gdcm/trunk/debian/libgdcm2.4.install
   trunk/packages/gdcm/trunk/debian/rules
Log:
Wrap up 2.4.1

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2013-12-10 08:28:24 UTC (rev 15474)
+++ trunk/packages/gdcm/trunk/debian/changelog	2013-12-10 08:45:50 UTC (rev 15475)
@@ -1,10 +1,11 @@
 gdcm (2.4.1-1) experimental; urgency=low
 
-  * New upstream: 2.4.1
+  * New upstream: 2.4.1. Closes: #727154
+  * Update d/copyright. Closes: #729748
   * Bump Std-Vers to 3.9.5, no changes needed
   * Refreshed patches, removed patches applied upstream
 
- -- Mathieu Malaterre <malat at debian.org>  Tue, 10 Dec 2013 09:19:13 +0100
+ -- Mathieu Malaterre <malat at debian.org>  Tue, 10 Dec 2013 09:42:08 +0100
 
 gdcm (2.4.0-2) experimental; urgency=low
 

Modified: trunk/packages/gdcm/trunk/debian/copyright
===================================================================
--- trunk/packages/gdcm/trunk/debian/copyright	2013-12-10 08:28:24 UTC (rev 15474)
+++ trunk/packages/gdcm/trunk/debian/copyright	2013-12-10 08:45:50 UTC (rev 15475)
@@ -91,19 +91,12 @@
  Source/MessageExchangeDefinition/gdcmULWritingCallback.cxx
  Source/MessageExchangeDefinition/gdcmULWritingCallback.h
 Copyright: Insight Software Consortium
-License: Apache-2-0
- 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.
+License: Apache 2.0
 
+License: Apache 2.0
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
+
 Files: CMake/*.cmake
 Copyright: 2006-2011 Mathieu Malaterre <mathieu.malaterre at gmail.com>
 License: COPYING-CMAKE-SCRIPTS

Modified: trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base	2013-12-10 08:28:24 UTC (rev 15474)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base	2013-12-10 08:45:50 UTC (rev 15475)
@@ -9,4 +9,4 @@
 Files: /usr/share/doc/gdcm-doc/html/*
 
 Format: PDF
-Files: /usr/share/doc/gdcm-doc/gdcm-2.4.0.pdf
+Files: /usr/share/doc/gdcm-doc/gdcm-2.4.1.pdf

Modified: trunk/packages/gdcm/trunk/debian/gdcm-doc.docs
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.docs	2013-12-10 08:28:24 UTC (rev 15474)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.docs	2013-12-10 08:45:50 UTC (rev 15475)
@@ -1,2 +1,2 @@
 usr/share/doc/gdcm-*/html/
-usr/share/doc/gdcm-*/gdcm-2.4.0.pdf
+usr/share/doc/gdcm-*/gdcm-2.4.1.pdf

Modified: trunk/packages/gdcm/trunk/debian/gdcm-doc.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.install	2013-12-10 08:28:24 UTC (rev 15474)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.install	2013-12-10 08:45:50 UTC (rev 15475)
@@ -1,2 +1,2 @@
 usr/share/doc/gdcm-*/html/
-usr/share/doc/gdcm-*/gdcm-2.4.0.pdf
+usr/share/doc/gdcm-*/gdcm-2.4.1.pdf

Modified: trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install	2013-12-10 08:28:24 UTC (rev 15474)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install	2013-12-10 08:45:50 UTC (rev 15475)
@@ -7,7 +7,6 @@
 usr/lib/libgdcmjpeg16.so
 usr/lib/libgdcmjpeg8.so
 usr/lib/libgdcmMEXD.so
-usr/lib/libsocketxx.so
 usr/lib/gdcm-2.*/*.cmake
 usr/include/gdcm-2.*/gdcm*
 usr/include/gdcm-2.*/zip*
@@ -15,4 +14,3 @@
 usr/include/gdcm-2.*/gdcmjpeg/16/*
 usr/include/gdcm-2.*/gdcmjpeg/8/*
 usr/include/gdcm-2.*/gdcmjpeg/j*.h
-usr/include/gdcm-2.*/socketxx

Modified: trunk/packages/gdcm/trunk/debian/libgdcm2.4.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2.4.install	2013-12-10 08:28:24 UTC (rev 15474)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2.4.install	2013-12-10 08:45:50 UTC (rev 15475)
@@ -1,3 +1,2 @@
 usr/lib/libgdcm*.so.*
-usr/lib/libsocketxx*.so.*
 usr/share/gdcm-2.*/XML

Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules	2013-12-10 08:28:24 UTC (rev 15474)
+++ trunk/packages/gdcm/trunk/debian/rules	2013-12-10 08:45:50 UTC (rev 15475)
@@ -41,7 +41,7 @@
 # GDCM_DOCUMENTATION:BOOL=ON is required to build man page (build target)
 # Need to make sure to build using the same vtk/python version:
 CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_BUILD_TYPE:STRING="" \
+		-DCMAKE_BUILD_TYPE:STRING=None \
 		-DGDCM_BUILD_APPLICATIONS=ON \
 		-DGDCM_DOCUMENTATION:BOOL=ON \
 		-DGDCM_VTK_DOCUMENTATION:BOOL=$(BUILDDOC) \