[SCM] Packaging for mathgl branch, experimental, updated. debian/2_rc2+svn383-1-3-gda2c813

[Dimitrios Eftaxiopoulos]

The following commit has been merged in the experimental branch:
commit da2c813765ee86a984c47f4380db9b60e031299c
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Tue Mar 27 23:07:10 2012 +0300

    Fix installation directory for python module and files

diff --git a/debian/changelog b/debian/changelog
index 0c2ea68..c31fb1b 100644
--- 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 at 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 at 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 d036619..b1cd8fe 100644
--- 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 b312766..18106cb 100644
--- 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 0db2473..58b6b3e 100644
--- 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)

-- 
Packaging for mathgl