[med-svn] r20247 - in trunk/packages/gdcm/prepare-2.6/debian: . patches

[Gert Wollny]

Author: gert-guest
Date: 2015-10-16 16:52:31 +0000 (Fri, 16 Oct 2015)
New Revision: 20247

Removed:
   trunk/packages/gdcm/prepare-2.6/debian/patches/castxml.patch
Modified:
   trunk/packages/gdcm/prepare-2.6/debian/control
   trunk/packages/gdcm/prepare-2.6/debian/patches/enable-vtk6-bindings.patch
   trunk/packages/gdcm/prepare-2.6/debian/patches/linkvtkdoc.patch
   trunk/packages/gdcm/prepare-2.6/debian/rules
Log:
Correct some lintian messages

* remove javahelper from the "dh --with" list because it is no longer used
* add descriptions to the patches
* really remove the castxml.patch file



Modified: trunk/packages/gdcm/prepare-2.6/debian/control
===================================================================
--- trunk/packages/gdcm/prepare-2.6/debian/control	2015-10-16 16:24:57 UTC (rev 20246)
+++ trunk/packages/gdcm/prepare-2.6/debian/control	2015-10-16 16:52:31 UTC (rev 20247)
@@ -7,7 +7,7 @@
  Sébastien Jodogne <s.jodogne at gmail.com>,
  Gert Wollny <gw.fossdev at gmail.com>
 Build-Depends: debhelper (>= 9), python-all-dev, pvrg-jpeg,
- uuid-dev, libz-dev, libexpat-dev, doxygen,
+ uuid-dev, libz-dev, libexpat-dev, doxygen, dh-python,  
  swig3.0, cmake (>= 2.8.9), libvtk6-dev, libcharls-dev, 
  libopenjpeg-dev, php5-dev, php5-cli, libxml2-dev, libjson-c-dev,
  libpoppler-private-dev, libssl-dev, python-vtk6, castxml, libsocket++-dev, libpapyrus3-dev,

Deleted: trunk/packages/gdcm/prepare-2.6/debian/patches/castxml.patch
===================================================================
Modified: trunk/packages/gdcm/prepare-2.6/debian/patches/enable-vtk6-bindings.patch
===================================================================
--- trunk/packages/gdcm/prepare-2.6/debian/patches/enable-vtk6-bindings.patch	2015-10-16 16:24:57 UTC (rev 20246)
+++ trunk/packages/gdcm/prepare-2.6/debian/patches/enable-vtk6-bindings.patch	2015-10-16 16:52:31 UTC (rev 20247)
@@ -1,3 +1,8 @@
+Description: Correct bindings for use with VTK6 
+ Add VTK6 export defines and remove some vtk-python libraries
+ that no longer exist from the link command 
+Author: Gert Wollny <gw.fossdev at gmail.com>
+
 diff -ru gdcm-2.6.0.old/Utilities/VTK/CMakeLists.txt gdcm-2.6.0/Utilities/VTK/CMakeLists.txt
 --- gdcm-2.6.0.old/Utilities/VTK/CMakeLists.txt	2015-09-03 16:42:12.000000000 +0200
 +++ gdcm-2.6.0/Utilities/VTK/CMakeLists.txt	2015-10-16 17:28:48.000000000 +0200

Modified: trunk/packages/gdcm/prepare-2.6/debian/patches/linkvtkdoc.patch
===================================================================
--- trunk/packages/gdcm/prepare-2.6/debian/patches/linkvtkdoc.patch	2015-10-16 16:24:57 UTC (rev 20246)
+++ trunk/packages/gdcm/prepare-2.6/debian/patches/linkvtkdoc.patch	2015-10-16 16:52:31 UTC (rev 20247)
@@ -1,3 +1,11 @@
+Description: Correct use of scripts from vtk6-doc 
+ In vtk6-doc these scripts are installed compresses. The patch
+ takes care of providing uncompressed versions.  
+ In addition the patch changes the vtk doxygen source directory and
+ incorporates an patch to link to the VTK doc and replace PNG by SVG,
+ Merged to one patch because they overlap partially. 
+Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
+
 diff -ru gdcm-2.6.0.old/Utilities/doxygen/doxyfile.in gdcm-2.6.0/Utilities/doxygen/doxyfile.in
 --- gdcm-2.6.0.old/Utilities/doxygen/doxyfile.in	2015-09-03 16:42:12.000000000 +0200
 +++ gdcm-2.6.0/Utilities/doxygen/doxyfile.in	2015-10-16 16:32:10.000000000 +0200

Modified: trunk/packages/gdcm/prepare-2.6/debian/rules
===================================================================
--- trunk/packages/gdcm/prepare-2.6/debian/rules	2015-10-16 16:24:57 UTC (rev 20246)
+++ trunk/packages/gdcm/prepare-2.6/debian/rules	2015-10-16 16:52:31 UTC (rev 20247)
@@ -34,7 +34,7 @@
 endif
 
 %:
-	dh $@ $(WITH_CLI) --with python2 --with javahelper --parallel
+	dh $@ $(WITH_CLI) --with python2 --parallel
 
 PYVER 	 := $(shell pyversions -dv)
 PYMODDIR := /usr/lib/$(shell pyversions -r)