From 09bf50065c524e3f24e661d36f889965af9cd1c2 Mon Sep 17 00:00:00 2001 From: Dimitrios Eftaxiopoulos Date: Wed, 12 Sep 2012 01:29:40 +0300 Subject: [PATCH] Add patch for python to read utf-8 directory tree --- CMakeLists.txt | 36 +++++++++---------- debian/changelog | 5 ++- debian/control | 3 +- debian/patches/CMakeLists-txt.patch | 52 +++++++++++++++++++++++++++ debian/patches/lang-setup-py-in.patch | 8 +++++ debian/patches/series | 2 ++ lang/setup.py.in | 1 + 7 files changed, 87 insertions(+), 20 deletions(-) create mode 100644 debian/patches/CMakeLists-txt.patch create mode 100644 debian/patches/lang-setup-py-in.patch diff --git a/CMakeLists.txt b/CMakeLists.txt index db2c551..75415b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,31 +6,31 @@ set(MathGL_VERSION_MAJOR 2) 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/changelog b/debian/changelog index 5c82dc7..23bee52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ -mathgl (2.0.3-1) experimental; urgency=low +mathgl (2.0.3-1) unstable; urgency=low * New upstream release. + * Add mpi-default-dev to build dependencies. + * Add patch for lang/setup.py.in to enable python to read directory tree + written in utf-8 (not ascii) encoding. -- Dimitrios Eftaxiopoulos Tue, 11 Sep 2012 21:19:08 +0300 diff --git a/debian/control b/debian/control index 7b12b31..74bdc74 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 7.2.3~), libltdl-dev, libgsl0-dev, freeglut3-dev, libjpeg-dev, libtiff-dev, libfltk1.3-dev, libqt4-dev, libwxgtk2.8-dev, texinfo, texi2html, texlive, texlive-generic-recommended, liboctave-dev, libgif-dev, python, python-dev, python-numpy, python-support, libfontconfig1-dev, - libhdf4-dev, chrpath, libxinerama-dev, libxmu-dev, libxi-dev, libhpdf-dev + libhdf4-dev, chrpath, libxinerama-dev, libxmu-dev, libxi-dev, libhpdf-dev, + mpi-default-dev Standards-Version: 3.9.3 Homepage: http://mathgl.sourceforge.net/index.html Vcs-Git: git://git.debian.org/debian-science/packages/mathgl.git diff --git a/debian/patches/CMakeLists-txt.patch b/debian/patches/CMakeLists-txt.patch new file mode 100644 index 0000000..b043dc3 --- /dev/null +++ b/debian/patches/CMakeLists-txt.patch @@ -0,0 +1,52 @@ +--- 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-setup-py-in.patch b/debian/patches/lang-setup-py-in.patch new file mode 100644 index 0000000..97d065d --- /dev/null +++ b/debian/patches/lang-setup-py-in.patch @@ -0,0 +1,8 @@ +--- 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 e69de29..e84cfd6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1,2 @@ +CMakeLists-txt.patch +lang-setup-py-in.patch diff --git a/lang/setup.py.in b/lang/setup.py.in index 05edce4..44c5730 100644 --- 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}" -- 2.30.2