[med-svn] r18215 - in trunk/packages/gdcm/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2014-10-06 07:08:33 +0000 (Mon, 06 Oct 2014)
New Revision: 18215

Added:
   trunk/packages/gdcm/trunk/debian/patches/multiarch.patch
Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/patches/series
Log:
Prepare new upload

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2014-10-05 20:38:22 UTC (rev 18214)
+++ trunk/packages/gdcm/trunk/debian/changelog	2014-10-06 07:08:33 UTC (rev 18215)
@@ -1,3 +1,9 @@
+gdcm (2.4.4-3) unstable; urgency=medium
+
+  * Fix issue introduced by multiarch switch. Closes: #764029
+
+ -- Mathieu Malaterre <malat at debian.org>  Mon, 06 Oct 2014 09:08:02 +0200
+
 gdcm (2.4.4-2) unstable; urgency=low
 
   * Make package multiarch capable

Added: trunk/packages/gdcm/trunk/debian/patches/multiarch.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/multiarch.patch	                        (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/multiarch.patch	2014-10-06 07:08:33 UTC (rev 18215)
@@ -0,0 +1,20 @@
+Description: fix relative links now that gdcm is multi-arched
+Author: Mathieu Malaterre <malat at debian.org>
+Bug-Debian: http://bugs.debian.org/764029
+
+Index: gdcm-2.4.4/CMake/ExportConfiguration/GDCMConfig.cmake.in
+===================================================================
+--- gdcm-2.4.4.orig/CMake/ExportConfiguration/GDCMConfig.cmake.in	2014-09-24 09:40:10.000000000 +0200
++++ gdcm-2.4.4/CMake/ExportConfiguration/GDCMConfig.cmake.in	2014-10-06 09:06:32.907092662 +0200
+@@ -32,9 +32,9 @@
+ if(EXISTS ${SELF_DIR}/GDCMTargets.cmake)
+   # This is an install tree
+   include(${SELF_DIR}/GDCMTargets.cmake)
+-  get_filename_component(GDCM_INCLUDE_ROOT "${SELF_DIR}/../../@GDCM_INSTALL_INCLUDE_DIR@" ABSOLUTE)
++  get_filename_component(GDCM_INCLUDE_ROOT "${SELF_DIR}/../../../@GDCM_INSTALL_INCLUDE_DIR@" ABSOLUTE)
+   set(GDCM_INCLUDE_DIRS ${GDCM_INCLUDE_ROOT})
+-  get_filename_component(GDCM_LIB_ROOT "${SELF_DIR}/../../@GDCM_INSTALL_LIB_DIR@" ABSOLUTE)
++  get_filename_component(GDCM_LIB_ROOT "${SELF_DIR}/../../../@GDCM_INSTALL_LIB_DIR@" ABSOLUTE)
+   set(GDCM_LIBRARY_DIRS ${GDCM_LIB_ROOT})
+ else()
+   if(EXISTS ${SELF_DIR}/GDCMExports.cmake)

Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series	2014-10-05 20:38:22 UTC (rev 18214)
+++ trunk/packages/gdcm/trunk/debian/patches/series	2014-10-06 07:08:33 UTC (rev 18215)
@@ -1,3 +1,4 @@
 toplevelskip.patch
 fixhurd.patch
 linkvtkdoc.patch
+multiarch.patch