[med-svn] [pbgenomicconsensus] 01/08: Install the python scripts at build time rather than patching setup.py

[Afif Elghraoui]

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

afif pushed a commit to branch master
in repository pbgenomicconsensus.

commit 007e49e07ab6ea63fcb14b9f43a206e0d4824aa1
Author: Afif Elghraoui <afif at debian.org>
Date:   Fri Jul 8 06:15:09 2016 -0700

    Install the python scripts at build time rather than patching setup.py
    
    Move the scripts that get installed by setup.py into the main binary package
    rather than have to maintain a patch against upstream source.
---
 debian/patches/python-scripts     | 21 ---------------------
 debian/patches/series             |  1 -
 debian/pbgenomicconsensus.install |  1 -
 debian/rules                      |  4 ++++
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/debian/patches/python-scripts b/debian/patches/python-scripts
deleted file mode 100644
index 47c01e3..0000000
--- a/debian/patches/python-scripts
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Don't install scripts with distutils
- They are going into a separate package, so there is no need
- for setuptools to know about it.
-Author: Afif Elghraoui <afif at ghraoui.name>
-Forwarded: not-needed
-Last-Update: 2016-02-11
---- pbgenomicconsensus.orig/setup.py
-+++ pbgenomicconsensus/setup.py
-@@ -15,12 +15,6 @@
-     author='Pacific Biosciences',
-     author_email='devnet at pacificbiosciences.com',
-     license=open('LICENSES').read(),
--    scripts = ['bin/variantCaller',
--               'bin/summarizeConsensus',
--               'bin/gffToVcf',
--               'bin/gffToBed',
--               'bin/plurality',
--               'bin/quiver'],
-     packages = find_packages(),
-     package_data={'GenomicConsensus.quiver': ['resources/*/GenomicConsensus/*.ini']},
-     include_package_data=True,
diff --git a/debian/patches/series b/debian/patches/series
index f0c4695..94817e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-python-scripts
 spelling.patch
 manpages.patch
 verbose-testing.patch
diff --git a/debian/pbgenomicconsensus.install b/debian/pbgenomicconsensus.install
deleted file mode 100644
index 0b02e87..0000000
--- a/debian/pbgenomicconsensus.install
+++ /dev/null
@@ -1 +0,0 @@
-bin	usr
diff --git a/debian/rules b/debian/rules
index bcf2515..5677229 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ export LC_ALL=C.UTF-8
 include /usr/share/dpkg/default.mk
 
 export PYBUILD_NAME := $(DEB_SOURCE)
+BINDIR=$(CURDIR)/debian/$(DEB_SOURCE)/usr/bin/
 MANDIR=$(CURDIR)/debian/$(DEB_SOURCE)/usr/share/man/
 
 %:
@@ -17,6 +18,9 @@ override_dh_auto_test:
 
 override_dh_install:
 	dh_install
+# Place executable programs in the main package
+	mkdir -p $(BINDIR)
+	mv debian/python-$(DEB_SOURCE)/usr/bin/* $(BINDIR)
 	mkdir -p $(MANDIR)/man5 $(MANDIR)/man1 $(MANDIR)/man7
 	rst2man doc/VariantsGffSpecification.rst > $(MANDIR)/man5/pbgff.5
 	rst2man doc/VariantCallerFunctionalSpecification.rst > $(MANDIR)/man1/variantCaller.1

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