[med-svn] [Git][med-team/orthanc][master] 3 commits: preparing for 1.5.8+dfsg-2

[Sebastien Jodogne]

Sebastien Jodogne pushed to branch master at Debian Med / orthanc


Commits:
2764ea56 by jodogne-guest at 2019-10-17T07:56:22Z
preparing for 1.5.8+dfsg-2

- - - - -
84960850 by jodogne-guest at 2019-10-17T08:07:22Z
removed unused lintian override

- - - - -
c0576f80 by jodogne-guest at 2019-10-17T08:18:21Z
Upload to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/orthanc.lintian-overrides
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+orthanc (1.5.8+dfsg-2) unstable; urgency=medium
+
+  * Disabling unit test "ImageProcessing.Convolution" on i386
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Thu, 17 Oct 2019 09:40:16 +0200
+
 orthanc (1.5.8+dfsg-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/orthanc.lintian-overrides
=====================================
@@ -1,5 +1,4 @@
 # The following lines override misspellings in jQuery File Upload
-spelling-error-in-binary usr/sbin/Orthanc allows to allows one to
 spelling-error-in-binary usr/sbin/Orthanc Accesss Access
 
 # The following line overrides misspelling in "OrthancExplorer/libs/jquery.blockui.js"


=====================================
debian/rules
=====================================
@@ -7,6 +7,7 @@ export DOC_DIR := $(DESTDIR)/usr/share/doc/orthanc
 export PLUGINS_DIR := $(DESTDIR)/usr/share/orthanc/plugins
 
 export UPSTREAM_VERSION := $(shell echo "$(DEB_VERSION)" | cut -d '+' -f 1)
+export BUILDARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
@@ -69,8 +70,15 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	mkdir -p $(DESTDIR)/locale/
 	localedef -f UTF-8 -i en_US $(DESTDIR)/locale/en_US.UTF-8/
 
+ifeq ($(BUILDARCH),i386)
+        # Disable unit test "ImageProcessing.Convolution" that only
+        # fails on Debian automated build machines (the test passes
+        # locally on Docker image "i386/debian:sid")
+	( cd Build; LOCPATH=$(DESTDIR)/locale/ ./UnitTests --gtest_filter=-ImageProcessing.Convolution )
+else
 	( cd Build; LOCPATH=$(DESTDIR)/locale/ ./UnitTests )
 endif
+endif
 
 override_dh_clean:
 	rm -rf ThirdPartyDownloads



View it on GitLab: https://salsa.debian.org/med-team/orthanc/compare/ef1f251f404e5e5fdb24e5a0e58c10322f1760c2...c0576f8062e1fc69abf526def03d2bc0dc65d09d

-- 
View it on GitLab: https://salsa.debian.org/med-team/orthanc/compare/ef1f251f404e5e5fdb24e5a0e58c10322f1760c2...c0576f8062e1fc69abf526def03d2bc0dc65d09d
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/20191017/c309dffb/attachment-0001.html>