Nilesh Patra pushed to branch master at Debian Med / populations
Commits: 934f946b by Nilesh Patra at 2021-02-19T12:22:36+05:30 Do not hardcode cmake to fix FTCBFS - - - - - f6df543c by Nilesh Patra at 2021-02-19T12:23:08+05:30 Do not follow install instructions from CMakeLists.txt, but instead from d/*.install - - - - - b6acd5ff by Nilesh Patra at 2021-02-19T12:25:06+05:30 Add myself to uploaders - - - - - 4dd05c22 by Nilesh Patra at 2021-02-19T12:26:33+05:30 Update changelog - - - - - 6 changed files: - debian/changelog - debian/control - + debian/patches/do-not-install-binary-from-src-dir.patch - debian/patches/series - + debian/populations.install.in - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +populations (1.2.33+svn0120106+dfsg-4) unstable; urgency=medium + + * Do not hardcode cmake to fix FTCBFS + * Do not follow install instructions from CMakeLists.txt, + but instead from d/*.install + * Add myself to uploaders + + -- Nilesh Patra <[email protected]> Fri, 19 Feb 2021 12:25:42 +0530 + populations (1.2.33+svn0120106+dfsg-3) unstable; urgency=medium * Team upload ===================================== debian/control ===================================== @@ -1,6 +1,7 @@ Source: populations Maintainer: Debian Med Packaging Team <[email protected]> -Uploaders: Georges Khaznadar <[email protected]> +Uploaders: Georges Khaznadar <[email protected]>, + Nilesh Patra <[email protected]> Section: science Priority: optional Build-Depends: debhelper-compat (= 12), ===================================== debian/patches/do-not-install-binary-from-src-dir.patch ===================================== @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -153,6 +153,6 @@ + if (NOT CMAKE_INSTALL_PREFIX) + SET (CMAKE_INSTALL_PREFIX /usr/local) + endif (NOT CMAKE_INSTALL_PREFIX) +-INSTALL(PROGRAMS src/populations DESTINATION bin) ++#INSTALL(PROGRAMS src/populations DESTINATION bin) + #INSTALL(DIRECTORY doc/man1 DESTINATION share/man/man1) + #INSTALL(FILES doc/man1/beads.1 DESTINATION share/man/man1) ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ fix-ftbfs-gcc-4.7-667327.patch qt5.patch +do-not-install-binary-from-src-dir.patch ===================================== debian/populations.install.in ===================================== @@ -0,0 +1 @@ +obj-@DEB_HOST_MULTIARCH@/src/populations usr/bin ===================================== debian/rules ===================================== @@ -10,9 +10,11 @@ export QT_SELECT=qt5 %: dh $@ -override_dh_auto_configure: - cmake -DCMAKE_INSTALL_PREFIX=/usr . - dh_auto_configure +override_dh_auto_install: debian/populations.install + dh_auto_install + +debian/%.install: debian/%.install.in + sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ override_dh_auto_clean: dh_testdir View it on GitLab: https://salsa.debian.org/med-team/populations/-/compare/952d5a392c302d071a894ac2f1bf2a9e545fae46...4dd05c228315fcf907cd20d99d57681dfb6b0171 -- View it on GitLab: https://salsa.debian.org/med-team/populations/-/compare/952d5a392c302d071a894ac2f1bf2a9e545fae46...4dd05c228315fcf907cd20d99d57681dfb6b0171 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
