[med-svn] [Git][med-team/orthanc-webviewer][master] 5 commits: building 2.4-3

[Sebastien Jodogne]

Sebastien Jodogne pushed to branch master at Debian Med / orthanc-webviewer


Commits:
422339b6 by jodogne-guest at 2019-01-28T13:21:39Z
building 2.4-3

- - - - -
cf4b9d50 by jodogne-guest at 2019-01-28T13:24:25Z
fix

- - - - -
1788840d by jodogne-guest at 2019-01-28T13:28:55Z
updated Standards-Version

- - - - -
d329f501 by jodogne-guest at 2019-01-28T13:34:24Z
fix indentation

- - - - -
2b15d966 by jodogne-guest at 2019-01-28T13:49:17Z
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/cmake
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,9 @@
-orthanc-webviewer (2.4-3) UNRELEASED; urgency=medium
+orthanc-webviewer (2.4-3) unstable; urgency=medium
 
   * Updated d/upstream/metadata with new reference paper about Orthanc
+  * Moved plugin binaries from "/usr/lib" to "/usr/lib/orthanc"
 
- -- Sebastien Jodogne <s.jodogne at gmail.com>  Fri, 04 May 2018 12:25:35 +0200
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Mon, 28 Jan 2019 14:15:22 +0100
 
 orthanc-webviewer (2.4-2) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -19,7 +19,7 @@ Build-Depends: cmake,
                uuid-dev,
                yui-compressor,
                zlib1g-dev
-Standards-Version: 4.1.4
+Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/med-team/orthanc-webviewer
 Vcs-Git: https://salsa.debian.org/med-team/orthanc-webviewer.git
 Homepage: https://www.orthanc-server.com/static.php?page=web-viewer


=====================================
debian/patches/cmake
=====================================
@@ -1,5 +1,5 @@
-Description: Fix the linking of the shared library and the inclusion of the JavaScript libraries
-Author: Sebastien Jodogne <s.jodogne at gmail.com>
+Description: Fix the inclusion of the JavaScript libraries
+Author: Sebastien Jodogne <s.jodogne at orthanc-labs.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: OrthancWebViewer-2.4/CMakeLists.txt
@@ -15,17 +15,3 @@ Index: OrthancWebViewer-2.4/CMakeLists.txt
  
  
  # Check that the Orthanc SDK headers are available
-@@ -156,9 +156,10 @@ message("Setting the version of the libr
- 
- add_definitions(-DORTHANC_WEBVIEWER_VERSION="${ORTHANC_WEBVIEWER_VERSION}")
- 
--set_target_properties(OrthancWebViewer PROPERTIES 
--  VERSION ${ORTHANC_WEBVIEWER_VERSION} 
--  SOVERSION ${ORTHANC_WEBVIEWER_VERSION})
-+set_target_properties(OrthancWebViewer PROPERTIES
-+  NO_SONAME ON
-+  LINK_FLAGS "-Wl,-soname,libOrthancWebViewer.so.${ORTHANC_WEBVIEWER_VERSION}"
-+  )
- 
- install(
-   TARGETS OrthancWebViewer


=====================================
debian/rules
=====================================
@@ -75,18 +75,19 @@ override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	( cd Build; ./UnitTests )
+endif
 
 override_dh_clean:
 	rm -rf ThirdPartyDownloads
 	dh_clean
 
 override_dh_auto_install:
-	cp Build/${TARGET} Build/${TARGET}.${UPSTREAM_VERSION}
-	dh_install Build/${TARGET}.${UPSTREAM_VERSION} usr/lib
+	dh_install Build/${TARGET}.${UPSTREAM_VERSION} usr/lib/orthanc
 
 override_dh_link:
-	dh_link usr/lib/${TARGET}.${UPSTREAM_VERSION} usr/share/orthanc/plugins/${TARGET}
+	dh_link usr/lib/orthanc/${TARGET}.${UPSTREAM_VERSION} usr/share/orthanc/plugins/${TARGET}
 
 override_dh_installchangelogs:
 	dh_installchangelogs -k NEWS



View it on GitLab: https://salsa.debian.org/med-team/orthanc-webviewer/compare/7fd364702d52d56637d4289ed77621b5230fa11f...2b15d966b539bef9b0bf9cb84c0b36299554beb7

-- 
View it on GitLab: https://salsa.debian.org/med-team/orthanc-webviewer/compare/7fd364702d52d56637d4289ed77621b5230fa11f...2b15d966b539bef9b0bf9cb84c0b36299554beb7
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190128/7c681b1c/attachment-0001.html>