[med-svn] [Git][med-team/falcon][master] 2 commits: Update build-system.patch, force installation into build-area, update d/rules

[Alexandre Mestiashvili]

Alexandre Mestiashvili pushed to branch master at Debian Med / falcon


Commits:
26fde659 by Alexandre Mestiashvili at 2018-09-11T09:30:37Z
Update build-system.patch, force installation into build-area, update d/rules

- - - - -
3314f3ac by Alexandre Mestiashvili at 2018-09-11T09:33:28Z
Add python-future to build-depends, run wrap-and-sort

- - - - -


6 changed files:

- debian/control
- debian/copyright
- debian/docs
- debian/install
- debian/patches/build-system.patch
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -6,27 +6,27 @@ Priority: optional
 Build-Depends: debhelper (>= 11~),
                dh-python,
                nim,
-               rsync,
                python-all-dev,
-               python-setuptools,
+               python-future,
                python-networkx (>= 1.7),
-# Test-Depends:
                python-nose,
-               python-pytest
+               python-pytest,
+               python-setuptools,
+               rsync
 Standards-Version: 4.1.5
 Vcs-Browser: https://salsa.debian.org/med-team/falcon
 Vcs-Git: https://salsa.debian.org/med-team/falcon.git
 Homepage: https://github.com/PacificBiosciences/FALCON
 
 Package: falcon
-Architecture: alpha amd64 kfreebsd-amd64 arm64 hppa mips64el ppc64 ppc64el s390x sparc64
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${python:Depends},
+Architecture: alpha amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64
+Depends: python-networkx (>= 1.7),
          python-pkg-resources,
-         python-networkx (>= 1.7),
          rsync,
-         time
+         time,
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
 Description: diploid-aware genome assembly of single-molecule sequencing reads
  FALCON is a set of tools for fast aligning long reads for consensus
  and assembly. It is a simple code collection for efficient assembly of


=====================================
debian/copyright
=====================================
@@ -115,7 +115,7 @@ License: BSD-3-Clause-EWM
     list of conditions and the following disclaimer in the documentation and/or
     other materials provided with the distribution.
  .
-  · The name of EWM may not be used to endorse or promote products derived from 
+  · The name of EWM may not be used to endorse or promote products derived from
     this software without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY EWM ”AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,


=====================================
debian/docs
=====================================
@@ -0,0 +1 @@
+


=====================================
debian/install
=====================================
@@ -1,2 +1,2 @@
-inst/*	/usr/lib/falcon
 debian/fc_run	/usr/bin
+inst/*	/usr/lib/falcon


=====================================
debian/patches/build-system.patch
=====================================
@@ -20,13 +20,13 @@ Last-Update: 2016-11-26
  	PREFIX=${FALCON_PREFIX} ${MAKE} -C ${FALCON_WORKSPACE}/DEXTRACTOR ${FALCON_INSTALL_RULE}
  install-pypeFLOW:
 -	cd ${FALCON_WORKSPACE}/pypeFLOW; pip uninstall -v .; pip install -v ${FALCON_PIP_USER} ${FALCON_PIP_EDIT} .
-+	cd ${FALCON_WORKSPACE}/pypeFLOW; python setup.py install ${FALCON_PYFLAGS}
++	cd ${FALCON_WORKSPACE}/pypeFLOW; python setup.py install ${FALCON_PYFLAGS} --prefix=${FALCON_PREFIX}
  install-FALCON: install-pypeFLOW
 -	cd ${FALCON_WORKSPACE}/FALCON; pip uninstall -v .; pip install -v ${FALCON_PIP_USER} ${FALCON_PIP_EDIT} .
-+	cd ${FALCON_WORKSPACE}/FALCON; python setup.py install ${FALCON_PYFLAGS}
++	cd ${FALCON_WORKSPACE}/FALCON; python setup.py install ${FALCON_PYFLAGS} --prefix=${FALCON_PREFIX}
  install-FALCON_unzip: install-pypeFLOW
 -	cd ${FALCON_WORKSPACE}/FALCON_unzip; pip uninstall -v .; pip install -v ${FALCON_PIP_USER} ${FALCON_PIP_EDIT} .
-+	cd ${FALCON_WORKSPACE}/FALCON_unzip; python setup.py install ${FALCON_PYFLAGS}
++	cd ${FALCON_WORKSPACE}/FALCON_unzip; python setup.py install ${FALCON_PYFLAGS} --prefix=${FALCON_PREFIX}
  install-nim-falcon:
  	make -C ${FALCON_WORKSPACE}/nim-falcon/src -j1 all
  	rsync ${FALCON_WORKSPACE}/nim-falcon/src/*.exe ${FALCON_PREFIX}/bin/


=====================================
debian/rules
=====================================
@@ -1,19 +1,19 @@
 #!/usr/bin/make -f
 
-#DH_VERBOSE = 1
-#include /usr/share/dpkg/default.mk
+DH_VERBOSE = 1
+include /usr/share/dpkg/default.mk
 export LC_ALL=C.UTF-8
-
 export FALCON_WORKSPACE=$(CURDIR)
 export FALCON_PREFIX=$(CURDIR)/inst
 export FALCON_INSTALL_RULE=install
-
-export PYTHONPATH:=$(FALCON_PREFIX)/pylib:$(PYTHONPATH)
+py2vers = $(shell pyversions -rv)
+export PYTHONPATH:=$(FALCON_PREFIX)/lib/python${py2vers}/site-packages:$(PYTHONPATH)
 
 %:
 	dh $@ --with python2
 
 override_dh_auto_build:
+	mkdir $(FALCON_PREFIX)/lib/python${py2vers}/site-packages/ -p
 	mkdir -p \
 		$(FALCON_PREFIX)/bin \
 		$(FALCON_PREFIX)/include \



View it on GitLab: https://salsa.debian.org/med-team/falcon/compare/d4c737484fff40d47b07614e08ab79ad7947ce6e...3314f3acee45ddcd6e9c77b2c059daaf59a32f5b

-- 
View it on GitLab: https://salsa.debian.org/med-team/falcon/compare/d4c737484fff40d47b07614e08ab79ad7947ce6e...3314f3acee45ddcd6e9c77b2c059daaf59a32f5b
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/20180911/025f8e43/attachment-0001.html>