[Plplot-cvs] SF.net SVN: plplot:[12201] trunk/debian

[<and...@us...>]

Revision: 12201
          http://plplot.svn.sourceforge.net/plplot/?rev=12201&view=rev
Author:   andrewross
Date:     2012-07-19 23:26:46 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
Fix a couple of bug in Debian due to new versions of other packages.

Modified Paths:
--------------
    trunk/debian/changelog
    trunk/debian/patches/series

Added Paths:
-----------
    trunk/debian/patches/fix-cmake-ada-support.diff
    trunk/debian/patches/fix-lua-includes.diff

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2012-07-19 23:10:47 UTC (rev 12200)
+++ trunk/debian/changelog	2012-07-19 23:26:46 UTC (rev 12201)
@@ -1,9 +1,14 @@
 plplot (5.9.9-5) unstable; urgency=low
 
-  * debian/rules: Disable Ada support on armhf since gnat is not available on that
-    architecture at the moment.
+  * 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.
 
- -- Andrew Ross <and...@us...>  Thu, 05 Apr 2012 21:54:46 +0100
+ -- Andrew Ross <and...@us...>  Fri, 20 Jul 2012 00:05:51 +0100
 
 plplot (5.9.9-4) unstable; urgency=low
 

Added: trunk/debian/patches/fix-cmake-ada-support.diff
===================================================================
--- trunk/debian/patches/fix-cmake-ada-support.diff	                        (rev 0)
+++ trunk/debian/patches/fix-cmake-ada-support.diff	2012-07-19 23:26:46 UTC (rev 12201)
@@ -0,0 +1,25 @@
+Description: Fix up cmake Ada support for compatibility with cmake 2.8.9 
+Author: Andrew Ross <and...@us...>
+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)


Property changes on: trunk/debian/patches/fix-cmake-ada-support.diff
___________________________________________________________________
Added: svn:eol-style
   + native

Added: trunk/debian/patches/fix-lua-includes.diff
===================================================================
--- trunk/debian/patches/fix-lua-includes.diff	                        (rev 0)
+++ trunk/debian/patches/fix-lua-includes.diff	2012-07-19 23:26:46 UTC (rev 12201)
@@ -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 <and...@us...>
+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)
++


Property changes on: trunk/debian/patches/fix-lua-includes.diff
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2012-07-19 23:10:47 UTC (rev 12200)
+++ trunk/debian/patches/series	2012-07-19 23:26:46 UTC (rev 12201)
@@ -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

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.