[med-svn] r6271 - in trunk/packages/vtkedge/trunk/debian: . patches source

[Andreas Tille]

Author: tille
Date: 2011-03-16 08:27:51 +0000 (Wed, 16 Mar 2011)
New Revision: 6271

Added:
   trunk/packages/vtkedge/trunk/debian/patches/0001-vtkEncodeString-is-in-lib-not-in-bin.patch
   trunk/packages/vtkedge/trunk/debian/source/
   trunk/packages/vtkedge/trunk/debian/source/format
Modified:
   trunk/packages/vtkedge/trunk/debian/changelog
   trunk/packages/vtkedge/trunk/debian/compat
   trunk/packages/vtkedge/trunk/debian/control
Log:
Attempt to fix #618183 using the patch provided in BTS but the patch does not apply because it is against an autogenerated file and I did not found a way to transform it to the cmake.in file; Some other minor packaging updates


Modified: trunk/packages/vtkedge/trunk/debian/changelog
===================================================================
--- trunk/packages/vtkedge/trunk/debian/changelog	2011-03-15 05:34:09 UTC (rev 6270)
+++ trunk/packages/vtkedge/trunk/debian/changelog	2011-03-16 08:27:51 UTC (rev 6271)
@@ -1,3 +1,11 @@
+vtkedge (0.1.0-4) UNRELEASED; urgency=low
+
+  * Added myself to uploaders
+  * debian/source/format: 3.0 (quilt)
+  * Debhelper 8 (control+compat)
+
+ -- Andreas Tille <tille at debian.org>  Wed, 16 Mar 2011 09:18:47 +0100
+
 vtkedge (0.1.0-3) unstable; urgency=low
 
   [ Charles Plessy ]

Modified: trunk/packages/vtkedge/trunk/debian/compat
===================================================================
--- trunk/packages/vtkedge/trunk/debian/compat	2011-03-15 05:34:09 UTC (rev 6270)
+++ trunk/packages/vtkedge/trunk/debian/compat	2011-03-16 08:27:51 UTC (rev 6271)
@@ -1 +1 @@
-7
+8

Modified: trunk/packages/vtkedge/trunk/debian/control
===================================================================
--- trunk/packages/vtkedge/trunk/debian/control	2011-03-15 05:34:09 UTC (rev 6270)
+++ trunk/packages/vtkedge/trunk/debian/control	2011-03-16 08:27:51 UTC (rev 6271)
@@ -4,8 +4,9 @@
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
-Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), cmake (>= 2.8.1), libvtk5-dev (>= 5.4), quilt (>= 0.46-7~), paraview, libinsighttoolkit3-dev, libgdcm2-dev, qt4-dev-tools, qt4-qmake, libqt4-dev, libhdf5-serial-dev
+Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>,
+ Andreas Tille <tille at debian.org>
+Build-Depends: debhelper (>= 8), cmake (>= 2.8.1), libvtk5-dev (>= 5.4), quilt (>= 0.46-7~), paraview, libinsighttoolkit3-dev, libgdcm2-dev, qt4-dev-tools, qt4-qmake, libqt4-dev, libhdf5-serial-dev
 Standards-Version: 3.9.1
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/vtkedge/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/vtkedge/trunk/

Added: trunk/packages/vtkedge/trunk/debian/patches/0001-vtkEncodeString-is-in-lib-not-in-bin.patch
===================================================================
--- trunk/packages/vtkedge/trunk/debian/patches/0001-vtkEncodeString-is-in-lib-not-in-bin.patch	                        (rev 0)
+++ trunk/packages/vtkedge/trunk/debian/patches/0001-vtkEncodeString-is-in-lib-not-in-bin.patch	2011-03-16 08:27:51 UTC (rev 6271)
@@ -0,0 +1,27 @@
+Remark: This does not apply (Andreas Tille)
+
+From 34f327fbadda04c649f758db85933be578dec2cb Mon Sep 17 00:00:00 2001
+From: Mehdi Dogguy <mehdi at dogguy.org>
+Date: Tue, 15 Mar 2011 21:35:34 +0100
+Subject: [PATCH] vtkEncodeString is in lib/ not in bin/
+
+---
+ vtkGenerateVTKConfig.cmake |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/vtkGenerateVTKConfig.cmake b/vtkGenerateVTKConfig.cmake
+index 388e262..1fdb5b5 100644
+--- a/vtkGenerateVTKConfig.cmake
++++ b/vtkGenerateVTKConfig.cmake
+@@ -242,7 +242,7 @@ IF(VTK_WRAP_JAVA)
+   SET(VTK_WRAP_JAVA_EXE_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_BIN_DIR}/vtkWrapJava${VTK_EXE_EXT})
+   SET(VTK_JAVA_JAR_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_JAVA_DIR}/vtk.jar)
+ ENDIF(VTK_WRAP_JAVA)
+-SET(VTK_ENCODESTRING_EXE_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_BIN_DIR}/vtkEncodeString${VTK_EXE_EXT})
++SET(VTK_ENCODESTRING_EXE_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/vtkEncodeString${VTK_EXE_EXT})
+ 
+ # VTK style script locations.
+ SET(VTK_DOXYGEN_HOME_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_DOXYGEN_DIR})
+-- 
+1.7.2.5
+

Added: trunk/packages/vtkedge/trunk/debian/source/format
===================================================================
--- trunk/packages/vtkedge/trunk/debian/source/format	                        (rev 0)
+++ trunk/packages/vtkedge/trunk/debian/source/format	2011-03-16 08:27:51 UTC (rev 6271)
@@ -0,0 +1 @@
+3.0 (quilt)