[med-svn] [fast5] 01/01: Replace python{,3}-fast5-bin with fast5

[Afif Elghraoui]

This is an automated email from the git hooks/post-receive script.

afif pushed a commit to branch master
in repository fast5.

commit b30f1f59507d80d0fb58b722067d2acbeaa86b1a
Author: Afif Elghraoui <afif at debian.org>
Date:   Sat Sep 30 17:29:36 2017 -0400

    Replace python{,3}-fast5-bin with fast5
    
    Choosing between the two is an unnecessary decision. Either they
    should provide a virtual package or we just go with the python3
    implementation. The latter is done by this patch.
    
    * This change also adds the source:Version constraint for the relationship
      between fast5 and python3-fast5.
---
 debian/clean                               |  2 --
 debian/control                             | 38 ++++++++++--------------------
 debian/{docs => libfast5-dev.docs}         |  0
 debian/{examples => libfast5-dev.examples} |  0
 debian/{install => libfast5-dev.install}   |  0
 debian/python-fast5-bin.dirs               |  1 -
 debian/python3-fast5-bin.dirs              |  1 -
 debian/rules                               |  6 ++---
 8 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index d61d3a4..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,2 +0,0 @@
-python/*.egg-info/*
-fast5/python/fast5/fast5.cpp
diff --git a/debian/control b/debian/control
index a3a6c0c..214bc6b 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,18 @@ Homepage: https://github.com/mateidavid/fast5
 Vcs-Git: https://anonscm.debian.org/git/debian-med/fast5.git
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/fast5.git
 
+Package: fast5
+Architecture: all
+Depends:
+	${misc:Depends},
+	${python3:Depends},
+	python3-fast5 (=${source:Version}),
+Description: utilities for manipulating Oxford Nanopore Fast5 files
+ The data produced by Oxford Nanopore Technologies (ONT) sequencers
+ are stored in fast5 files, based on the HDF5 file format, with one
+ file per sequenced read. This package provides utilities to inspect
+ these files, as well as to pack them for more effficient use.
+
 Package: libfast5-dev
 Section: libdevel
 Architecture: all
@@ -44,32 +56,6 @@ Description: library for reading Oxford Nanopore Fast5 files -- Python 2
  .
  This package provides the Python 2 library
 
-Package: python-fast5-bin
-Conflicts: python3-fast5-bin
-Section: science
-Architecture: all
-Depends: python,
-	${misc:Depends},
-	${python:Depends},
-	python-fast5
-Description: executables of the Oxford Nanopore Fast5 library
- The library ships two executables: f5ls and f5packk
- .
- This package only depends on Python 2.
-
-Package: python3-fast5-bin
-Conflicts: python-fast5-bin
-Section: science
-Architecture: all
-Depends: python3,
-	${misc:Depends},
-	${python:Depends},
-	python3-fast5
-Description: executables of the Oxford Nanopore Fast5 library
- The library ships two executables: f5ls and f5packk
- .
- This package only depends on Python 3.
-
 Package: python3-fast5
 Section: python
 Architecture: any
diff --git a/debian/docs b/debian/libfast5-dev.docs
similarity index 100%
rename from debian/docs
rename to debian/libfast5-dev.docs
diff --git a/debian/examples b/debian/libfast5-dev.examples
similarity index 100%
rename from debian/examples
rename to debian/libfast5-dev.examples
diff --git a/debian/install b/debian/libfast5-dev.install
similarity index 100%
rename from debian/install
rename to debian/libfast5-dev.install
diff --git a/debian/python-fast5-bin.dirs b/debian/python-fast5-bin.dirs
deleted file mode 100644
index e772481..0000000
--- a/debian/python-fast5-bin.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/python3-fast5-bin.dirs b/debian/python3-fast5-bin.dirs
deleted file mode 100644
index e772481..0000000
--- a/debian/python3-fast5-bin.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/rules b/debian/rules
index 431b7d0..5294294 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,10 +37,8 @@ override_dh_compress:
 
 override_dh_install:
 	dh_install
-	mkdir -p debian/python-fast5-bin/usr/bin/
-	mkdir -p debian/python3-fast5-bin/usr/bin/
-	mv debian/python-fast5/usr/bin/* debian/python-fast5-bin/usr/bin/
-	mv debian/python3-fast5/usr/bin/* debian/python3-fast5-bin/usr/bin/
+	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 ; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fast5.git