[med-svn] [gdcm] 03/05: correct gdcm sharp install

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gewo pushed a commit to branch master
in repository gdcm.

commit 42b9ce874c7a8b6bc08a7b046aebfb5a1653c56d
Author: Gert Wollny <gewo at debian.org>
Date:   Tue Aug 1 06:54:36 2017 +0000

    correct gdcm sharp install
---
 debian/changelog           | 2 ++
 debian/gdcm-doc.doc-base   | 2 +-
 debian/gdcm-doc.install    | 2 +-
 debian/libgdcm-cil.install | 4 ++--
 debian/rules               | 4 ++++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4586ea..4992788 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gdcm (2.8.2-1) unstable; urgency=medium
 
   * New upstream version 2.8.2
+  * d/libgdcm-cli.install: correct name of glue library
+  * d/gdcm-doc.install: correct intsall location for pdf file
 
  -- Gert Wollny <gewo at debian.org>  Tue, 01 Aug 2017 06:39:36 +0000
 
diff --git a/debian/gdcm-doc.doc-base b/debian/gdcm-doc.doc-base
index 3379fa4..637965f 100644
--- a/debian/gdcm-doc.doc-base
+++ b/debian/gdcm-doc.doc-base
@@ -9,4 +9,4 @@ Index: /usr/share/doc/gdcm-doc/html/index.xhtml
 Files: /usr/share/doc/gdcm-doc/html/*
 
 Format: PDF
-Files: /usr/share/doc/gdcm-doc/gdcm-2.8.pdf
+Files: /usr/share/doc/gdcm-doc/gdcm-2.8.2.pdf
diff --git a/debian/gdcm-doc.install b/debian/gdcm-doc.install
index d8bf47b..69b8a0d 100644
--- a/debian/gdcm-doc.install
+++ b/debian/gdcm-doc.install
@@ -1,2 +1,2 @@
 usr/share/doc/gdcm-*/html/
-usr/share/doc/gdcm-*/gdcm-2.8*.pdf usr/share/doc/gdcm-doc/gdcm-2.8.pdf
+usr/share/doc/gdcm-*/gdcm-2.8*.pdf usr/share/doc/gdcm-doc/
diff --git a/debian/libgdcm-cil.install b/debian/libgdcm-cil.install
index f7f3bf5..06b584b 100644
--- a/debian/libgdcm-cil.install
+++ b/debian/libgdcm-cil.install
@@ -1,2 +1,2 @@
-usr/lib/*/gdcm-sharp.dll          usr/lib/cli/gdcm-sharp-2.8
-usr/lib/*/libgdcmsharpglue.so     usr/lib/cli/gdcm-sharp-2.8
+usr/lib/*/gdcm-sharp.dll          usr/lib/cli/gdcm-sharp-2.8/
+usr/lib/*/libgdcmsharpglue.so     usr/lib/cli/gdcm-sharp-2.8/
diff --git a/debian/rules b/debian/rules
index 9e89eda..d558b8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -105,6 +105,7 @@ override_dh_auto_install-arch:
 	sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-2.8/GDCMTargets-*.cmake
 	# See #711214
 	sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-2.8/GDCMTargets.cmake
+
 	dh_auto_install
 	# PHP
 	#mkdir -p debian/tmp/$(PHP_EX)
@@ -120,6 +121,9 @@ override_dh_auto_install-arch:
 	mv debian/tmp/usr/lib/python debian/tmp/$(PYMODDIR)
 	#mv debian/tmp/usr/lib/_gdcmswig.so* debian/tmp/$(PYMODDIR)/dist-packages/
 
+	#Csharp correct file name (Why did it change from 2.8.0 to 2.8.2?) 
+	mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gdcmsharpglue.so debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgdcmsharpglue.so
+
 override_dh_auto_install-indep: 
 	DESTDIR=$(CURDIR)/debian/tmp/ $(MAKE) -C obj-*/Utilities/doxygen/ install 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gdcm.git