Sebastien Jodogne pushed to branch master at Debian Med / orthanc
Commits: 019fee2e by jodogne-guest at 2020-09-15T17:36:44+02:00 use of "libcivetweb-dev" package, reintroduction of Orthanc framework library - - - - - 9 changed files: - − debian/ThirdPartyDownloads/civetweb-1.12-fixed.tar.gz - debian/changelog - debian/control - debian/copyright - + debian/liborthancframework-dev.dirs - + debian/liborthancframework-dev.install - + debian/liborthancframework1.install - debian/rules - debian/source/include-binaries Changes: ===================================== debian/ThirdPartyDownloads/civetweb-1.12-fixed.tar.gz deleted ===================================== Binary files a/debian/ThirdPartyDownloads/civetweb-1.12-fixed.tar.gz and /dev/null differ ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +orthanc (1.7.3+dfsg-3) UNRELEASED; urgency=medium + + * Link against the libcivetweb1 package + * Reintroduction of "liborthancframework-dev" and "liborthancframework1" + + -- Sebastien Jodogne <[email protected]> Tue, 15 Sep 2020 17:24:39 +0200 + orthanc (1.7.3+dfsg-2) unstable; urgency=medium * Fix syntax error in systemd unit file. Closes: #969080 ===================================== debian/control ===================================== @@ -9,6 +9,7 @@ Build-Depends: cmake, doxygen, libboost-all-dev, libcharls-dev, + libcivetweb-dev, libcurl4-openssl-dev | libcurl4-dev, libdcmtk-dev, libgtest-dev, @@ -95,3 +96,36 @@ Description: Orthanc development files . This package includes the header files to develop C/C++ plugins for Orthanc. + + +Package: liborthancframework1 +Architecture: any +Section: libs +Depends: locales, + ${shlibs:Depends}, + ${misc:Depends} +Description: Orthanc Framework library + The Orthanc Framework is a shared library publishing C++ classes + from the Orthanc source code that are reused in most official + plugins for Orthanc. + . + This package contains the shared library of the Orthanc Framework. + + +Package: liborthancframework-dev +Architecture: any +Section: libdevel +Depends: liborthancframework1 (= ${binary:Version}), + libboost-all-dev, + libdcmtk-dev, + libjsoncpp-dev, + liblua5.3-dev, + libpugixml-dev, + libsqlite3-dev, + ${misc:Depends} +Description: Orthanc Framework development files + The Orthanc Framework is a shared library publishing C++ classes + from the Orthanc source code that are reused in most official + plugins for Orthanc. + . + This package includes the header files of the Orthanc Framework. ===================================== debian/copyright ===================================== @@ -90,10 +90,6 @@ License: zlib -Files: debian/ThirdPartyDownloads/civetweb-1.12-fixed.tar.gz -Copyright: Copyright (c) 2013-2020 The CivetWeb developers, 2004-2013 Sergey Lyubka, 2013 No Face Press, LLC (Thomas Davis), and 2013 F-Secure Corporation -License: Expat - Files: debian/JS/jquery-1.7.2.js Copyright: 2011 John Resig, and 2011 The Dojo Foundation License: Expat or GPL-2 ===================================== debian/liborthancframework-dev.dirs ===================================== @@ -0,0 +1 @@ +usr/include/orthanc-framework ===================================== debian/liborthancframework-dev.install ===================================== @@ -0,0 +1,2 @@ +usr/include/orthanc-framework/* +usr/lib/libOrthancFramework.so ===================================== debian/liborthancframework1.install ===================================== @@ -0,0 +1 @@ +usr/lib/libOrthancFramework.so.* ===================================== debian/rules ===================================== @@ -23,8 +23,6 @@ CMAKE_EXTRA_FLAGS += \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DSTATIC_BUILD:BOOL=OFF \ -DSTANDALONE_BUILD:BOOL=ON \ - -DENABLE_CIVETWEB:BOOL=ON \ - -DUSE_SYSTEM_CIVETWEB:BOOL=OFF \ -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE:BOOL=ON \ -DDCMTK_LIBRARIES:STRING=dcmjpls \ -DUNIT_TESTS_WITH_HTTP_CONNEXIONS:BOOL=OFF \ @@ -38,12 +36,6 @@ CMAKE_EXTRA_FLAGS_FRAMEWORK += \ -DORTHANC_FRAMEWORK_SOVERSION=1 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/* . ) - mkdir -p OrthancServer/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 \ > OrthancServer/OrthancExplorer/libs/jquery.min.js @@ -82,14 +74,9 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) 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 BuildServer && LOCPATH=$(DESTDIR)/locale/ ./UnitTests --gtest_filter=-Version.CivetwebCompression ) endif -override_dh_clean: - rm -rf OrthancFramework/SharedLibrary/ThirdPartyDownloads - rm -rf OrthancServer/ThirdPartyDownloads - dh_clean - override_dh_auto_install: # Move the index of the "orthanc-doc" package from Debian mkdir -p $(DOC_DIR) @@ -100,7 +87,7 @@ override_dh_auto_install: cp -r OrthancServer/Plugins/Samples $(DOC_DIR)/OrthancPluginSamples # Run the default installation steps - # dh_auto_install --builddirectory=BuildFramework # => To be reintroduced once "orthanc-1.7.2+dfsg-2" gets accepted + dh_auto_install --builddirectory=BuildFramework dh_auto_install --builddirectory=BuildServer # Move the plugins from "/usr/share/orthanc/plugins" to ===================================== debian/source/include-binaries ===================================== @@ -1,4 +1,3 @@ -debian/ThirdPartyDownloads/civetweb-1.12-fixed.tar.gz debian/JS/jquery.mobile-1.1.0/images/icons-18-white.png debian/JS/jquery.mobile-1.1.0/images/icons-36-white.png debian/JS/jquery.mobile-1.1.0/images/icons-36-black.png View it on GitLab: https://salsa.debian.org/med-team/orthanc/-/commit/019fee2e8a5cdd081d8b0b0a0dc9e8f448389079 -- View it on GitLab: https://salsa.debian.org/med-team/orthanc/-/commit/019fee2e8a5cdd081d8b0b0a0dc9e8f448389079 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
