Sebastien Jodogne pushed to branch master at Debian Med / orthanc
Commits: 593e476d by jodogne-guest at 2020-08-12T13:48:16+02:00 Fix the packaging of the symbolic links to the plugins. Closes: #968273 - - - - - 3d00722d by jodogne-guest at 2020-08-12T14:23:55+02:00 Upload to unstable - - - - - 3 changed files: - debian/changelog - debian/orthanc.install - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +orthanc (1.7.2+dfsg-4) unstable; urgency=medium + + * Fix the packaging of the symbolic links to the plugins. Closes: #968273 + + -- Sebastien Jodogne <[email protected]> Wed, 12 Aug 2020 13:43:39 +0200 + orthanc (1.7.2+dfsg-3) unstable; urgency=medium * Adding tzdata in the dependencies. Closes: #966655 ===================================== debian/orthanc.install ===================================== @@ -7,3 +7,5 @@ usr/bin/OrthancRecoverCompressedFile usr/lib/orthanc/libModalityWorklists.so.* usr/lib/orthanc/libServeFolders.so.* usr/sbin/Orthanc +usr/share/orthanc/plugins/libModalityWorklists.so +usr/share/orthanc/plugins/libServeFolders.so ===================================== debian/rules ===================================== @@ -39,9 +39,9 @@ CMAKE_EXTRA_FLAGS_FRAMEWORK += \ override_dh_auto_configure: # Put 3rd party packages where the cmake build system expects them mkdir -p OrthancFramework/SharedLibrary/ThirdPartyDownloads - ( cd OrthancFramework/SharedLibrary/ThirdPartyDownloads ; cp ../../../debian/ThirdPartyDownloads/* . ) + ( cd OrthancFramework/SharedLibrary/ThirdPartyDownloads && cp ../../../debian/ThirdPartyDownloads/* . ) mkdir -p OrthancServer/ThirdPartyDownloads - ( cd OrthancServer/ThirdPartyDownloads ; cp ../../debian/ThirdPartyDownloads/* . ) + ( cd OrthancServer/ThirdPartyDownloads && cp ../../debian/ThirdPartyDownloads/* . ) # Place back minified JavaScript libraries that were stripped from upstream yui-compressor debian/JS/jquery-1.7.2.js \ @@ -80,8 +80,8 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) mkdir -p $(DESTDIR)/locale/ localedef -f UTF-8 -i en_US $(DESTDIR)/locale/en_US.UTF-8/ - ( cd BuildFramework ; LOCPATH=$(DESTDIR)/locale/ LD_LIBRARY_PATH=. ./UnitTests-prefix/src/UnitTests-build/UnitTests ) - ( cd BuildServer ; LOCPATH=$(DESTDIR)/locale/ ./UnitTests ) + ( cd BuildFramework && LOCPATH=$(DESTDIR)/locale/ LD_LIBRARY_PATH=. ./UnitTests-prefix/src/UnitTests-build/UnitTests ) + ( cd BuildServer && LOCPATH=$(DESTDIR)/locale/ ./UnitTests ) endif override_dh_clean: @@ -111,16 +111,11 @@ override_dh_auto_install: mv $(DESTDIR)/usr/share/orthanc/plugins/libModalityWorklists.so.$(UPSTREAM_VERSION) \ $(DESTDIR)/usr/lib/orthanc - # These links are replaced by the "override_dh_link" rule - rm $(DESTDIR)/usr/share/orthanc/plugins/libServeFolders.so - rm $(DESTDIR)/usr/share/orthanc/plugins/libModalityWorklists.so - -override_dh_link: - # Create a link to the shared library of the plugins - dh_link usr/lib/orthanc/libServeFolders.so.$(UPSTREAM_VERSION) \ - usr/share/orthanc/plugins/libServeFolders.so - dh_link usr/lib/orthanc/libModalityWorklists.so.$(UPSTREAM_VERSION) \ - usr/share/orthanc/plugins/libModalityWorklists.so + # Update the symbolic links accordingly + ( cd $(DESTDIR)/usr/share/orthanc/plugins/ && \ + rm ./libServeFolders.so ./libModalityWorklists.so && \ + ln -s ../../../lib/orthanc/libServeFolders.so.$(UPSTREAM_VERSION) libServeFolders.so && \ + ln -s ../../../lib/orthanc/libModalityWorklists.so.$(UPSTREAM_VERSION) libModalityWorklists.so ) override_dh_installchangelogs: dh_installchangelogs -k NEWS View it on GitLab: https://salsa.debian.org/med-team/orthanc/-/compare/ceb1895d5e008f4c3f91007780b6e6653e206e27...3d00722d723cef1e2e1ae464f6eaa7102ffd399c -- View it on GitLab: https://salsa.debian.org/med-team/orthanc/-/compare/ceb1895d5e008f4c3f91007780b6e6653e206e27...3d00722d723cef1e2e1ae464f6eaa7102ffd399c You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
