[med-svn] [fast5] 01/01: Fairly lintian-clean 0.6.2, just uploaded.

[Steffen Möller]

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

moeller pushed a commit to branch master
in repository fast5.

commit 377c1fa07f49b97e1fc54db1d96b081811eb95ba
Author: Steffen Moeller <moeller at debian.org>
Date:   Fri Sep 15 17:27:35 2017 +0200

    Fairly lintian-clean 0.6.2, just uploaded.
---
 debian/changelog              |  4 +++-
 debian/clean                  |  2 ++
 debian/control                | 29 ++++++++++++++++++++++++++++-
 debian/python-fast5-bin.dirs  |  1 +
 debian/python3-fast5-bin.dirs |  1 +
 debian/rules                  |  6 ++++++
 debian/source/options         |  1 +
 7 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a34d20..ad6b400 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-fast5 (0.6.2-1) UNRELEASED; urgency=medium
+fast5 (0.6.2-1) unstable; urgency=medium
 
   * Team upload.
   * New upstream version.
@@ -9,6 +9,8 @@ fast5 (0.6.2-1) UNRELEASED; urgency=medium
     - Added patch for gcc-7 compatibility
     - Added patch to adjusted include path for hdf5.h
   * ./debian/rules binary works, still trouble with generated files
+  * Added separate packages for the binaries to avoid conflicts between
+    the Python2 and Python3 versions of the same binaries.
 
  -- Steffen Moeller <moeller at debian.org>  Fri, 15 Sep 2017 13:46:49 +0200
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..d61d3a4
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+python/*.egg-info/*
+fast5/python/fast5/fast5.cpp
diff --git a/debian/control b/debian/control
index 1bbc454..eeac9d8 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
 	python-setuptools,
 	python3-all-dev,
 	python3-setuptools,
-Standards-Version: 3.9.8
+Standards-Version: 4.1.0
 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
@@ -42,8 +42,35 @@ 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
+Conflicts: python-fast5
 Architecture: any
 Depends:
 	${shlibs:Depends},
diff --git a/debian/python-fast5-bin.dirs b/debian/python-fast5-bin.dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/python-fast5-bin.dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/python3-fast5-bin.dirs b/debian/python3-fast5-bin.dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/python3-fast5-bin.dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/rules b/debian/rules
index e517f10..7782b8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,3 +31,9 @@ override_dh_auto_clean:
 
 override_dh_compress:
 	dh_compress -X .cpp
+
+override_dh_install:
+	dh_install
+	mv debian/python-fast5/usr/bin/* debian/python-fast5-bin/usr/bin/
+	mv debian/python3-fast5/usr/bin/* debian/python3-fast5-bin/usr/bin/
+	rm -rf debian/python-fast5/usr/bin/ debian/python3-fast5/usr/bin/
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..aac7459
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+extend-diff-ignore="^[^/]+\.egg-info/|python/fast5/fast5.cpp"

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