[med-svn] [falcon] 07/12: Simplify organization of private Python modules

[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 9c64e755f80d9cdcc4bfd4858ec96a05d3b3ed40
Author: Afif Elghraoui <afif at debian.org>
Date:   Sat Nov 26 21:13:18 2016 -0800

    Simplify organization of private Python modules
    
    Don't use --install-prefix because it creates the unnecessary
    python2.7/site-packages/... directory tree, which we don't need
    in /usr/lib/falcon/.
---
 debian/fc_run                     | 2 +-
 debian/lintian-overrides          | 2 +-
 debian/patches/build-system.patch | 2 +-
 debian/rules                      | 4 ++--
 debian/tests/control              | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/fc_run b/debian/fc_run
index 55ae829..6c239ee 100644
--- a/debian/fc_run
+++ b/debian/fc_run
@@ -2,6 +2,6 @@
 
 prefix=$(realpath $(dirname $BASH_SOURCE)/../)
 export PATH="$prefix/lib/falcon/bin:$PATH"
-export PYTHONPATH="$prefix/lib/falcon/lib/python2.7/site-packages:$PYTHONPATH"
+export PYTHONPATH="$prefix/lib/falcon/pylib:$PYTHONPATH"
 
 $prefix/lib/falcon/bin/$(basename $0) "$@"
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 881b806..f7bb8a7 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1,4 +1,4 @@
 # These files were copied by and marked as executable during the build process.
 # They also exist in /usr/lib/falcon/bin/ and appear to work fine (tests are
 # passing)
-executable-not-elf-or-script usr/lib/falcon/lib/python2.7/site-packages/falcon_kit-0.7-py2.7-linux-x86_64.egg/EGG-INFO/scripts/*
+executable-not-elf-or-script usr/lib/falcon/pylib/falcon_kit-*.egg/EGG-INFO/scripts/*
diff --git a/debian/patches/build-system.patch b/debian/patches/build-system.patch
index 3264235..a14ff19 100644
--- a/debian/patches/build-system.patch
+++ b/debian/patches/build-system.patch
@@ -11,7 +11,7 @@ Last-Update: 2016-11-26
  #   PYTHONUSERBASE
  FALCON_PIP_EDIT?=--edit
  FALCON_INSTALL_RULE?=symlink
-+FALCON_PYFLAGS += --prefix ${FALCON_PREFIX}
++FALCON_PYFLAGS += --install-lib=${FALCON_PREFIX}/pylib --install-scripts=${FALCON_PREFIX}/bin
  export CC=gcc
  export CXX=g++
  
diff --git a/debian/rules b/debian/rules
index d0c94df..bc0ed67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ export FALCON_WORKSPACE=$(CURDIR)
 export FALCON_PREFIX=$(CURDIR)/inst
 export FALCON_INSTALL_RULE=install
 
-export PYTHONPATH:=$(FALCON_PREFIX)/lib/python2.7/site-packages:$(PYTHONPATH)
+export PYTHONPATH:=$(FALCON_PREFIX)/pylib:$(PYTHONPATH)
 
 %:
 	dh $@ --with python2
@@ -18,7 +18,7 @@ override_dh_auto_build:
 		$(FALCON_PREFIX)/bin \
 		$(FALCON_PREFIX)/include \
 		$(FALCON_PREFIX)/lib \
-		$(FALCON_PREFIX)/lib/python2.7/site-packages
+		$(FALCON_PREFIX)/pylib
 	$(MAKE) all
 
 override_dh_auto_test: unit-tests integration-tests ;
diff --git a/debian/tests/control b/debian/tests/control
index 9068835..916ebd0 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 Test-Command:
-	export PYTHONPATH=/usr/lib/falcon/lib/python2.7/site-packages;
+	export PYTHONPATH=/usr/lib/falcon/pylib;
 	cp -r FALCON/test FALCON/test_data $ADTTMP
 	&& cd $ADTTMP
 	&& nosetests -v test/

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