[med-svn] [python-pbcore] 08/11: Install upstream-provided convenience scripts

[Afif Elghraoui]

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

afif-guest pushed a commit to branch master
in repository python-pbcore.

commit fcb7bb9e78700aa63605bc2a44a7c31daad61740
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Tue Aug 11 00:30:10 2015 -0700

    Install upstream-provided convenience scripts
---
 debian/README.Debian                           | 13 +++++++++++++
 debian/patches/remove-convenience-script.patch | 21 ---------------------
 debian/patches/series                          |  1 -
 debian/rules                                   |  9 +++++++++
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..48e8cc8
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,13 @@
+python-pbcore for Debian
+------------------------
+
+The software as provided by PacBio makes two scripts available on the
+system path:
+
+* dataset.py
+* .open
+
+These have been made available instead in /usr/share/doc/python-pbcore/scripts/
+and .open has been renamed to open (so that it is no longer hidden).
+
+ -- Afif Elghraoui <afif at ghraoui.name>, Tue, 11 Aug 2015 00:19:59 -0700
diff --git a/debian/patches/remove-convenience-script.patch b/debian/patches/remove-convenience-script.patch
deleted file mode 100644
index 6282ad9..0000000
--- a/debian/patches/remove-convenience-script.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Remove convenience scripts ".open" and "dataset.py"
- I am not quite sure what .open does, but it puts a file named
- ".open" in /usr/bin, which is quite strange. The upstream changelog
- indicates that this script is for convenience, so I am removing it
- for the time being. I may later put these two scripts in /usr/share/
- or /usr/share/doc
-Author: Afif Elghraoui <afif at ghraoui.name>
-Last-Update: 2015-08-05
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- python-pbcore.orig/setup.py
-+++ python-pbcore/setup.py
-@@ -30,8 +30,6 @@
-                                'data/datasets/yieldtest/*.*']
-                                },
-     zip_safe = False,
--    entry_points = { "console_scripts" : [ ".open = pbcore.io.opener:entryPoint" ] },
--    scripts=['bin/dataset.py'],
-     install_requires=[
-         'h5py >= 2.0.1',
-         'numpy >= 1.7.1',
diff --git a/debian/patches/series b/debian/patches/series
index 8f4e122..57f5ddc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-remove-convenience-script.patch
 doc-theme.patch
 enable-build-time-testing.patch
diff --git a/debian/rules b/debian/rules
index 169f433..9b7e7de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,9 @@ export PYBUILD_AFTER_INSTALL = \
   chmod -x {destdir}/{install_dir}/pbcore/data/*.h5 \
            {destdir}/{install_dir}/pbcore/data/datasets/*.xml
 
+DESTDIR = $(CURDIR)/debian/$(DEB_SOURCE)
+SCRIPTSDIR = $(DESTDIR)/usr/share/doc/$(DEB_SOURCE)/scripts
+
 %:
 	LC_ALL=C.UTF-8 dh $@ --with python2 --buildsystem=pybuild
 
@@ -15,6 +18,12 @@ override_dh_auto_build:
 	dh_auto_build
 	$(MAKE) doc
 
+override_dh_install:
+	dh_install
+	mkdir -p $(SCRIPTSDIR)
+	mv $(DESTDIR)/usr/bin/.open $(SCRIPTSDIR)/open
+	mv $(DESTDIR)/usr/bin/dataset.py $(SCRIPTSDIR)/
+
 override_dh_installdocs:
 	dh_installdocs -X _source
 

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