[SCM] Packaging for mathgl branch, experimental, updated. debian/2.0.3-1-6-g794e2a2

Dimitrios Eftaxiopoulos eftaxi12 at otenet.gr
Sat Dec 22 11:47:01 UTC 2012


The following commit has been merged in the experimental branch:
commit 9a1713111fd336141f4f273070fb9384a4052674
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Sat Dec 22 03:25:54 2012 +0200

    Remove all patches because they cannot be popped-pushed-refreshed

diff --git a/debian/patches/CMakeLists-txt.patch b/debian/patches/CMakeLists-txt.patch
deleted file mode 100644
index b043dc3..0000000
--- a/debian/patches/CMakeLists-txt.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,31 +6,31 @@
- set(MathGL_VERSION_MINOR 0)
- 
- option(enable-double "Enable double precision in MathGL library" ON)
--option(enable-simple "Slightly increase drawing speed but disable mglDataA class")
--option(enable-mpi "Enable mpi")
--option(enable-all "Enable all features")
--option(enable-langall "Enable all language interfaces")
-+option(enable-simple "Slightly increase drawing speed but disable mglDataA class" OFF)
-+option(enable-mpi "Enable mpi" ON)
-+option(enable-all "Enable all features" ON)
-+option(enable-langall "Enable all language interfaces" ON)
- option(enable-lgpl "Enable only LGPL part of MathGL" OFF)
- # option(enable-ltdl "Enable loading modules support")
--option(enable-pthread "Enable POSIX threads support")
--option(enable-gsl "Enable gsl support")
--option(enable-jpeg "Enable jpeg support")
-+option(enable-pthread "Enable POSIX threads support" ON)
-+option(enable-gsl "Enable gsl support" ON)
-+option(enable-jpeg "Enable jpeg support" ON)
- option(enable-png "Enable png support" ON)
- option(enable-zlib "Enable zlib support" ON)
- #option(enable-u3d "Enable u3d support")
--option(enable-pdf "Enable pdf support")
--option(enable-gif "Enable gif support")
--option(enable-hdf4 "Enable hdf4 support")
-+option(enable-pdf "Enable pdf support" ON)
-+option(enable-gif "Enable gif support" ON)
-+option(enable-hdf4 "Enable hdf4 support" ON)
- option(enable-hdf5 "Enable hdf5 1.6 support")
--option(enable-hdf5_18 "Enable hdf5 1.8 support")
-+option(enable-hdf5_18 "Enable hdf5 1.8 support" ON)
- option(enable-opengl "Enable OpenGL support" ON)
--option(enable-glut "Enable glut support")
--option(enable-fltk "Enable fltk widget")
--option(enable-wx "Enable wxWidget widget")
--option(enable-qt "Enable Qt4 widget")
--option(enable-python "Enable python interface")
--option(enable-octave "Enable octave interface")
--option(enable-doc "Enable documentation building")
-+option(enable-glut "Enable glut support" ON)
-+option(enable-fltk "Enable fltk widget" ON)
-+option(enable-wx "Enable wxWidget widget" ON)
-+option(enable-qt "Enable Qt4 widget" ON)
-+option(enable-python "Enable python interface" ON)
-+option(enable-octave "Enable octave interface" ON)
-+option(enable-doc "Enable documentation building" ON)
- 
- include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include)
- 
diff --git a/debian/patches/lang-CMakeLists-txt.patch b/debian/patches/lang-CMakeLists-txt.patch
deleted file mode 100644
index 8c9e7a5..0000000
--- a/debian/patches/lang-CMakeLists-txt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lang/CMakeLists.txt
-+++ b/lang/CMakeLists.txt
-@@ -43,7 +43,7 @@
- 		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_wrap.cpp;build;mathgl.pyc")
- endif(MGL_HAVE_PYTHON)
- 
diff --git a/debian/patches/lang-setup-py-in.patch b/debian/patches/lang-setup-py-in.patch
deleted file mode 100644
index 97d065d..0000000
--- a/debian/patches/lang-setup-py-in.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/lang/setup.py.in
-+++ b/lang/setup.py.in
-@@ -1,4 +1,5 @@
- from distutils.core import setup, Extension
-+# -*- encoding: utf-8 -*-
- import os
- 
- mgl_i="${MGL_I}"
diff --git a/debian/patches/series b/debian/patches/series
index 69d2b5d..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +0,0 @@
-lang-CMakeLists-txt.patch
-CMakeLists-txt.patch
-lang-setup-py-in.patch

-- 
Packaging for mathgl



More information about the debian-science-commits mailing list