Build failure due to non existent libmgl-glut package in debian/control

diff --git a/debian/docs b/debian/docs
index eb9b151cc884877495df75b49ed1b6598646328c..eda67f7075de3e35169896cd8ff1d0cf3a658670 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,3 @@
-NEWS
 README
+README_V2
 AUTHORS

diff --git a/debian/patches/lang-CMakeLists-txt.patch b/debian/patches/lang-CMakeLists-txt.patch
new file mode 100644 (file)
index 0000000..d036619
--- /dev/null
+++ b/debian/patches/lang-CMakeLists-txt.patch
@@ -0,0 +1,9 @@
+--- a/lang/CMakeLists.txt
++++ b/lang/CMakeLists.txt
+@@ -35,5 +35,5 @@
+               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 )")
+ endif(MGL_HAVE_PYTHON)

diff --git a/debian/patches/series b/debian/patches/series
index 4277de1289da0f79046007582058505143729fb1..0f11d69ac48bd9a923e63e47805c831949249d0c 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+lang-CMakeLists-txt.patch
 CMakeLists-txt.patch

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

diff --git a/debian/rules b/debian/rules
index 69c26763cb8f9c304da031213c370d5ec0a8c271..084daa846cd3a903178fe33449410129ed6abbfb 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -74,12 +74,9 @@ binary-arch:
        dh_prep -a
        dh_installdirs -a
        dh_auto_install -a --buildsystem=cmake
-#      rm -f debian/tmp/usr/bin/*_example
 #      for file in debian/tmp/usr/lib/*.la; do \
 #              sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
 #      done
-#      chrpath -d debian/tmp/usr/lib/*so.6
-#      chrpath -d debian/tmp/usr/lib/python*/dist-packages/_mathgl.so
        dh_install -a
        dh_installdocs -a
        dh_installchangelogs -a
@@ -91,7 +88,7 @@ binary-arch:
        dh_installemacsen -a
        dh_installifupdown -a
        dh_installinfo -a
-       dh_python2 -a
+       dh_python2 -a --no-guessing-versions
        dh_numpy -a
        dh_installinit -a
        dh_installmenu -a

diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
index edee957fbf7dcbd48b90ecb84386eae42ad9c660..df866ad5a55042bed661e1f1a7c34eb349258151 100644 (file)
--- a/lang/CMakeLists.txt
+++ b/lang/CMakeLists.txt
@@ -35,5 +35,5 @@ 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 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
 endif(MGL_HAVE_PYTHON)