[med-svn] [Git][med-team/mmseqs2][master] 2 commits: Touch up on some file installation locations

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / mmseqs2


Commits:
f44fcf81 by Shayan Doust at 2019-07-16T13:02:33Z
Touch up on some file installation locations

- - - - -
a4d501ad by Shayan Doust at 2019-07-16T13:56:30Z
Arbitrary touches and patch to prevent CMake from installing in the wrong dir.

- - - - -


5 changed files:

- debian/mmseqs2.install
- + debian/patches/fix_util_installation.patch
- debian/patches/series
- debian/rules
- debian/tests/run-unit-test


Changes:

=====================================
debian/mmseqs2.install
=====================================
@@ -1 +1,4 @@
-obj-x86_64-linux-gnu/src/test usr/share/doc/mmseqs2
+obj-x86_64-linux-gnu/src/test/* usr/share/doc/mmseqs2/test-binaries
+util/bash-completion.sh usr/share/mmseqs2
+README.md usr/share/doc/mmseqs2
+examples usr/share/doc/mmseqs2


=====================================
debian/patches/fix_util_installation.patch
=====================================
@@ -0,0 +1,18 @@
+Description: Prevent CMake from installing util/
+ We handle this within *.installs outselves
+Author: Shayan Doust <hello at shayandoust.me>
+Last-Update: 2019-07-16
+---
+Index: mmseqs2/util/CMakeLists.txt
+===================================================================
+--- mmseqs2.orig/util/CMakeLists.txt
++++ mmseqs2/util/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-install(PROGRAMS
+-        bash-completion.sh
+-        DESTINATION util
+-        )
++#install(PROGRAMS
++#        bash-completion.sh
++#        DESTINATION util
++#        )


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
+fix_util_installation.patch
 use_system_zstd.patch
 use_system_gzstream.patch


=====================================
debian/rules
=====================================
@@ -4,28 +4,8 @@
 export LC_ALL=C.UTF-8
 
 include /usr/share/dpkg/default.mk
-# this provides:
-# DEB_SOURCE: the source package name
-# DEB_VERSION: the full version of the package (epoch + upstream vers. + revision)
-# DEB_VERSION_EPOCH_UPSTREAM: the package's version without the Debian revision
-# DEB_VERSION_UPSTREAM_REVISION: the package's version without the Debian epoch
-# DEB_VERSION_UPSTREAM: the package's upstream version
-# DEB_DISTRIBUTION: the distribution(s) listed in the current entry of debian/changelog
-# SOURCE_DATE_EPOCH: the source release date as seconds since the epoch, as
-#                    specified by <https://reproducible-builds.org/specs/source-date-epoch/>
 
-# for hardening you might like to uncomment this:
-# export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
 	dh $@
-
-### When overriding auto_test make sure DEB_BUILD_OPTIONS will be respected
-#override_dh_auto_test:
-#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-#	do_stuff_for_testing
-#endif
-
-### If you **really** can not use uscan (even not with mode=git) use a debian/get-orig-script
-#get-orig-source:
-#	. debian/get-orig-source


=====================================
debian/tests/run-unit-test
=====================================
@@ -8,9 +8,9 @@ if [ "${AUTOPKGTEST_TMP}" = "" ] ; then
   trap "rm -rf ${AUTOPKGTEST_TMP}" 0 INT QUIT ABRT PIPE TERM
 fi
 
-cp -r /usr/share/doc/${pkg}/test "${AUTOPKGTEST_TMP}"
+cp -r /usr/share/doc/${pkg}/test-binaries "${AUTOPKGTEST_TMP}"
 
-cd "${AUTOPKGTEST_TMP}"/test
+cd "${AUTOPKGTEST_TMP}"/test-binaries
 rm -r CMakeFiles cmake_install.cmake
 gunzip *
 chmod +x *



View it on GitLab: https://salsa.debian.org/med-team/mmseqs2/compare/91a82e4f1199dad44aaf132d868c8c2a082fecb0...a4d501ad416f9b23b522b8f57f666a2cfd4bfaa0

-- 
View it on GitLab: https://salsa.debian.org/med-team/mmseqs2/compare/91a82e4f1199dad44aaf132d868c8c2a082fecb0...a4d501ad416f9b23b522b8f57f666a2cfd4bfaa0
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/20190716/349c476a/attachment-0001.html>