Author: malat Date: 2014-09-24 11:56:51 +0000 (Wed, 24 Sep 2014) New Revision: 18115
Modified: trunk/packages/gdcm/trunk/debian/changelog trunk/packages/gdcm/trunk/debian/libgdcm-cil.install trunk/packages/gdcm/trunk/debian/libgdcm-java.install trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install trunk/packages/gdcm/trunk/debian/libgdcm2.4.install trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install trunk/packages/gdcm/trunk/debian/libvtkgdcm2-dev.install trunk/packages/gdcm/trunk/debian/libvtkgdcm2.4.install trunk/packages/gdcm/trunk/debian/python-vtkgdcm.install trunk/packages/gdcm/trunk/debian/rules Log: make gdcm multiarch Modified: trunk/packages/gdcm/trunk/debian/changelog =================================================================== --- trunk/packages/gdcm/trunk/debian/changelog 2014-09-24 10:29:07 UTC (rev 18114) +++ trunk/packages/gdcm/trunk/debian/changelog 2014-09-24 11:56:51 UTC (rev 18115) @@ -1,3 +1,9 @@ +gdcm (2.4.4-2) UNRELEASED; urgency=low + + * Make package multiarch capable + + -- Mathieu Malaterre <[email protected]> Wed, 24 Sep 2014 13:48:53 +0200 + gdcm (2.4.4-1) unstable; urgency=low * New upstream. Closes: #759957 Modified: trunk/packages/gdcm/trunk/debian/libgdcm-cil.install =================================================================== --- trunk/packages/gdcm/trunk/debian/libgdcm-cil.install 2014-09-24 10:29:07 UTC (rev 18114) +++ trunk/packages/gdcm/trunk/debian/libgdcm-cil.install 2014-09-24 11:56:51 UTC (rev 18115) @@ -1,2 +1,2 @@ -usr/lib/gdcm-sharp.dll usr/lib/cli/gdcm-sharp-2.4 -usr/lib/libgdcmsharpglue.so usr/lib/cli/gdcm-sharp-2.4 +usr/lib/*/gdcm-sharp.dll usr/lib/cli/gdcm-sharp-2.4 +usr/lib/*/libgdcmsharpglue.so usr/lib/cli/gdcm-sharp-2.4 Modified: trunk/packages/gdcm/trunk/debian/libgdcm-java.install =================================================================== --- trunk/packages/gdcm/trunk/debian/libgdcm-java.install 2014-09-24 10:29:07 UTC (rev 18114) +++ trunk/packages/gdcm/trunk/debian/libgdcm-java.install 2014-09-24 11:56:51 UTC (rev 18115) @@ -1,2 +1,3 @@ -usr/lib/gdcm.jar usr/share/java -usr/lib/libgdcmjni.so usr/lib/jni/ +usr/lib/*/gdcm.jar usr/share/java +# FIXME: +usr/lib/*/libgdcmjni.so usr/lib/jni/ Modified: trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install =================================================================== --- trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install 2014-09-24 10:29:07 UTC (rev 18114) +++ trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install 2014-09-24 11:56:51 UTC (rev 18115) @@ -1,13 +1,13 @@ -usr/lib/libgdcmCommon.so -usr/lib/libgdcmDICT.so -usr/lib/libgdcmDSED.so -usr/lib/libgdcmIOD.so -usr/lib/libgdcmMSFF.so -usr/lib/libgdcmjpeg12.so -usr/lib/libgdcmjpeg16.so -usr/lib/libgdcmjpeg8.so -usr/lib/libgdcmMEXD.so -usr/lib/gdcm-2.*/*.cmake +usr/lib/*/libgdcmCommon.so +usr/lib/*/libgdcmDICT.so +usr/lib/*/libgdcmDSED.so +usr/lib/*/libgdcmIOD.so +usr/lib/*/libgdcmMSFF.so +usr/lib/*/libgdcmjpeg12.so +usr/lib/*/libgdcmjpeg16.so +usr/lib/*/libgdcmjpeg8.so +usr/lib/*/libgdcmMEXD.so +usr/lib/*/gdcm-2.*/*.cmake usr/include/gdcm-2.*/gdcm* usr/include/gdcm-2.*/zip* usr/include/gdcm-2.*/gdcmjpeg/12/* Modified: trunk/packages/gdcm/trunk/debian/libgdcm2.4.install =================================================================== --- trunk/packages/gdcm/trunk/debian/libgdcm2.4.install 2014-09-24 10:29:07 UTC (rev 18114) +++ trunk/packages/gdcm/trunk/debian/libgdcm2.4.install 2014-09-24 11:56:51 UTC (rev 18115) @@ -1,2 +1,2 @@ -usr/lib/libgdcm*.so.* +usr/lib/*/libgdcm*.so.* usr/share/gdcm-2.*/XML Modified: trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install =================================================================== --- trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install 2014-09-24 10:29:07 UTC (rev 18114) +++ trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install 2014-09-24 11:56:51 UTC (rev 18115) @@ -1,2 +1,2 @@ -usr/lib/Kitware.VTK.GDCM.dll usr/lib/cli/vtkgdcm-sharp-2.4 -usr/lib/libKitware.VTK.vtkgdcm.Unmanaged.so usr/lib/cli/vtkgdcm-sharp-2.4 +usr/lib/*/Kitware.VTK.GDCM.dll usr/lib/cli/vtkgdcm-sharp-2.4 +usr/lib/*/libKitware.VTK.vtkgdcm.Unmanaged.so usr/lib/cli/vtkgdcm-sharp-2.4 Modified: trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install =================================================================== --- trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install 2014-09-24 10:29:07 UTC (rev 18114) +++ trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install 2014-09-24 11:56:51 UTC (rev 18115) @@ -1,2 +1,3 @@ -usr/lib/vtkgdcm.jar usr/share/java -usr/lib/libvtkgdcmJava.so usr/lib/jni +usr/lib/*/vtkgdcm.jar usr/share/java +# FIXME +usr/lib/*/libvtkgdcmJava.so usr/lib/jni Modified: trunk/packages/gdcm/trunk/debian/libvtkgdcm2-dev.install =================================================================== --- trunk/packages/gdcm/trunk/debian/libvtkgdcm2-dev.install 2014-09-24 10:29:07 UTC (rev 18114) +++ trunk/packages/gdcm/trunk/debian/libvtkgdcm2-dev.install 2014-09-24 11:56:51 UTC (rev 18115) @@ -1,2 +1,2 @@ -usr/lib/libvtkgdcm.so +usr/lib/*/libvtkgdcm.so usr/include/gdcm-2.*/vtk* Modified: trunk/packages/gdcm/trunk/debian/libvtkgdcm2.4.install =================================================================== --- trunk/packages/gdcm/trunk/debian/libvtkgdcm2.4.install 2014-09-24 10:29:07 UTC (rev 18114) +++ trunk/packages/gdcm/trunk/debian/libvtkgdcm2.4.install 2014-09-24 11:56:51 UTC (rev 18115) @@ -1 +1 @@ -usr/lib/libvtkgdcm.so.* +usr/lib/*/libvtkgdcm.so.* Modified: trunk/packages/gdcm/trunk/debian/python-vtkgdcm.install =================================================================== --- trunk/packages/gdcm/trunk/debian/python-vtkgdcm.install 2014-09-24 10:29:07 UTC (rev 18114) +++ trunk/packages/gdcm/trunk/debian/python-vtkgdcm.install 2014-09-24 11:56:51 UTC (rev 18115) @@ -1,3 +1,3 @@ usr/lib/python*/dist-packages/vtkgdcm.py usr/lib/python*/dist-packages/libvtkgdcmPython.so* -usr/lib/libvtkgdcmPythonD.so* +usr/lib/*/libvtkgdcmPythonD.so* Modified: trunk/packages/gdcm/trunk/debian/rules =================================================================== --- trunk/packages/gdcm/trunk/debian/rules 2014-09-24 10:29:07 UTC (rev 18114) +++ trunk/packages/gdcm/trunk/debian/rules 2014-09-24 11:56:51 UTC (rev 18115) @@ -3,6 +3,8 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + # to please dpkg-shlibdeps and java private libs in /usr/lib/jni LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):/usr/lib/jni @@ -75,6 +77,7 @@ -DTAGFILES:STRING="/usr/share/doc/vtk-doc/html/vtk$(VTKVERS).tag=/usr/share/doc/vtk-doc/html/" \ -DGDCM_INSTALL_PYTHONMODULE_DIR:STRING=lib/python/dist-packages \ -DGDCM_NO_PYTHON_LIBS_LINKING:BOOL=ON \ + -DGDCM_INSTALL_LIB_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \ -DGDCM_USE_VTK:BOOL=ON override_dh_auto_configure: @@ -85,17 +88,17 @@ override_dh_auto_install: # See #664188 - sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/gdcm-2.4/GDCMTargets-*.cmake + sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-2.4/GDCMTargets-*.cmake # See #711214 - sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/gdcm-2.4/GDCMTargets.cmake + sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-2.4/GDCMTargets.cmake dh_auto_install # PHP mkdir -p debian/tmp/$(PHP_EX) mkdir -p debian/tmp/usr/share/php - mv debian/tmp/usr/lib/gdcm.php debian/tmp/usr/share/php - mv debian/tmp/usr/lib/gdcm.so debian/tmp/$(PHP_EX) - mv debian/tmp/usr/lib/vtkgdcm.php debian/tmp/usr/share/php - mv debian/tmp/usr/lib/vtkgdcm.so debian/tmp/$(PHP_EX) + mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gdcm.php debian/tmp/usr/share/php + mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gdcm.so debian/tmp/$(PHP_EX) + mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/vtkgdcm.php debian/tmp/usr/share/php + mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/vtkgdcm.so debian/tmp/$(PHP_EX) echo "php:Depends=phpapi-`php-config5 --phpapi`" >> debian/php5-gdcm.substvars echo "php:Depends=phpapi-`php-config5 --phpapi`" >> debian/php5-vtkgdcm.substvars # Python _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
