Fix installation directory for python module and files

diff --git a/debian/changelog b/debian/changelog
index 0c2ea6894708b9352fc118001d0fe4dbff790d6c..c31fb1bc151654a155ac4b59bd844be84a631e6f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,13 @@
+mathgl (2~rc2+svn387-1) experimental; urgency=low
+
+  * Updated source from svn repository.
+  * Fix installation directory of python module and files.
+
+ -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Tue, 27 Mar 2012 17:29:00 +0200
+
 mathgl (2~rc2+svn383-1) experimental; urgency=low
 
+  * Updated source from svn repository.
   * Add udav, libmgl-glut and mathgl-doc packages.
 
  -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Mon, 26 Mar 2012 15:35:00 +0200

diff --git a/debian/patches/lang-CMakeLists-txt.patch b/debian/patches/lang-CMakeLists-txt.patch
index d036619dba21aae36bfc74742033cd052564d8f4..b1cd8fe6dcb5c38dfa6ca6f9bb65b3ffb7baae98 100644 (file)
--- a/debian/patches/lang-CMakeLists-txt.patch
+++ b/debian/patches/lang-CMakeLists-txt.patch
@@ -1,9 +1,10 @@
 --- a/lang/CMakeLists.txt
 +++ b/lang/CMakeLists.txt
-@@ -35,5 +35,5 @@
+@@ -35,6 +35,6 @@
                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang
        )
        add_custom_target(mgl_python_module ALL DEPENDS _mathgl.so mathgl.py)
 -      install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
-+      install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_SOURCE_DIR}/debian/tmp/usr WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
++      install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_SOURCE_DIR}/debian/tmp/usr --install-layout=deb WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
+       set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "mgl.i;numpy.i;setup.py;mgl_wrap.cpp;build;mathgl.pyc")
  endif(MGL_HAVE_PYTHON)

diff --git a/debian/python-mathgl.install b/debian/python-mathgl.install
index b3127660ae19528090c13f9adf0748ccd5003e50..18106cb6501abc937ee7f58ed4d1bf47f308be80 100644 (file)
--- a/debian/python-mathgl.install
+++ b/debian/python-mathgl.install
@@ -1 +1 @@
-debian/tmp/usr/lib/python*/site-packages/*
+debian/tmp/usr/lib/python*/dist-packages/*

diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
index 0db2473f40ff162d26cfc2f32636c75eff1dc48e..58b6b3edc2d01d16bed0c1deeb7838f1307d30db 100644 (file)
--- a/lang/CMakeLists.txt
+++ b/lang/CMakeLists.txt
@@ -35,6 +35,6 @@ if(MGL_HAVE_PYTHON)
                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang
        )
        add_custom_target(mgl_python_module ALL DEPENDS _mathgl.so mathgl.py)
-       install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
+       install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_SOURCE_DIR}/debian/tmp/usr --install-layout=deb WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
        set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "mgl.i;numpy.i;setup.py;mgl_wrap.cpp;build;mathgl.pyc")
 endif(MGL_HAVE_PYTHON)