Update d/changelog

diff --git a/debian/changelog b/debian/changelog
index 451ada47ad55bd08fc8eabaa5d49cbd7639e9633..a007506f7189452a33f325991c1f8bad543098a8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mathgl (2.4.4-2) unstable; urgency=medium
+
+  * Remove unused fix_hdf5.patch
+  * Remove d/compat file and use Build-Depends: debhelper-compat (= 12) 
+    in d/control
+
+ -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Sun, 28 Jul 2019 11:32:06 +0300
+
 mathgl (2.4.4-1) unstable; urgency=medium
 
   * New upstream release

diff --git a/debian/patches/CMakeLists.patch b/debian/patches/CMakeLists.patch
index 85e52fb970c46ac6540d06a5f355ea42d905b485..303aa2edeceff34abda954cf63951adefeebb112 100644 (file)
--- a/debian/patches/CMakeLists.patch
+++ b/debian/patches/CMakeLists.patch
@@ -1,8 +1,6 @@
-Index: mathgl-2.4.3/CMakeLists.txt
-===================================================================
---- mathgl-2.4.3.orig/CMakeLists.txt
-+++ mathgl-2.4.3/CMakeLists.txt
-@@ -157,7 +157,7 @@ if(WIN32)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -161,7 +161,7 @@
  endif(WIN32)
  
  option(enable-double "Enable double precision in MathGL library" ON)
@@ -11,16 +9,7 @@ Index: mathgl-2.4.3/CMakeLists.txt
  option(enable-opengl "Enable OpenGL support" ON)
  option(enable-all-docs "Enable all documentation building")
  #option(enable-doc "Enable documentation building")
-@@ -165,7 +165,7 @@ option(enable-all "Enable all core featu
- option(enable-all-widgets "Enable all Widgets")
- option(enable-all-swig "Enable all SWIG based interfaces")
- option(enable-rvalue "Enable move constructor support (need C++11)" OFF)
--option(enable-pthread "Enable POSIX threads support" OFF)
-+option(enable-pthread "Enable POSIX threads support" OFF)
- if(MSVC)
-       option(enable-pthr-widget "Enable POSIX threads for widgets" OFF)
- else(MSVC)
-@@ -180,7 +180,7 @@ endif(enable-pthread AND enable-openmp)
+@@ -184,7 +184,7 @@
  
  option(enable-lgpl "Enable only LGPL part of MathGL")
  option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'")
@@ -29,7 +18,7 @@ Index: mathgl-2.4.3/CMakeLists.txt
  option(enable-doc-site "Enable HTML documentation for website")
  #CMAKE_DEPENDENT_OPTION(enable-doc-site "Enable HTML documentation for website" OFF "NOT enable-all-docs" ON)
  CMAKE_DEPENDENT_OPTION(enable-doc-html "Enable HTML documentation" OFF "NOT enable-all-docs" ON)
-@@ -194,19 +194,19 @@ CMAKE_DEPENDENT_OPTION(enable-mgltex "En
+@@ -198,19 +198,19 @@
  
  CMAKE_DEPENDENT_OPTION(enable-zlib "Enable zlib support" ON "NOT enable-all" ON)
  CMAKE_DEPENDENT_OPTION(enable-png "Enable png support" ON "NOT enable-all" ON)
@@ -60,7 +49,7 @@ Index: mathgl-2.4.3/CMakeLists.txt
  
  # msvc fwprintf print char* for the specifier of "%s" format
  if(MSVC AND MSVC_VERSION GREATER 1899)
-@@ -243,11 +243,11 @@ if(enable-qt4 OR enable-qt5)
+@@ -247,11 +247,11 @@
  #     endif(NOT enable-opengl)
  endif(enable-qt4 OR enable-qt5)
  

diff --git a/debian/patches/python2_and_python3.patch b/debian/patches/python2_and_python3.patch
index 945ce0d2bcbbd3dabd0ec43725c23ca9e314a5c9..a02689102c2f354079facaed43d7db28790065ca 100644 (file)
--- a/debian/patches/python2_and_python3.patch
+++ b/debian/patches/python2_and_python3.patch
@@ -1,8 +1,6 @@
 Provide support for both python2 and python3 interfaces
-Index: mathgl-2.4.2.1/lang/python2/CMakeLists.txt
-===================================================================
 --- /dev/null
-+++ mathgl-2.4.2.1/lang/python2/CMakeLists.txt
++++ b/lang/python2/CMakeLists.txt
 @@ -0,0 +1,60 @@
 +set(src_imp_dep
 +../../include/mgl2/type.h
@@ -64,10 +62,8 @@ Index: mathgl-2.4.2.1/lang/python2/CMakeLists.txt
 +endif(enable-python)
 +
 +set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${mgl_clean_files}")
-Index: mathgl-2.4.2.1/lang/python3/CMakeLists.txt
-===================================================================
 --- /dev/null
-+++ mathgl-2.4.2.1/lang/python3/CMakeLists.txt
++++ b/lang/python3/CMakeLists.txt
 @@ -0,0 +1,70 @@
 +set(src_imp_dep
 +../../include/mgl2/type.h
@@ -139,10 +135,8 @@ Index: mathgl-2.4.2.1/lang/python3/CMakeLists.txt
 +endif(enable-python)
 +
 +set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${mgl_clean_files}")
-Index: mathgl-2.4.2.1/lang/numpy.i
-===================================================================
---- mathgl-2.4.2.1.orig/lang/numpy.i
-+++ mathgl-2.4.2.1/lang/numpy.i
+--- a/lang/numpy.i
++++ b/lang/numpy.i
 @@ -107,11 +107,12 @@
      if (PyDict_Check(    py_obj)) return "dict"        ;
      if (PyList_Check(    py_obj)) return "list"        ;
@@ -160,11 +154,9 @@ Index: mathgl-2.4.2.1/lang/numpy.i
    }
  
    /* Given a NumPy typecode, return a string describing the type.
-Index: mathgl-2.4.2.1/lang/CMakeLists.txt
-===================================================================
---- mathgl-2.4.2.1.orig/lang/CMakeLists.txt
-+++ mathgl-2.4.2.1/lang/CMakeLists.txt
-@@ -17,52 +17,6 @@ if(NOT SWIG_FOUND)
+--- a/lang/CMakeLists.txt
++++ b/lang/CMakeLists.txt
+@@ -17,52 +17,6 @@
  endif(NOT SWIG_FOUND)
  INCLUDE(${SWIG_USE_FILE})
  
@@ -217,7 +209,7 @@ Index: mathgl-2.4.2.1/lang/CMakeLists.txt
  if(enable-lua)
        INCLUDE(FindLua51)
        if(NOT LUA51_FOUND)
-@@ -145,4 +99,8 @@ message(STATUS "${oct_prog} ${oct_host}
+@@ -145,4 +99,8 @@
        endif(enable-octave-install)
        set(mgl_clean_files ${mgl_clean_files} mathgl)
  endif(enable-octave)
@@ -226,11 +218,9 @@ Index: mathgl-2.4.2.1/lang/CMakeLists.txt
 +add_subdirectory( python3 )
 +
  set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${mgl_clean_files}")
-Index: mathgl-2.4.2.1/CMakeLists.txt
-===================================================================
---- mathgl-2.4.2.1.orig/CMakeLists.txt
-+++ mathgl-2.4.2.1/CMakeLists.txt
-@@ -9,6 +9,10 @@ set(mgl_clean_files )
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,6 +6,10 @@
  set(MGL_DEP_LIBS)
  add_definitions(-DMGL_SRC)