Bug#684372: Freeze exception for plplot
Package: release.debian.org
Severity: normal
Please consider a release exception for the packages built from the
plplot source (plplot 5.9.9-5). These are currently in unstable. The
only differences from version 5.9.9-4 in testing are 3 bug fixes.
#680841 (serious), #683135 (normal): This FTBFS was a result of
changes in the new version of cmake which affected the ada build. Fixed
by this release.
#683878 (normal): Rebuilding with the latest gfortran closes this bug.
A further FTBFS was identified as part of the testing of the fix to
#680841 which related to cmake and lua. The patch also fixes this.
No other changes are included. A debdiff patch is attached for
reference.
Many thanks
Andrew
diff -Nru plplot-5.9.9/debian/changelog plplot-5.9.9/debian/changelog
--- plplot-5.9.9/debian/changelog 2012-04-04 21:45:15.000000000 +0100
+++ plplot-5.9.9/debian/changelog 2012-08-08 09:35:31.000000000 +0100
@@ -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@users.sourceforge.net> Wed, 08 Aug 2012 09:34:10 +0100
+
plplot (5.9.9-4) unstable; urgency=low
* debian/rules:
diff -Nru plplot-5.9.9/debian/patches/fix-cmake-ada-support.diff plplot-5.9.9/debian/patches/fix-cmake-ada-support.diff
--- plplot-5.9.9/debian/patches/fix-cmake-ada-support.diff 1970-01-01 01:00:00.000000000 +0100
+++ plplot-5.9.9/debian/patches/fix-cmake-ada-support.diff 2012-07-19 23:06:14.000000000 +0100
@@ -0,0 +1,25 @@
+Description: Fix up cmake Ada support for compatibility with cmake 2.8.9
+Author: Andrew Ross <andrewross@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 -Nru plplot-5.9.9/debian/patches/fix-lua-includes.diff plplot-5.9.9/debian/patches/fix-lua-includes.diff
--- plplot-5.9.9/debian/patches/fix-lua-includes.diff 1970-01-01 01:00:00.000000000 +0100
+++ plplot-5.9.9/debian/patches/fix-lua-includes.diff 2012-07-20 00:12:02.000000000 +0100
@@ -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@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 -Nru plplot-5.9.9/debian/patches/series plplot-5.9.9/debian/patches/series
--- plplot-5.9.9/debian/patches/series 2012-04-02 14:02:23.000000000 +0100
+++ plplot-5.9.9/debian/patches/series 2012-07-19 23:39:51.000000000 +0100
@@ -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
Reply to: