[SCM] Packaging for mathgl branch, experimental, updated. debian/2_rc2+svn376-10-g96a3be9

Dimitrios Eftaxiopoulos eftaxi12 at otenet.gr
Sun Mar 25 21:57:41 UTC 2012


The following commit has been merged in the experimental branch:
commit 96a3be999e6b3be5bdc65c079fa4100b80b5c680
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Mon Mar 26 00:52:37 2012 +0300

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

diff --git a/debian/docs b/debian/docs
index eb9b151..eda67f7 100644
--- 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
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 4277de1..0f11d69 100644
--- 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 18106cb..b312766 100644
--- 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 69c2676..084daa8 100755
--- 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 edee957..df866ad 100644
--- 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)

-- 
Packaging for mathgl



More information about the debian-science-commits mailing list