[med-svn] [Git][med-team/plastimatch][master] 4 commits: Respect DEB_BUILD_OPTIONS in override_dh_auto_test target

Michael R. Crusoe gitlab at salsa.debian.org
Sun Jan 6 12:12:33 GMT 2019


Michael R. Crusoe pushed to branch master at Debian Med / plastimatch


Commits:
80a08dfc by Michael R. Crusoe at 2019-01-06T10:18:48Z
Respect DEB_BUILD_OPTIONS in override_dh_auto_test target

- - - - -
f6247751 by Michael R. Crusoe at 2019-01-06T10:18:48Z
Remove trailing whitespace in debian/changelog

- - - - -
fc7e0a14 by Michael R. Crusoe at 2019-01-06T10:18:48Z
Remove trailing whitespace in debian/copyright

- - - - -
ff0b1424 by Michael R. Crusoe at 2019-01-06T10:30:14Z
Silence lintian spelling false positives.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/copyright
- debian/plastimatch.lintian-overrides
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+plastimatch (1.7.3+dfsg.1-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Respect DEB_BUILD_OPTIONS in override_dh_auto_test target
+  * Remove trailing whitespace in debian/changelog
+  * Remove trailing whitespace in debian/copyright
+  * Silence lintian spelling false positives.
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Sun, 06 Jan 2019 02:10:04 -0800
+
 plastimatch (1.7.3+dfsg.1-1) unstable; urgency=medium
 
   [ Gregory C. Sharp ]
@@ -39,7 +49,7 @@ plastimatch (1.6.5+dfsg.1-1) unstable; urgency=medium
   [ Gregory C. Sharp ]
   * New upstream version
   * Use debian libdlib-dev instead of upstream provided dlib
-  * Remove patches Fix-test-dependencies.patch and 
+  * Remove patches Fix-test-dependencies.patch and
     Remove-plm_version.h-from-list-of-installed-files.patch
     which are now fixed upstream
 
@@ -72,7 +82,7 @@ plastimatch (1.6.3+dfsg-1) unstable; urgency=medium
   [ Gregory C. Sharp ]
   * New upstream release
 
-  [ Andreas Tille ] 
+  [ Andreas Tille ]
   * cme fix dpkg-control
 
  -- Gregory C. Sharp <gregsharp.geo at yahoo.com>  Thu, 30 Jun 2016 13:36:15 -0400


=====================================
debian/control
=====================================
@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 11~),
                libtiff-dev,
                uuid-dev,
                zlib1g-dev
-Standards-Version: 4.1.5
+Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/med-team/plastimatch
 Vcs-Git: https://salsa.debian.org/med-team/plastimatch.git
 Homepage: http://plastimatch.org


=====================================
debian/copyright
=====================================
@@ -146,7 +146,7 @@ License: BSD-3-Clause
 Files: libs/devillard/*
 Copyright: 1998 Nicholas Devillard
 License: public-domain
- 
+
 Files: libs/itk-3.20.0/*
 Copyright: 1999-2003 Insight Software Consortium
 License: BSD-3-Clause
@@ -222,7 +222,7 @@ License: BSD-3-Clause
     (3) Neither the name of Georgetown University nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
- . 
+ .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE


=====================================
debian/plastimatch.lintian-overrides
=====================================
@@ -1,2 +1,8 @@
 plastimatch: package-name-doesnt-match-sonames
 plastimatch: non-dev-pkg-with-shlib-symlink
+
+# false positives, these spelling errors aren't from us
+plastimatch: spelling-error-in-binary usr/bin/plastimatch abov above
+plastimatch: spelling-error-in-binary usr/bin/plastimatch nam name
+plastimatch: spelling-error-in-binary usr/lib/libplmbase.so.1.7 Verticies Vertices
+plastimatch: spelling-error-in-binary usr/lib/libplmbase.so.1.7 transfrom transform


=====================================
debian/rules
=====================================
@@ -33,12 +33,14 @@ override_dh_auto_configure:
 	dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 #Make the test suit fatal on supported arches
 ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-amd64))
 	dh_auto_test
 else
 	dh_auto_test || true
 endif
+endif
 
 override_dh_auto_install:
 	dh_auto_install



View it on GitLab: https://salsa.debian.org/med-team/plastimatch/compare/38fb3876d3400139d64a4aeddf50cf0f77177dfd...ff0b1424222e1beceddd06fb6b1c9f57abdba4f5

-- 
View it on GitLab: https://salsa.debian.org/med-team/plastimatch/compare/38fb3876d3400139d64a4aeddf50cf0f77177dfd...ff0b1424222e1beceddd06fb6b1c9f57abdba4f5
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/20190106/11b51df2/attachment-0001.html>


More information about the debian-med-commit mailing list