This is an automated email from the git hooks/post-receive script. afif pushed a commit to branch master in repository fast5.
commit 0fdfd6175cada0dec1464223a8cc1fd9aa143ee5 Author: Afif Elghraoui <[email protected]> Date: Fri Oct 6 23:01:09 2017 -0400 Vastly simplified packaging after upstream patches accepted --- debian/libfast5-dev.examples | 3 +-- debian/libfast5-dev.install | 8 +------- debian/patches/functional.patch | 14 -------------- debian/patches/rpath.patch | 8 ++++---- debian/patches/series | 1 - debian/rules | 15 +-------------- 6 files changed, 7 insertions(+), 42 deletions(-) diff --git a/debian/libfast5-dev.examples b/debian/libfast5-dev.examples index 68925c5..71bcfc6 100644 --- a/debian/libfast5-dev.examples +++ b/debian/libfast5-dev.examples @@ -1,2 +1 @@ -src/*.cpp -src/Makefile +src/* diff --git a/debian/libfast5-dev.install b/debian/libfast5-dev.install index ba8789e..7a669c3 100644 --- a/debian/libfast5-dev.install +++ b/debian/libfast5-dev.install @@ -1,7 +1 @@ -src/fast5.hpp usr/include -src/hdf5_tools.hpp usr/include/fast5 -src/fast5_version.hpp usr/include/fast5 -src/Bit_Packer.hpp usr/include/fast5 -src/Huffman_Packer.hpp usr/include/fast5 -src/logger.hpp usr/include/fast5 -src/*.inl usr/include/fast5 +include /usr/ diff --git a/debian/patches/functional.patch b/debian/patches/functional.patch deleted file mode 100644 index 11b2d86..0000000 --- a/debian/patches/functional.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Steffen Moeller -Last-Update: 2017-09-15 14:17:53 +0200 -Description: Add missing header - ---- a/src/logger.hpp -+++ b/src/logger.hpp -@@ -72,6 +72,7 @@ - #include <iostream> - #include <mutex> - #include <stdexcept> -+#include <functional> - - namespace logger - { diff --git a/debian/patches/rpath.patch b/debian/patches/rpath.patch index b0c6612..2d11aef 100644 --- a/debian/patches/rpath.patch +++ b/debian/patches/rpath.patch @@ -2,11 +2,11 @@ Description: Don't set RPATH for compiled Python extensions Author: Afif Elghraoui <[email protected]> Forwarded: not-needed Last-Update: 2016-10-20 ---- a/python/setup.py -+++ b/python/setup.py -@@ -53,7 +53,7 @@ extensions = [ +--- fast5.orig/python/setup.py ++++ fast5/python/setup.py +@@ -54,7 +54,7 @@ sources=['fast5/fast5.' + ['cpp', 'pyx'][use_cython]], - include_dirs=[fast5_src_dir], + include_dirs=[fast5_src_dir, fast5pack_src_dir], library_dirs=[hdf5_lib_dir], - runtime_library_dirs=[hdf5_lib_dir], + #runtime_library_dirs=[hdf5_lib_dir], diff --git a/debian/patches/series b/debian/patches/series index 4398c1d..81e04e7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ rpath.patch -functional.patch hdf5include.patch diff --git a/debian/rules b/debian/rules index 5294294..de7ae74 100755 --- a/debian/rules +++ b/debian/rules @@ -18,17 +18,11 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all dh $@ --with python2,python3 --buildsystem=pybuild \ --sourcedirectory=python -override_dh_auto_build: - mkdir -p src/fast5 - ln -sf ../hdf5_tools.hpp src/fast5/hdf5_tools.hpp - dh_auto_build - override_dh_auto_test: - cd src && $(MAKE) CPPFLAGS=-I$(CURDIR)/src + cd src && $(MAKE) override_dh_auto_clean: cd src && $(MAKE) clean - $(RM) -r src/fast5 dh_auto_clean rm -rf python/fast5/fast5.cpp @@ -40,10 +34,3 @@ override_dh_install: mkdir -p debian/fast5/usr/bin/ mv debian/python3-fast5/usr/bin/* debian/fast5/usr/bin/ rm -rf debian/python-fast5/usr/bin/ debian/python3-fast5/usr/bin/ - if [ -e debian/libfast5-dev/usr/include/fast5.hpp ] ; then \ - sed -i s'%"hdf5_tools.hpp"%<fast5/hdf5_tools.hpp>%' debian/libfast5-dev/usr/include/fast5.hpp ; \ - sed -i s'%"fast5_version.hpp"%<fast5/fast5_version.hpp>%' debian/libfast5-dev/usr/include/fast5.hpp ; \ - sed -i s'%"logger.hpp"%<fast5/logger.hpp>%' debian/libfast5-dev/usr/include/fast5.hpp ; \ - sed -i s'%"Huffman_Packer.hpp"%<fast5/Huffman_Packer.hpp>%' debian/libfast5-dev/usr/include/fast5.hpp ; \ - sed -i s'%"Bit_Packer.hpp"%<fast5/Bit_Packer.hpp>%' debian/libfast5-dev/usr/include/fast5.hpp ; \ - fi -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fast5.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
