[med-svn] [Git][med-team/porechop][master] 5 commits: Properly use the dh_python3 options to override its behaviour, instead of being clever with it.

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Debian Med / porechop


Commits:
496802d2 by Mattia Rizzolo at 2018-09-27T09:44:24Z
Properly use the dh_python3 options to override its behaviour, instead of being clever with it.

For the "strange reason", it's just so to be able to store multiple
variants of a the same (compiled) python module, but this is not the
case here, so just use --no-ext-rename...

Gbp-Dch: Short
Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
435599ad by Mattia Rizzolo at 2018-09-27T09:46:12Z
Build only for the default Python3 version.

The software can't cope with being placed in odd places, so can't use
the multiple python version support that Debian has.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
006d4201 by Mattia Rizzolo at 2018-09-27T09:49:48Z
Build the package using pybuild.

+ Move all the files to the usual location for Python3 software.
+ Install the entry point directly in /usr/bin instead of symlinking.
+ Explicitly disable the tests (that before weren't even tried).

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
9960e831 by Mattia Rizzolo at 2018-09-27T09:50:39Z
Set Rules-Requires-Root:no.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
4ed01c43 by Mattia Rizzolo at 2018-09-27T09:52:03Z
Changelog for 0.2.3+dfsg-2

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/install
- − debian/links
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+porechop (0.2.3+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Properly use the dh_python3 options to override its behaviour, instead
+    of being clever with it.
+  * Build only for the default Python3 version.
+    The software can't cope with being placed in odd places, so can't use
+    the multiple python version support that Debian has.
+  * Build the package using pybuild.
+    + Move all the files to the usual location for Python3 software.
+    + Install the entry point directly in /usr/bin instead of symlinking.
+    + Explicitly disable the tests (that before weren't even tried).
+  * Set Rules-Requires-Root:no.
+
+ -- Mattia Rizzolo <mattia at debian.org>  Thu, 27 Sep 2018 11:49:55 +0200
+
 porechop (0.2.3+dfsg-1) unstable; urgency=medium
 
   * Initial release (Closes: #890112)


=====================================
debian/control
=====================================
@@ -6,18 +6,20 @@ Section: science
 Priority: optional
 Build-Depends: debhelper (>= 11~),
                dh-python,
-               python3-all-dev,
-               libseqan2-dev
+               libseqan2-dev,
+               python3-dev,
+               python3-setuptools
 Standards-Version: 4.2.1
+Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/med-team/porechop
 Vcs-Git: https://salsa.debian.org/med-team/porechop.git
 Homepage: https://rrwick.github.io/Porechop
 
 Package: porechop
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${python3:Depends}
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends}
 Description: adapter trimmer for Oxford Nanopore reads
  Porechop is a tool for finding and removing adapters from Oxford
  Nanopore reads. Adapters on the ends of reads are trimmed off, and


=====================================
debian/install
=====================================
@@ -1,3 +1 @@
-porechop/*.py		usr/lib/porechop/porechop
-porechop/*.so		usr/lib/porechop/porechop
-porechop-runner.py	usr/lib/porechop
+porechop-runner.py usr/bin


=====================================
debian/links deleted
=====================================
@@ -1 +0,0 @@
-usr/lib/porechop/porechop-runner.py	usr/bin/porechop


=====================================
debian/rules
=====================================
@@ -4,15 +4,15 @@
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-include /usr/share/dpkg/default.mk
+# FIXME - never enabled, tests fail, to be investigated
+export PYBUILD_DISABLE=test
 
 %:
-	dh $@ --with python3
+	dh $@ --with python3 --buildsystem pybuild
 
 override_dh_python3:
-	dh_python3
-	# for some very strange reason dh_python3 is renaming cpp_functions.so to cpp_functions.cpython-36m-$(DEB_SOURCE).so
-	# Just revert this!
-	mv debian/$(DEB_SOURCE)/usr/lib/$(DEB_SOURCE)/$(DEB_SOURCE)/cpp_functions*.so debian/$(DEB_SOURCE)/usr/lib/$(DEB_SOURCE)/$(DEB_SOURCE)/cpp_functions.so
-	# Did everything worked???
-	find . -name "*.so"
+	dh_python3 --no-ext-rename
+
+override_dh_install:
+	dh_install
+	mv -v debian/porechop/usr/bin/porechop-runner.py debian/porechop/usr/bin/porechop



View it on GitLab: https://salsa.debian.org/med-team/porechop/compare/ccbae5050ac12c0373bbc51691be58c6aaad2284...4ed01c43cf81cbf9c1eff0f4d4fa2a7fc4f19b9e

-- 
View it on GitLab: https://salsa.debian.org/med-team/porechop/compare/ccbae5050ac12c0373bbc51691be58c6aaad2284...4ed01c43cf81cbf9c1eff0f4d4fa2a7fc4f19b9e
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/20180927/991fff7e/attachment-0001.html>