[med-svn] [Git][med-team/kissplice][master] 2 commits: Restore build time tests (Closes: #936798)

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / kissplice


Commits:
dd2ae0b9 by David Parsons at 2020-06-25T14:28:07+02:00
Restore build time tests (Closes: #936798)

- - - - -
d892b247 by David Parsons at 2020-06-25T14:28:18+02:00
Fix bcalm install (Closes: #962085)

- - - - -


6 changed files:

- − debian/TODO
- debian/changelog
- debian/links
- + debian/patches/fix-bcalm-install.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/TODO deleted
=====================================
@@ -1,10 +0,0 @@
-Upstream build time test has remaining errors.
-This was discussed here:
-
-   https://bugs.debian.org/936798#52
-
-This is related to
-
-   debian/rules
-   
-      dh_auto_test || true  ## FIXME: This is just to let the package build but not hiding the test failures


=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+kissplice (2.5.3-2) UNRELEASED; urgency=medium
+
+  * Restore build time tests: fixed upstream (Closes: #936798)
+  * Fix bcalm install (Closes: #962085)
+
+ -- David Parsons <david.parsons at inria.fr>  Tue, 23 Jun 2020 16:27:59 +0200
+
 kissplice (2.5.3-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/links
=====================================
@@ -1,2 +1 @@
 usr/share/kissplice/kissplice.py	usr/bin/kissplice
-usr/lib/kissplice/bcalm	usr/bin/bcalm


=====================================
debian/patches/fix-bcalm-install.patch
=====================================
@@ -0,0 +1,15 @@
+--- a/bcalm/CMakeLists.txt
++++ b/bcalm/CMakeLists.txt
+@@ -108,9 +108,9 @@
+ )
+ 
+ # We copy the project binary to the 'bin' directory
+-INSTALL (TARGETS ${PROJECT_NAME} DESTINATION bin)
+-INSTALL (DIRECTORY "${PROJECT_SOURCE_DIR}/example/" DESTINATION example)
+-INSTALL (FILES VERSION LICENSE README.md DESTINATION bin/..)
++INSTALL (TARGETS ${PROJECT_NAME} DESTINATION ${KS_SEC_EXEC_PATH})
++#INSTALL (DIRECTORY "${PROJECT_SOURCE_DIR}/example/" DESTINATION example)
++#INSTALL (FILES VERSION LICENSE README.md DESTINATION bin/..)
+ 
+ # cmake_system_name for mac is Darwin, i want to change that
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
+fix-bcalm-install.patch
 tests-2to3.patch
 spelling.patch


=====================================
debian/rules
=====================================
@@ -49,25 +49,9 @@ override_dh_install:
 	rm -rf debian/$(DEB_SOURCE)/usr/README.md debian/$(DEB_SOURCE)/build debian/$(DEB_SOURCE)/builds
 	mkdir -p debian/$(DEB_SOURCE)/usr/share/$(DEB_SOURCE)
 	mv debian/$(DEB_SOURCE)/usr/bin/kissplice debian/$(DEB_SOURCE)/usr/share/$(DEB_SOURCE)/kissplice.py
-	mv debian/$(DEB_SOURCE)/usr/bin/bcalm debian/$(DEB_SOURCE)/usr/lib/$(DEB_SOURCE)/bcalm
-	mkdir -p debian/$(DEB_SOURCE)/usr/share/doc/$(DEB_SOURCE)
-	mv debian/$(DEB_SOURCE)/usr/LICENSE debian/$(DEB_SOURCE)/usr/share/doc/$(DEB_SOURCE)/
-	mv debian/$(DEB_SOURCE)/usr/VERSION debian/$(DEB_SOURCE)/usr/share/doc/$(DEB_SOURCE)/
-	mv debian/$(DEB_SOURCE)/usr/example/ debian/$(DEB_SOURCE)/usr/share/doc/$(DEB_SOURCE)/
-
-# Force skip tests
-# The following tests FAILED:
-# 	  2 - KisspliceDBGTest (Failed)
-# 	  3 - KisspliceTwoSequencesTest (Failed)
-# 	  4 - KisspliceGraphAndSequenceTest (Failed)
-# 	  5 - KisspliceGraphTest (Failed)
-# 	  8 - ksErrorRemovalTest (Failed)
-override_dh_auto_test:
-	dh_auto_test || true  ## FIXME: This is just to let the package build but not hiding the test failures
 
 override_dh_installdocs:
 	dh_installdocs
-	find debian -name LICENSE -delete
 
 override_dh_auto_clean:
 	dh_auto_clean



View it on GitLab: https://salsa.debian.org/med-team/kissplice/-/compare/29da8c0a417c8d9860f69461acb62b896aa0aa52...d892b2476809177373e3e47439b00c1f4ea30201

-- 
View it on GitLab: https://salsa.debian.org/med-team/kissplice/-/compare/29da8c0a417c8d9860f69461acb62b896aa0aa52...d892b2476809177373e3e47439b00c1f4ea30201
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/20200625/26fdac30/attachment-0001.html>