[med-svn] [falcon] 04/06: Update and refresh patches

[Afif Elghraoui]

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

afif pushed a commit to branch master
in repository falcon.

commit 8accac77cdecc7084277fc4bfe7e1f71ad9c0c91
Author: Afif Elghraoui <afif at debian.org>
Date:   Sun Nov 13 22:48:28 2016 -0800

    Update and refresh patches
---
 debian/patches/build-system.patch   | 12 ++++++------
 debian/patches/rdflib.patch         |  2 +-
 debian/patches/versioned-deps.patch |  4 +++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/patches/build-system.patch b/debian/patches/build-system.patch
index 9bd46d1..0a20571 100644
--- a/debian/patches/build-system.patch
+++ b/debian/patches/build-system.patch
@@ -31,14 +31,14 @@ Last-Update: 2016-10-22
  checklist:
  	@if [ -z "$${FALCON_PREFIX}" ]; then echo 'Error: FALCON_PREFIX is not set'; exit 1; fi
  	@if [ ! -e "$${FALCON_PREFIX}/bin" ] ; then echo 'Error: directory FALCON_PREFIX/bin (${FALCON_PREFIX}/bin) does not exist'; exit 1; fi
--install: install-DAZZ_DB install-DALIGNER install-DAMASKER install-pypeFLOW install-FALCON install-git-sym
-+install: install-DAZZ_DB install-DALIGNER install-DAMASKER install-pypeFLOW install-FALCON
+-install: install-DAZZ_DB install-DALIGNER install-DAMASKER install-DEXTRACTOR install-pypeFLOW install-FALCON install-git-sym
++install: install-DAZZ_DB install-DALIGNER install-DAMASKER install-DEXTRACTOR install-pypeFLOW install-FALCON
  install-DAZZ_DB:
  	${MAKE} -C ${FALCON_WORKSPACE}/DAZZ_DB all
  	PREFIX=${FALCON_PREFIX} ${MAKE} -C ${FALCON_WORKSPACE}/DAZZ_DB ${FALCON_INSTALL_RULE}
-@@ -31,9 +31,9 @@
- 	${MAKE} -C ${FALCON_WORKSPACE}/DAMASKER all
- 	PREFIX=${FALCON_PREFIX} ${MAKE} -C ${FALCON_WORKSPACE}/DAMASKER ${FALCON_INSTALL_RULE}
+@@ -34,9 +34,9 @@
+ 	${MAKE} -C ${FALCON_WORKSPACE}/DEXTRACTOR all
+ 	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}
@@ -75,4 +75,4 @@ Last-Update: 2016-10-22
 +full-test:
  	${MAKE} run-synth0
  	${MAKE} -C run/synth0 test
- 	${MAKE} -C run/synth0 clean
+ 	#${MAKE} -C run/synth0 clean
diff --git a/debian/patches/rdflib.patch b/debian/patches/rdflib.patch
index dccd94f..e13090f 100644
--- a/debian/patches/rdflib.patch
+++ b/debian/patches/rdflib.patch
@@ -14,8 +14,8 @@ Last-Update: 2016-10-22
 -        'rdfextras >= 0.1',
 +        'rdflib',
          'html5lib == 0.999999',
+         'networkx >=1.7, <=1.10',
      ],
-     entry_points = {'console_scripts': [
 --- falcon.orig/pypeFLOW/pypeflow/common.py
 +++ falcon/pypeFLOW/pypeflow/common.py
 @@ -34,11 +34,6 @@
diff --git a/debian/patches/versioned-deps.patch b/debian/patches/versioned-deps.patch
index 4ade4bd..ebb6af6 100644
--- a/debian/patches/versioned-deps.patch
+++ b/debian/patches/versioned-deps.patch
@@ -17,12 +17,14 @@ Last-Update: 2016-06-22
          ]
 --- falcon.orig/pypeFLOW/setup.py
 +++ falcon/pypeFLOW/setup.py
-@@ -15,7 +15,7 @@
+@@ -15,8 +15,8 @@
      zip_safe = False,
      install_requires=[
          'rdflib',
 -        'html5lib == 0.999999',
+-        'networkx >=1.7, <=1.10',
 +        'html5lib',
++        'networkx >=1.7',
      ],
      entry_points = {'console_scripts': [
              'pwatcher-main=pwatcher.mains.pwatcher:main',

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