[plplot] 57/68: Import Debian changes 5.9.9-5

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository plplot.

commit 9401d9a6d9d32ac4ba709a041515d1bc98e0b3cc
Author: Andrew Ross <andrewross at users.sourceforge.net>
Date:   Wed Aug 8 09:34:10 2012 +0100

    Import Debian changes 5.9.9-5
    
    plplot (5.9.9-5) unstable; urgency=low
    
      * debian/patches/series, debian/patches/fix-cmake-ada-support.diff:
        Add patch from upstream to fix cmake ada support with cmake 2.8.9 and later
        (closes: #680841).
      * debian/patches/series, debian/patches/fix-lua-includes.diff:
        Add patch to work around problem with lua cmake support. Debian now requires
        multiple include paths which were not found correctly. This prevents a FTBFS
        with recent versions of lua5.1.
      * Recompile with latest version of gfortran (closes: #683878).
---
 debian/changelog                          | 13 +++++++++++++
 debian/patches/fix-cmake-ada-support.diff | 25 +++++++++++++++++++++++++
 debian/patches/fix-lua-includes.diff      | 21 +++++++++++++++++++++
 debian/patches/series                     |  2 ++
 4 files changed, 61 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c7e07a2..e9cb728 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+plplot (5.9.9-5) unstable; urgency=low
+
+  * debian/patches/series, debian/patches/fix-cmake-ada-support.diff:
+    Add patch from upstream to fix cmake ada support with cmake 2.8.9 and later
+    (closes: #680841).
+  * debian/patches/series, debian/patches/fix-lua-includes.diff:
+    Add patch to work around problem with lua cmake support. Debian now requires 
+    multiple include paths which were not found correctly. This prevents a FTBFS 
+    with recent versions of lua5.1.
+  * Recompile with latest version of gfortran (closes: #683878). 
+
+ -- Andrew Ross <andrewross at users.sourceforge.net>  Wed, 08 Aug 2012 09:34:10 +0100
+
 plplot (5.9.9-4) unstable; urgency=low
 
   * debian/rules: 
diff --git a/debian/patches/fix-cmake-ada-support.diff b/debian/patches/fix-cmake-ada-support.diff
new file mode 100644
index 0000000..9769a42
--- /dev/null
+++ b/debian/patches/fix-cmake-ada-support.diff
@@ -0,0 +1,25 @@
+Description: Fix up cmake Ada support for compatibility with cmake 2.8.9 
+Author: Andrew Ross <andrewross at users.sourceforge.net>
+Last-Update: 2012-07-19
+
+--- plplot-5.9.9.orig/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake	2011-10-13 01:43:01.000000000 +0100
++++ plplot-5.9.9/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake	2012-07-19 23:03:27.835197249 +0100
+@@ -29,6 +29,18 @@
+   SET(CMAKE_SHARED_LIBRARY_CREATE_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
+ ENDIF(NOT CMAKE_SHARED_LIBRARY_CREATE_Ada_FLAGS)
+ 
++IF(NOT CMAKE_Ada_COMPILE_OPTIONS_PIC)
++  SET(CMAKE_Ada_COMPILE_OPTIONS_PIC ${CMAKE_C_COMPILE_OPTIONS_PIC})
++ENDIF(NOT CMAKE_Ada_COMPILE_OPTIONS_PIC)
++
++IF(NOT CMAKE_Ada_COMPILE_OPTIONS_PIE)
++  SET(CMAKE_Ada_COMPILE_OPTIONS_PIE ${CMAKE_C_COMPILE_OPTIONS_PIE})
++ENDIF(NOT CMAKE_Ada_COMPILE_OPTIONS_PIE)
++
++IF(NOT CMAKE_Ada_COMPILE_OPTIONS_DLL)
++  SET(CMAKE_Ada_COMPILE_OPTIONS_DLL ${CMAKE_C_COMPILE_OPTIONS_DLL})
++ENDIF(NOT CMAKE_Ada_COMPILE_OPTIONS_DLL)
++
+ IF(NOT CMAKE_SHARED_LIBRARY_Ada_FLAGS)
+   SET(CMAKE_SHARED_LIBRARY_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS})
+ ENDIF(NOT CMAKE_SHARED_LIBRARY_Ada_FLAGS)
diff --git a/debian/patches/fix-lua-includes.diff b/debian/patches/fix-lua-includes.diff
new file mode 100644
index 0000000..48b85fc
--- /dev/null
+++ b/debian/patches/fix-lua-includes.diff
@@ -0,0 +1,21 @@
+Description: Fix for cmake lua support to work around problem that lua needs multiple include directories on Debian
+Author: Andrew Ross <andrewross at users.sourceforge.net>
+Last-Update: 2012-07-19
+
+===================================================================
+Index: plplot-5.9.9/cmake/modules/lua.cmake
+===================================================================
+--- plplot-5.9.9.orig/cmake/modules/lua.cmake	2011-10-13 01:43:01.000000000 +0100
++++ plplot-5.9.9/cmake/modules/lua.cmake	2012-07-20 00:11:55.295075888 +0100
+@@ -118,3 +118,11 @@
+     set(LUA_DIR ${LIB_DIR}/lua/50/plplot)
+   endif(LUA51_FOUND)
+ endif(ENABLE_lua)
++
++if(ENABLE_lua AND LUA51_FOUND)
++  pkg_check_pkgconfig(lua5.1 includedir libdir linkflags1 cflags1 version1 _LUA)
++  if(linkflags1)
++    set(LUA_INCLUDE_DIR ${includedir})
++  endif(linkflags1)
++endif(ENABLE_lua AND LUA51_FOUND)
++
diff --git a/debian/patches/series b/debian/patches/series
index a6f52f2..6a44ce0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,5 @@
 replace-deprecated-split.diff
 proper-path-handling.diff
 fix-boolean-operators.diff
+fix-cmake-ada-support.diff
+fix-lua-includes.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git