From: <and...@us...> - 2008-07-17 06:50:16
|
Revision: 8517 http://plplot.svn.sourceforge.net/plplot/?rev=8517&view=rev Author: andrewross Date: 2008-07-17 06:50:25 +0000 (Thu, 17 Jul 2008) Log Message: ----------- New Debian patch for 5.9.0 backported from svn fixes by AWI to allow plplot packages to build with cmake 2.6. Fixes Debian bug #482236. Modified Paths: -------------- trunk/debian/changelog trunk/debian/patches/00list Added Paths: ----------- trunk/debian/patches/12_cmake-2.6-fixes.dpatch Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-07-11 23:32:07 UTC (rev 8516) +++ trunk/debian/changelog 2008-07-17 06:50:25 UTC (rev 8517) @@ -3,8 +3,11 @@ * debian/rules: + Fix use of findstring in debian/rules which prevented java building on i386 (closes: #483826) + * Add dpatches + 12_cmake-2.6-fixes: Fixes build with cmake 2.6 now in sid. This + patch is taken from svn upstream. (closes: #482236) - -- Andrew Ross <and...@us...> Sun, 01 Jun 2008 22:10:34 +0100 + -- Andrew Ross <and...@us...> Wed, 16 Jul 2008 13:18:07 +0100 plplot (5.9.0-7) unstable; urgency=low Modified: trunk/debian/patches/00list =================================================================== --- trunk/debian/patches/00list 2008-07-11 23:32:07 UTC (rev 8516) +++ trunk/debian/patches/00list 2008-07-17 06:50:25 UTC (rev 8517) @@ -5,3 +5,4 @@ 09_pdftex-EC-encoding 10_print-usage-octave-3.0 11_minus-sign-manpage +12_cmake-2.6-fixes.dpatch Added: trunk/debian/patches/12_cmake-2.6-fixes.dpatch =================================================================== --- trunk/debian/patches/12_cmake-2.6-fixes.dpatch (rev 0) +++ trunk/debian/patches/12_cmake-2.6-fixes.dpatch 2008-07-17 06:50:25 UTC (rev 8517) @@ -0,0 +1,364 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 12_cmake-2.6-fixes.dpatch by <and...@us...> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix the build system to work with cmake 2.6. +## DP: This patch is extracted from the upstream SVN version of plplot. + +@DPATCH@ + +diff -ur plplot-5.9.0-orig/bindings/f95/CMakeLists.txt plplot-5.9.0/bindings/f95/CMakeLists.txt +--- plplot-5.9.0-orig/bindings/f95/CMakeLists.txt 2008-02-10 15:54:01.000000000 +0000 ++++ plplot-5.9.0/bindings/f95/CMakeLists.txt 2008-07-16 10:53:26.000000000 +0100 +@@ -141,14 +141,30 @@ + RUNTIME DESTINATION ${BIN_DIR} + ) + +-# Yuk! All Makefiles are run from the top level build directory and +-# so the f90 .mod files end up there rather than in the bindings/f95 +-# directory. Ifort and pgf90 both have a -module command line option to +-# override this location, but I'm not sure how portable that? +-install( +-FILES ${CMAKE_BINARY_DIR}/plplot.mod ${CMAKE_BINARY_DIR}/plplotp.mod ${CMAKE_BINARY_DIR}/plplot_flt.mod +-DESTINATION ${F95_MOD_DIR} +-) ++if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) ++ # Yuk! All Makefiles are run from the top level build directory and ++ # so the f90 .mod files end up there rather than in the bindings/f95 ++ # directory. Ifort and pgf90 both have a -module command line option to ++ # override this location, but I'm not sure how portable that? ++ install( ++ FILES ++ ${CMAKE_BINARY_DIR}/plplot.mod ++ ${CMAKE_BINARY_DIR}/plplotp.mod ++ ${CMAKE_BINARY_DIR}/plplot_flt.mod ++ DESTINATION ${F95_MOD_DIR} ++ ) ++else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) ++ # For the current cvs version of CMake, the module files are created by ++ # default during the library build in the more logical bindings/f95 ++ # directory. ++ install( ++ FILES ++ ${CMAKE_BINARY_DIR}/bindings/f95/plplot.mod ++ ${CMAKE_BINARY_DIR}/bindings/f95/plplotp.mod ++ ${CMAKE_BINARY_DIR}/bindings/f95/plplot_flt.mod ++ DESTINATION ${F95_MOD_DIR} ++ ) ++endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) + + # Configure pkg-config *.pc file corresponding to libplplotf95${LIB_TAG} + if(PKG_CONFIG_EXECUTABLE) +diff -ur plplot-5.9.0-orig/cmake/modules/cairo.cmake plplot-5.9.0/cmake/modules/cairo.cmake +--- plplot-5.9.0-orig/cmake/modules/cairo.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/cairo.cmake 2008-07-15 16:25:46.000000000 +0100 +@@ -97,13 +97,7 @@ + string(REGEX REPLACE ";" " " + cairo_COMPILE_FLAGS "${cflags} ${X11_COMPILE_FLAGS}" + ) +- # Convert X linker information to preferred CMake form before appending +- # it to already converted ${linkflags} +- cmake_link_flags( +- cairo_X_LINK_FLAGS +- "-L${X11_LIBRARY_DIR};${X11_LIBRARIES}" +- ) +- set(cairo_LINK_FLAGS ${linkflags} ${cairo_X_LINK_FLAGS}) ++ set(cairo_LINK_FLAGS ${linkflags} ${X11_LIBRARIES}) + else(PLD_xcairo AND X11_COMPILE_FLAGS) + message(STATUS + "WARNING: X windows not found. Setting xcairo driver to OFF." +diff -ur plplot-5.9.0-orig/cmake/modules/CMakeAdaCompiler.cmake.in plplot-5.9.0/cmake/modules/CMakeAdaCompiler.cmake.in +--- plplot-5.9.0-orig/cmake/modules/CMakeAdaCompiler.cmake.in 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/CMakeAdaCompiler.cmake.in 2008-07-15 15:47:30.000000000 +0100 +@@ -14,3 +14,4 @@ + ELSE(UNIX OR MINGW) + SET(CMAKE_Ada_OUTPUT_EXTENSION .obj) + ENDIF(UNIX OR MINGW) ++SET(CMAKE_Ada_OUTPUT_EXTENSION_REPLACE 1) +diff -ur plplot-5.9.0-orig/cmake/modules/CMakeAdaInformation.cmake plplot-5.9.0/cmake/modules/CMakeAdaInformation.cmake +--- plplot-5.9.0-orig/cmake/modules/CMakeAdaInformation.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/CMakeAdaInformation.cmake 2008-07-15 15:47:54.000000000 +0100 +@@ -41,9 +41,9 @@ + SET(CMAKE_SHARED_LIBRARY_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS}) + ENDIF(NOT CMAKE_SHARED_LIBRARY_Ada_FLAGS) + +-IF(NOT CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) ++IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) + SET(CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}) +-ENDIF(NOT CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) ++ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) + + IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG) + SET(CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG}) +@@ -53,6 +53,10 @@ + SET(CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP}) + ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP) + ++IF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG) ++ SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG}) ++ENDIF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG) ++ + # repeat for modules + IF(NOT CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS) + SET(CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS}) +@@ -70,6 +74,22 @@ + SET(CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP}) + ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP) + ++IF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG) ++ SET(CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG}) ++ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG) ++ ++IF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP) ++ SET(CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP}) ++ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP) ++ ++IF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG) ++ SET(CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG}) ++ENDIF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG) ++ ++IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH) ++ SET(CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH ${CMAKE_SHARED_LIBRARY_LINK_C_WITH_RUNTIME_PATH}) ++ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH) ++ + IF(NOT CMAKE_INCLUDE_FLAG_Ada) + SET(CMAKE_INCLUDE_FLAG_Ada ${CMAKE_INCLUDE_FLAG_C}) + ENDIF(NOT CMAKE_INCLUDE_FLAG_Ada) +@@ -85,7 +105,12 @@ + + SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.") + +-SET (CMAKE_Ada_FLAGS "$ENV{FFLAGS} ${CMAKE_Ada_FLAGS_INIT}" CACHE STRING ++SET(CMAKE_Ada_FLAGS_INIT "$ENV{FFLAGS} ${CMAKE_Ada_FLAGS_INIT}") ++# avoid just having a space as the initial value for the cache ++IF(CMAKE_Ada_FLAGS_INIT STREQUAL " ") ++ SET(CMAKE_Ada_FLAGS_INIT) ++ENDIF(CMAKE_Ada_FLAGS_INIT STREQUAL " ") ++SET (CMAKE_Ada_FLAGS "${CMAKE_Ada_FLAGS_INIT}" CACHE STRING + "Flags for Ada compiler.") + + INCLUDE(CMakeCommonLanguageInclude) +diff -ur plplot-5.9.0-orig/cmake/modules/CMakeTestAdaCompiler.cmake plplot-5.9.0/cmake/modules/CMakeTestAdaCompiler.cmake +--- plplot-5.9.0-orig/cmake/modules/CMakeTestAdaCompiler.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/CMakeTestAdaCompiler.cmake 2008-07-15 15:48:05.000000000 +0100 +@@ -17,6 +17,8 @@ + + FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CMakeLists.txt + " ++# FIXME: This specific location currently needs to be changed whenever the ++# location of the experimental Ada support files is changed. + set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) + set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL \"\" FORCE) + project(test Ada) +diff -ur plplot-5.9.0-orig/cmake/modules/pkg-config.cmake plplot-5.9.0/cmake/modules/pkg-config.cmake +--- plplot-5.9.0-orig/cmake/modules/pkg-config.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/pkg-config.cmake 2008-07-15 16:27:07.000000000 +0100 +@@ -20,10 +20,10 @@ + # Module for determining pkg-config configuration variables related to the + # install-tree build of the examples. + # Also create useful macros called pkg_check_pkgconfig to emulate the +-# pkgconfig macro using the pkg_check_modules macro, +-# cmake_to_pkg_config_link_flags to process CMake link flags into ++# pkgconfig macro using the pkg_check_modules macro; ++# pkg_config_link_flags to process CMake link flags into + # pkg-config standard form for the configured output *.pc files, and +-# pkg_config_to_cmake_link_flags to process input link flags delivered ++# cmake_link_flags to process input link flags delivered + # by pkg-config into CMake standard form. + + # The following variables are set: +@@ -155,8 +155,10 @@ + set(${_link_flags_out}) + else("${_link_flags_in}" STREQUAL ""}) + #message("(original link flags) = ${_link_flags_in}") +- # Convert link flags to a list. +- string(REGEX REPLACE " " ";" _link_flags_list "${_link_flags_in}") ++ # Convert link flags to a list. Note some link flags are blank-delimited ++ # (such as "-framework whatever") so preserve those by splitting into ++ # separate list elements only if the next element starts with a hyphen. ++ string(REGEX REPLACE " -" ";-" _link_flags_list "${_link_flags_in}") + # Extract list of directories from -L options. + list(LENGTH _link_flags_list _link_flags_length) + math(EXPR _link_flags_length "${_link_flags_length} - 1") +@@ -164,7 +166,7 @@ + set(_link_directory_list) + foreach(_list_index RANGE ${_link_flags_length}) + list(GET _link_flags_list ${_list_index} _list_element) +- string(REGEX REPLACE "^-L" "" _list_element1 ${_list_element}) ++ string(REGEX REPLACE "^-L" "" _list_element1 "${_list_element}") + if(_list_element STREQUAL "-L${_list_element1}") + list(APPEND _index_list ${_list_index}) + list(APPEND _link_directory_list ${_list_element1}) +@@ -186,7 +188,7 @@ + set(${_link_flags_out}) + foreach(_list_index RANGE ${_link_flags_length}) + list(GET _link_flags_list ${_list_index} _list_element) +- string(REGEX REPLACE "^-l" "" _list_element1 ${_list_element}) ++ string(REGEX REPLACE "^-l" "" _list_element1 "${_list_element}") + if(_list_element STREQUAL "-l${_list_element1}") + set(_library_pathname "_library_pathname-NOTFOUND") + find_library( +diff -ur plplot-5.9.0-orig/cmake/modules/tcl-related.cmake plplot-5.9.0/cmake/modules/tcl-related.cmake +--- plplot-5.9.0-orig/cmake/modules/tcl-related.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/tcl-related.cmake 2008-07-15 16:55:58.000000000 +0100 +@@ -135,12 +135,7 @@ + endif(ENABLE_tk AND NOT X11_FOUND) + if(ENABLE_tk) + set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR}) +- set( +- TK_LIBRARY +- ${TK_LIBRARY} +- -L${X11_LIBRARY_DIR} +- ${X11_LIBRARIES} +- ) ++ set(TK_LIBRARY ${TK_LIBRARY} ${X11_LIBRARIES}) + message(STATUS "TK_INCLUDE_PATH = ${TK_INCLUDE_PATH}") + message(STATUS "TK_LIBRARY = ${TK_LIBRARY}") + else(ENABLE_tk) +@@ -157,7 +152,7 @@ + message(STATUS "Looking for itk library") + set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0) + foreach(version ${itk_library_versions}) +- find_library(ITK_LIBRARY itk${version} ${TK_LIBRARY} ++ find_library(ITK_LIBRARY itk${version} + PATH_SUFFIXES itk${version}) + endforeach(version ${itk_library_versions}) + if(ITK_LIBRARY) +diff -ur plplot-5.9.0-orig/cmake/modules/wxwidgets.cmake plplot-5.9.0/cmake/modules/wxwidgets.cmake +--- plplot-5.9.0-orig/cmake/modules/wxwidgets.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/wxwidgets.cmake 2008-07-15 16:31:27.000000000 +0100 +@@ -23,8 +23,10 @@ + # PLD_wxwidgets - ON means the wxwidgets device is enabled. + # wxwidgets_COMPILE_FLAGS - individual COMPILE_FLAGS required to compile wxwidgets + # device. +-# wxwidgets_LINK_FLAGS - individual LINK_FLAGS for dynamic wxwidgets device. +-# DRIVERS_LINK_FLAGS - list of LINK_FLAGS for all static devices. ++# wxwidgets_LINK_FLAGS - list of full path names of libraries and ++# linker flags for dynamic wxwidgets device driver. ++# DRIVERS_LINK_FLAGS - list of device LINK_FLAGS for case ++# when ENABLE_DYNDRIVERS OFF. + + # Find wxWidgets needed for driver and bindings + if(PLD_wxwidgets) +@@ -39,11 +41,21 @@ + endif(PLD_wxwidgets) + + if(PLD_wxwidgets) ++ #message("wxWidgets_INCLUDE_DIRS = ${wxWidgets_INCLUDE_DIRS}") ++ #message("wxWidgets_DEFINITIONS = ${wxWidgets_DEFINITIONS}") + string(REGEX REPLACE ";" " -I" + wxwidgets_COMPILE_FLAGS +- "-I${wxWidgets_INCLUDE_DIRS} ${wxWidgets_DEFINITIONS}" ++ "-I${wxWidgets_INCLUDE_DIRS}" + ) +- set(wxwidgets_LINK_FLAGS ${wxWidgets_LIBRARIES}) ++ # For case (cvs version of CMake as of 2008-03-23, but not cmake-2.4.8) ++ # when wxWidgets_DEFINITIONS is a list. ++ string(REGEX REPLACE ";" " " ++ wxwidgets_COMPILE_FLAGS ++ ${wxwidgets_COMPILE_FLAGS} ++ " ${wxWidgets_DEFINITIONS}" ++ ) ++ # Convert wxWidgets_LIBRARIES to full pathname form. ++ cmake_link_flags(wxwidgets_LINK_FLAGS "${wxWidgets_LIBRARIES}") + if(WITH_FREETYPE) + set( + wxwidgets_COMPILE_FLAGS +diff -ur plplot-5.9.0-orig/cmake/modules/xwin.cmake plplot-5.9.0/cmake/modules/xwin.cmake +--- plplot-5.9.0-orig/cmake/modules/xwin.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/xwin.cmake 2008-07-15 16:31:23.000000000 +0100 +@@ -30,12 +30,7 @@ + if(PLD_xwin) + if(X11_FOUND) + set(xwin_COMPILE_FLAGS "${X11_COMPILE_FLAGS}") +- # N.B. X11_LIBRARY_DIR is used internally by FindX11.cmake but not +- # documented for external use so we may have to replace this +- # some day by the appropriate +- # "GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ??? PATH)" logic. +- # But this works for now.... +- set(xwin_LINK_FLAGS "-L${X11_LIBRARY_DIR} ${X11_LIBRARIES}") ++ set(xwin_LINK_FLAGS "${X11_LIBRARIES}") + option(HAVE_PTHREAD "Use pthreads with the xwin driver" OFF) + if(HAVE_PTHREAD) + find_package(Threads) +diff -ur plplot-5.9.0-orig/CMakeLists.txt plplot-5.9.0/CMakeLists.txt +--- plplot-5.9.0-orig/CMakeLists.txt 2008-02-10 15:54:06.000000000 +0000 ++++ plplot-5.9.0/CMakeLists.txt 2008-07-15 16:06:05.000000000 +0100 +@@ -21,6 +21,12 @@ + + # Version 2.4.5 or above of cmake is required! + CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR) ++# set CMake 2.6.x policy if the cmake_policy command exists, (i.e., if ++# the user is using CMake 2.6.0 or newer). ++if(COMMAND cmake_policy) ++ # empty elements are not ignored in lists. ++ cmake_policy(SET CMP0007 NEW) ++endif(COMMAND cmake_policy) + + # Recommended way to do user overrides of C-related variables, is given at + # http://public.kitware.com/pipermail/cmake/2006-July/010334.html. +diff -ur plplot-5.9.0-orig/examples/f95/CMakeLists.txt plplot-5.9.0/examples/f95/CMakeLists.txt +--- plplot-5.9.0-orig/examples/f95/CMakeLists.txt 2008-02-10 15:54:08.000000000 +0000 ++++ plplot-5.9.0/examples/f95/CMakeLists.txt 2008-07-15 16:04:44.000000000 +0100 +@@ -50,32 +50,43 @@ + + if(BUILD_TEST) + remove_definitions("-DHAVE_CONFIG_H") +- # N.B. This is required because it's the location of plplot.mod +- # generated as a by-product of building libplplotf95${LIB_TAG}. +- include_directories(${CMAKE_BINARY_DIR}) + +- # Temporary workaround for module handling bug in CMake 2.4.3. Create a +- # file with arbitrary contents called plplot.mod.proxy in top-level +- # build tree. As a temporary measure we use cmake_workaround.f as the +- # generator of this file. (cmake_workaround.f was previously compiled, +- # but that is no longer the case.) Note, once CMake is fixed this comment +- # the following configure_file command and cmake_workaround.f should all +- # just disappear. +- configure_file( +- ${CMAKE_CURRENT_SOURCE_DIR}/cmake_workaround.f +- ${CMAKE_BINARY_DIR}/plplot.mod.proxy +- COPYONLY +- ) ++ if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) ++ # Temporary workaround for module handling bug in CMake 2.4.3. Create a ++ # file with arbitrary contents called plplot.mod.proxy in top-level ++ # build tree. As a temporary measure we use cmake_workaround.f as the ++ # generator of this file. (cmake_workaround.f was previously compiled, ++ # but that is no longer the case.) Note, once CMake is fixed this comment ++ # the following configure_file command and cmake_workaround.f should all ++ # just disappear. ++ configure_file( ++ ${CMAKE_CURRENT_SOURCE_DIR}/cmake_workaround.f ++ ${CMAKE_BINARY_DIR}/plplot.mod.proxy ++ COPYONLY ++ ) ++ # The generated module location for 2.4.x CMake is the top-level build ++ # tree. ++ include_directories(${CMAKE_BINARY_DIR}) ++ else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) ++ # The generated module location for cvs CMake is the build-tree ++ # location where the corresponding library is generated. ++ include_directories(${CMAKE_BINARY_DIR}/bindings/f95) ++ endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) + endif(BUILD_TEST) + foreach(STRING_INDEX ${f95_STRING_INDICES}) + set(f95_SRCS ${f95_SRCS} x${STRING_INDEX}f.f90) + if(BUILD_TEST) +- add_executable(x${STRING_INDEX}f x${STRING_INDEX}f.f90) +- target_link_libraries(x${STRING_INDEX}f plplotf95${LIB_TAG}) ++ # Need unique target name ++ add_executable(x${STRING_INDEX}f95 x${STRING_INDEX}f.f90) ++ set_target_properties( ++ x${STRING_INDEX}f95 PROPERTIES ++ OUTPUT_NAME x${STRING_INDEX}f ++ ) ++ target_link_libraries(x${STRING_INDEX}f95 plplotf95${LIB_TAG}) + endif(BUILD_TEST) + endforeach(STRING_INDEX ${f95_STRING_INDICES}) + +-install(FILES ${f95_SRCS} ++install(FILES ${f95_SRCS} + DESTINATION ${DATA_DIR}/examples/f95 + ) + Property changes on: trunk/debian/patches/12_cmake-2.6-fixes.dpatch ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-07-17 10:10:32
|
Revision: 8519 http://plplot.svn.sourceforge.net/plplot/?rev=8519&view=rev Author: rlaboiss Date: 2008-07-17 10:10:26 +0000 (Thu, 17 Jul 2008) Log Message: ----------- Bump Standards-Version to 3.8.0 Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-07-17 06:52:50 UTC (rev 8518) +++ trunk/debian/changelog 2008-07-17 10:10:26 UTC (rev 8519) @@ -1,14 +1,18 @@ -plplot (5.9.0-8) unreleased; urgency=low +plplot (5.9.0-8) UNRELEASED; urgency=low + [ Andrew Ross ] * debian/rules: + Fix use of findstring in debian/rules which prevented java building on i386 (closes: #483826) - * Add dpatches + * Add dpatches 12_cmake-2.6-fixes: Fixes build with cmake 2.6 now in sid. This patch is taken from svn upstream. (closes: #482236) - -- Andrew Ross <and...@us...> Wed, 16 Jul 2008 13:18:07 +0100 + [ Rafael Laboissiere ] + * debian/control.in: Bump Standards-Version to 3.8.0 (no changes needed) + -- Rafael Laboissiere <ra...@de...> Thu, 17 Jul 2008 12:08:51 +0200 + plplot (5.9.0-7) unstable; urgency=low * debian/control.in, debian/rules: Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2008-07-17 06:52:50 UTC (rev 8518) +++ trunk/debian/control.in 2008-07-17 10:10:26 UTC (rev 8519) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Andrew Ross <and...@us...> Uploaders: Rafael Laboissiere <ra...@de...> -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), g++-4.1 [arm], tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-09-05 20:01:04
|
Revision: 8751 http://plplot.svn.sourceforge.net/plplot/?rev=8751&view=rev Author: rlaboiss Date: 2008-09-05 20:01:13 +0000 (Fri, 05 Sep 2008) Log Message: ----------- Switch from dpatch to quilt Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in trunk/debian/rules Added Paths: ----------- trunk/debian/patches/02_unset-python-path.diff trunk/debian/patches/04_use-mkoctfile.diff trunk/debian/patches/07_octave_prune_examples.diff trunk/debian/patches/09_pdftex-EC-encoding.diff trunk/debian/patches/10_print-usage-octave-3.0.diff trunk/debian/patches/11_minus-sign-manpage.diff trunk/debian/patches/12_cmake-2.6-fixes.diff trunk/debian/patches/series Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-09-05 10:11:15 UTC (rev 8750) +++ trunk/debian/changelog 2008-09-05 20:01:13 UTC (rev 8751) @@ -1,3 +1,9 @@ +plplot (5.9.0-9) UNRELEASED; urgency=low + + * Switch from dpatch to quilt + + -- Rafael Laboissiere <ra...@de...> Fri, 05 Sep 2008 19:50:35 +0200 + plplot (5.9.0-8) unstable; urgency=low [ Andrew Ross ] Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2008-09-05 10:11:15 UTC (rev 8750) +++ trunk/debian/control.in 2008-09-05 20:01:13 UTC (rev 8751) @@ -10,7 +10,7 @@ libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, libgnomeprintui2.2-dev, libgnomeui-dev, m4, libqhull-dev (>= 2003.1-8), libxml-parser-perl, libxml-dom-perl, - libltdl3-dev, pkg-config, dpatch, slice, + libltdl3-dev, pkg-config, quilt, slice, python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk-builddep [!alpha !arm !hppa !hurd-i386], Added: trunk/debian/patches/02_unset-python-path.diff =================================================================== --- trunk/debian/patches/02_unset-python-path.diff (rev 0) +++ trunk/debian/patches/02_unset-python-path.diff 2008-09-05 20:01:13 UTC (rev 8751) @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_unset-python-path.dpatch by <and...@us...> +## +## DP: No need to explicitly set python path with debian since the +## DP: default path is correct. This ensure the examples work with +## DP: multiple version of python. + +@DPATCH@ + +--- plplot/examples/python/CMakeLists.txt.old ++++ plplot/examples/python/CMakeLists.txt +@@ -147,7 +147,7 @@ + @ONLY + ) + +-set(python_location1 ${PYTHON_INSTDIR}) ++set(python_location1) + set(python_location2) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake Property changes on: trunk/debian/patches/02_unset-python-path.diff ___________________________________________________________________ Added: svn:executable + * Added: trunk/debian/patches/04_use-mkoctfile.diff =================================================================== --- trunk/debian/patches/04_use-mkoctfile.diff (rev 0) +++ trunk/debian/patches/04_use-mkoctfile.diff 2008-09-05 20:01:13 UTC (rev 8751) @@ -0,0 +1,114 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_use-mkoctfile.dpatch by Rafael Laboissiere <ra...@de...> +## +## DP: Build plplot_octave.oct using mkoctfile and not as a shared library + +@DPATCH@ + +--- plplot-5.8.0~RC1.orig/bindings/octave/CMakeLists.txt ++++ plplot-5.8.0~RC1/bindings/octave/CMakeLists.txt +@@ -133,64 +133,34 @@ + ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h + ) + +-# Build octave interface. +-set(octave_interface_INCLUDE_PATHS +-${CMAKE_SOURCE_DIR}/include +-${CMAKE_BINARY_DIR} +-${CMAKE_BINARY_DIR}/include +-${CMAKE_CURRENT_SOURCE_DIR} +-${CMAKE_CURRENT_BINARY_DIR} +-${OCTAVE_INCLUDE_PATH} +-) +-include_directories(${octave_interface_INCLUDE_PATHS}) +- +-add_library(plplot_octave MODULE ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc) +-target_link_libraries( +-plplot_octave +-plplot${LIB_TAG} +-"${OCTAVE_LIBRARIES}" +-"${OCTINTERP_LIBRARIES}" +-) +- +-if(USE_RPATH) +- get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH) +- # (Reasonable) assumption here is that OCTAVE_LIBRARIES and +- # OCTINTERP_LIBRARIES have the same path. +- get_filename_component(OCTAVE_INSTALL_RPATH "${OCTAVE_LIBRARIES}" PATH) +- set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${OCTAVE_INSTALL_RPATH}) +- set_target_properties( +- plplot_octave +- PROPERTIES +- PREFIX "" +- SUFFIX ".oct" +- INSTALL_RPATH "${LIB_INSTALL_RPATH}" +- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}" +- ) +-else(USE_RPATH) +- set_target_properties( +- plplot_octave +- PROPERTIES +- PREFIX "" +- SUFFIX ".oct" +- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}" +- ) +-endif(USE_RPATH) +- + # Have to be specific about permissions for some reason (probably oct suffix). + set(PERM_MODULES + OWNER_READ + OWNER_WRITE + OWNER_EXECUTE + GROUP_READ + GROUP_EXECUTE + WORLD_READ + WORLD_EXECUTE + ) + ++add_custom_command( ++OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct ++DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc ++COMMAND ${MKOCTFILE} ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc ++-I${CMAKE_CURRENT_BINARY_DIR} -I${CMAKE_SOURCE_DIR}/bindings/octave ++-I${CMAKE_SOURCE_DIR}/include --strip ++-L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ++) ++ ++add_custom_target( ++plplot_octave_oct_file ALL ++DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct ++) ++ + install( +-TARGETS +-plplot_octave +-LIBRARY ++FILES ++${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct + DESTINATION ${OCTAVE_OCT_DIR} + PERMISSIONS ${PERM_MODULES} + ) +@@ -238,23 +208,4 @@ + DESTINATION ${PLPLOT_OCTAVE_DIR} + ) + +-if(never) +-add_custom_command( +-OUTPUT +-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct +-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o +-COMMAND +-touch +-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct +-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o +-DEPENDS +-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc +-) +- +-# Link octave interface. +-add_custom_target( +-plplot_octave-libdir.oct ALL +-DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o +-) +-endif(never) + endif(ENABLE_octave) Property changes on: trunk/debian/patches/04_use-mkoctfile.diff ___________________________________________________________________ Added: svn:executable + * Added: trunk/debian/patches/07_octave_prune_examples.diff =================================================================== --- trunk/debian/patches/07_octave_prune_examples.diff (rev 0) +++ trunk/debian/patches/07_octave_prune_examples.diff 2008-09-05 20:01:13 UTC (rev 8751) @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 07_octave_prune_examples.dpatch by Andrew Ross <and...@us...> +## +## DP: Don't run example p7 as part of ctest. It does not work well with postscript +## DP: and also fails on the alpha architecure, for reasons as yet unknown. + +@DPATCH@ + +--- plplot-5.8.0.orig/test/test_octave.sh.in 2007-10-16 07:57:38.000000000 +0100 ++++ plplot-5.8.0/test/test_octave.sh.in 2007-12-07 15:02:43.000000000 +0000 +@@ -45,7 +45,7 @@ + # These require octave-2.1.50 so comment out since not everybody has + # this. + +-for i=[1:7 8 9 13 15 16]; ++for i=[1:6 8 9 13 15 16]; + figure(i,"$device",sprintf("${OUTPUT_DIR}/p%d.$dsuffix",i)); + feval(sprintf("p%d",i)) + closefig + Property changes on: trunk/debian/patches/07_octave_prune_examples.diff ___________________________________________________________________ Added: svn:executable + * Added: trunk/debian/patches/09_pdftex-EC-encoding.diff =================================================================== --- trunk/debian/patches/09_pdftex-EC-encoding.diff (rev 0) +++ trunk/debian/patches/09_pdftex-EC-encoding.diff 2008-09-05 20:01:13 UTC (rev 8751) @@ -0,0 +1,69 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 09_pdftex-EC-encoding by Rafael Laboissiere <ra...@de...> +## +## DP: Use ec.enc file instead of EC.enc, which does not exist in Debian + +@DPATCH@ + +--- plplot-5.8.0.orig/doc/docbook/src/pdftex.map ++++ plplot-5.8.0/doc/docbook/src/pdftex.map +@@ -1,31 +1,31 @@ +-cmr10 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb ++cmr10 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb + cmmi10 <cmmi10.pfb + cmsy10 <cmsy10.pfb + cmsy9 <cmsy9.pfb +-ectt0800 "ECEncoding ReEncodeFont"<EC.enc <cmtt8.pfb +-ecit0900 "0.9 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmitt10.pfb +-ecit1000 "ECEncoding ReEncodeFont"<EC.enc <cmitt10.pfb +-tcrm0800 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb +-ecrm0600 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb +-ectt0900 "ECEncoding ReEncodeFont"<EC.enc <cmtt9.pfb +-ecti1000 "ECEncoding ReEncodeFont"<EC.enc <cmti10.pfb +-ecbx1000 "ECEncoding ReEncodeFont"<EC.enc <cmbx10.pfb +-ecrb1000 "ECEncoding ReEncodeFont"<EC.enc <cmbx10.pfb +-ecrm0800 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb +-ecti0800 "ECEncoding ReEncodeFont"<EC.enc <cmti8.pfb +-tcrm1000 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb +-ecrm1000 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb +-ecrm0900 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb +-ecsx1000 "ECEncoding ReEncodeFont"<EC.enc <cmssbx10.pfb +-ecss1000 "ECEncoding ReEncodeFont"<EC.enc <cmssbx10.pfb +-ecsx1200 "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb +-ecss1200 "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb +-ecsx1440 "1.2 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb +-ecss1440 "1.2 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb +-ecsx1728 "1.44 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb +-ecss1728 "1.44 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb +-ecsx2074 "1.0165 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb +-ecss2074 "1.0165 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb +-ecsx2488 "1.4635 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb +-ecss2488 "1.4635 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb +-ectt1095 "1.095 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmtt10.pfb ++ectt0800 "ecEncoding ReEncodeFont"<ec.enc <cmtt8.pfb ++ecit0900 "0.9 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmitt10.pfb ++ecit1000 "ecEncoding ReEncodeFont"<ec.enc <cmitt10.pfb ++tcrm0800 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb ++ecrm0600 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb ++ectt0900 "ecEncoding ReEncodeFont"<ec.enc <cmtt9.pfb ++ecti1000 "ecEncoding ReEncodeFont"<ec.enc <cmti10.pfb ++ecbx1000 "ecEncoding ReEncodeFont"<ec.enc <cmbx10.pfb ++ecrb1000 "ecEncoding ReEncodeFont"<ec.enc <cmbx10.pfb ++ecrm0800 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb ++ecti0800 "ecEncoding ReEncodeFont"<ec.enc <cmti8.pfb ++tcrm1000 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb ++ecrm1000 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb ++ecrm0900 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb ++ecsx1000 "ecEncoding ReEncodeFont"<ec.enc <cmssbx10.pfb ++ecss1000 "ecEncoding ReEncodeFont"<ec.enc <cmssbx10.pfb ++ecsx1200 "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb ++ecss1200 "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb ++ecsx1440 "1.2 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb ++ecss1440 "1.2 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb ++ecsx1728 "1.44 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb ++ecss1728 "1.44 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb ++ecsx2074 "1.0165 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb ++ecss2074 "1.0165 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb ++ecsx2488 "1.4635 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb ++ecss2488 "1.4635 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb ++ectt1095 "1.095 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmtt10.pfb Property changes on: trunk/debian/patches/09_pdftex-EC-encoding.diff ___________________________________________________________________ Added: svn:executable + * Added: trunk/debian/patches/10_print-usage-octave-3.0.diff =================================================================== --- trunk/debian/patches/10_print-usage-octave-3.0.diff (rev 0) +++ trunk/debian/patches/10_print-usage-octave-3.0.diff 2008-09-05 20:01:13 UTC (rev 8751) @@ -0,0 +1,38 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_print-usage-octave-3.0.dpatch by Rafael Laboissiere <ra...@de...> +## +## DP: Use correct call to print_usage in wrap_octave.pl when compiling +## DP: against octave3.0 + +@DPATCH@ + +--- plplot-5.9.0.orig/bindings/octave/matwrap/wrap_octave.pl ++++ plplot-5.9.0/bindings/octave/matwrap/wrap_octave.pl +@@ -10,7 +10,7 @@ + # Copyright (c) 1997 Gary R. Holt. This is distributed under the terms of the + # perl artistic license (http://language.perl.com/misc/Artistic.html). + # +-# Modifications 2007 Andrew Ross ++# Modifications 2007 Andrew Ross + # This version contains three local fixes for plplot + # 1) Change _dim function to allow a zero length array (required by plstyl) + # 2) Alter string to std::string for compatibility with gcc3.2 and later +@@ -18,6 +18,9 @@ + # from v2.1 to v2.9. This requires a file octave_version.pl which defines + # the variable octave_version. + # ++# Modifications 2008 Rafael Laboissiere ++# Change 3) above is adapted for Octave v3.0 ++ + + package octave; # Everything should be in this package. + +@@ -158,7 +161,7 @@ + # Permissible not to specify output args + # if there is only one. + @ver = split(/\./,$octave_version); +- if ($ver[0] >= 2 && $ver[1] >= 9) { ++ if ($ver[0] >= 3 || ($ver[0] >= 2 && $ver[1] >= 9)) { + $retstr .= (")\n" . + " {\n" . + " print_usage();\n" . # Give an error. Property changes on: trunk/debian/patches/10_print-usage-octave-3.0.diff ___________________________________________________________________ Added: svn:executable + * Added: trunk/debian/patches/11_minus-sign-manpage.diff =================================================================== --- trunk/debian/patches/11_minus-sign-manpage.diff (rev 0) +++ trunk/debian/patches/11_minus-sign-manpage.diff 2008-09-05 20:01:13 UTC (rev 8751) @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_minus-sign-manpage.dpatch by Rafael Laboissiere <ra...@de...> +## +## DP: Escape "-" signs that mean the "minus" character + +@DPATCH@ + +--- plplot-5.9.0.orig/doc/plserver.1 ++++ plplot-5.9.0/doc/plserver.1 +@@ -14,10 +14,10 @@ + is just a front-end to the pltkMain() function. Structured along the + preferred lines for extended wish'es. It typically runs as a child + process from the PLplot TK driver to render output. Can use either TK +-send or Tcl-DP RPC for communication, depending on how it is invoked. ++send or Tcl\-DP RPC for communication, depending on how it is invoked. + .PP + Note that plserver can be used the same way as wish or dpwish, as it +-contains the functionality of each of these (except the -notk Tcl-DP ++contains the functionality of each of these (except the \-notk Tcl-DP + command-line option is not supported). + .SH "SEE ALSO" + See /usr/share/doc/plplot/plplot.ps.gz for more details. Property changes on: trunk/debian/patches/11_minus-sign-manpage.diff ___________________________________________________________________ Added: svn:executable + * Added: trunk/debian/patches/12_cmake-2.6-fixes.diff =================================================================== --- trunk/debian/patches/12_cmake-2.6-fixes.diff (rev 0) +++ trunk/debian/patches/12_cmake-2.6-fixes.diff 2008-09-05 20:01:13 UTC (rev 8751) @@ -0,0 +1,364 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 12_cmake-2.6-fixes.dpatch by <and...@us...> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix the build system to work with cmake 2.6. +## DP: This patch is extracted from the upstream SVN version of plplot. + +@DPATCH@ + +diff -ur plplot-5.9.0-orig/bindings/f95/CMakeLists.txt plplot-5.9.0/bindings/f95/CMakeLists.txt +--- plplot-5.9.0-orig/bindings/f95/CMakeLists.txt 2008-02-10 15:54:01.000000000 +0000 ++++ plplot-5.9.0/bindings/f95/CMakeLists.txt 2008-07-16 10:53:26.000000000 +0100 +@@ -141,14 +141,30 @@ + RUNTIME DESTINATION ${BIN_DIR} + ) + +-# Yuk! All Makefiles are run from the top level build directory and +-# so the f90 .mod files end up there rather than in the bindings/f95 +-# directory. Ifort and pgf90 both have a -module command line option to +-# override this location, but I'm not sure how portable that? +-install( +-FILES ${CMAKE_BINARY_DIR}/plplot.mod ${CMAKE_BINARY_DIR}/plplotp.mod ${CMAKE_BINARY_DIR}/plplot_flt.mod +-DESTINATION ${F95_MOD_DIR} +-) ++if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) ++ # Yuk! All Makefiles are run from the top level build directory and ++ # so the f90 .mod files end up there rather than in the bindings/f95 ++ # directory. Ifort and pgf90 both have a -module command line option to ++ # override this location, but I'm not sure how portable that? ++ install( ++ FILES ++ ${CMAKE_BINARY_DIR}/plplot.mod ++ ${CMAKE_BINARY_DIR}/plplotp.mod ++ ${CMAKE_BINARY_DIR}/plplot_flt.mod ++ DESTINATION ${F95_MOD_DIR} ++ ) ++else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) ++ # For the current cvs version of CMake, the module files are created by ++ # default during the library build in the more logical bindings/f95 ++ # directory. ++ install( ++ FILES ++ ${CMAKE_BINARY_DIR}/bindings/f95/plplot.mod ++ ${CMAKE_BINARY_DIR}/bindings/f95/plplotp.mod ++ ${CMAKE_BINARY_DIR}/bindings/f95/plplot_flt.mod ++ DESTINATION ${F95_MOD_DIR} ++ ) ++endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) + + # Configure pkg-config *.pc file corresponding to libplplotf95${LIB_TAG} + if(PKG_CONFIG_EXECUTABLE) +diff -ur plplot-5.9.0-orig/cmake/modules/cairo.cmake plplot-5.9.0/cmake/modules/cairo.cmake +--- plplot-5.9.0-orig/cmake/modules/cairo.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/cairo.cmake 2008-07-15 16:25:46.000000000 +0100 +@@ -97,13 +97,7 @@ + string(REGEX REPLACE ";" " " + cairo_COMPILE_FLAGS "${cflags} ${X11_COMPILE_FLAGS}" + ) +- # Convert X linker information to preferred CMake form before appending +- # it to already converted ${linkflags} +- cmake_link_flags( +- cairo_X_LINK_FLAGS +- "-L${X11_LIBRARY_DIR};${X11_LIBRARIES}" +- ) +- set(cairo_LINK_FLAGS ${linkflags} ${cairo_X_LINK_FLAGS}) ++ set(cairo_LINK_FLAGS ${linkflags} ${X11_LIBRARIES}) + else(PLD_xcairo AND X11_COMPILE_FLAGS) + message(STATUS + "WARNING: X windows not found. Setting xcairo driver to OFF." +diff -ur plplot-5.9.0-orig/cmake/modules/CMakeAdaCompiler.cmake.in plplot-5.9.0/cmake/modules/CMakeAdaCompiler.cmake.in +--- plplot-5.9.0-orig/cmake/modules/CMakeAdaCompiler.cmake.in 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/CMakeAdaCompiler.cmake.in 2008-07-15 15:47:30.000000000 +0100 +@@ -14,3 +14,4 @@ + ELSE(UNIX OR MINGW) + SET(CMAKE_Ada_OUTPUT_EXTENSION .obj) + ENDIF(UNIX OR MINGW) ++SET(CMAKE_Ada_OUTPUT_EXTENSION_REPLACE 1) +diff -ur plplot-5.9.0-orig/cmake/modules/CMakeAdaInformation.cmake plplot-5.9.0/cmake/modules/CMakeAdaInformation.cmake +--- plplot-5.9.0-orig/cmake/modules/CMakeAdaInformation.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/CMakeAdaInformation.cmake 2008-07-15 15:47:54.000000000 +0100 +@@ -41,9 +41,9 @@ + SET(CMAKE_SHARED_LIBRARY_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS}) + ENDIF(NOT CMAKE_SHARED_LIBRARY_Ada_FLAGS) + +-IF(NOT CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) ++IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) + SET(CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}) +-ENDIF(NOT CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) ++ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) + + IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG) + SET(CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG}) +@@ -53,6 +53,10 @@ + SET(CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP}) + ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP) + ++IF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG) ++ SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG}) ++ENDIF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG) ++ + # repeat for modules + IF(NOT CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS) + SET(CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS}) +@@ -70,6 +74,22 @@ + SET(CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP}) + ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP) + ++IF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG) ++ SET(CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG}) ++ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG) ++ ++IF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP) ++ SET(CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP}) ++ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP) ++ ++IF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG) ++ SET(CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG}) ++ENDIF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG) ++ ++IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH) ++ SET(CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH ${CMAKE_SHARED_LIBRARY_LINK_C_WITH_RUNTIME_PATH}) ++ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH) ++ + IF(NOT CMAKE_INCLUDE_FLAG_Ada) + SET(CMAKE_INCLUDE_FLAG_Ada ${CMAKE_INCLUDE_FLAG_C}) + ENDIF(NOT CMAKE_INCLUDE_FLAG_Ada) +@@ -85,7 +105,12 @@ + + SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.") + +-SET (CMAKE_Ada_FLAGS "$ENV{FFLAGS} ${CMAKE_Ada_FLAGS_INIT}" CACHE STRING ++SET(CMAKE_Ada_FLAGS_INIT "$ENV{FFLAGS} ${CMAKE_Ada_FLAGS_INIT}") ++# avoid just having a space as the initial value for the cache ++IF(CMAKE_Ada_FLAGS_INIT STREQUAL " ") ++ SET(CMAKE_Ada_FLAGS_INIT) ++ENDIF(CMAKE_Ada_FLAGS_INIT STREQUAL " ") ++SET (CMAKE_Ada_FLAGS "${CMAKE_Ada_FLAGS_INIT}" CACHE STRING + "Flags for Ada compiler.") + + INCLUDE(CMakeCommonLanguageInclude) +diff -ur plplot-5.9.0-orig/cmake/modules/CMakeTestAdaCompiler.cmake plplot-5.9.0/cmake/modules/CMakeTestAdaCompiler.cmake +--- plplot-5.9.0-orig/cmake/modules/CMakeTestAdaCompiler.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/CMakeTestAdaCompiler.cmake 2008-07-15 15:48:05.000000000 +0100 +@@ -17,6 +17,8 @@ + + FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CMakeLists.txt + " ++# FIXME: This specific location currently needs to be changed whenever the ++# location of the experimental Ada support files is changed. + set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) + set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL \"\" FORCE) + project(test Ada) +diff -ur plplot-5.9.0-orig/cmake/modules/pkg-config.cmake plplot-5.9.0/cmake/modules/pkg-config.cmake +--- plplot-5.9.0-orig/cmake/modules/pkg-config.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/pkg-config.cmake 2008-07-15 16:27:07.000000000 +0100 +@@ -20,10 +20,10 @@ + # Module for determining pkg-config configuration variables related to the + # install-tree build of the examples. + # Also create useful macros called pkg_check_pkgconfig to emulate the +-# pkgconfig macro using the pkg_check_modules macro, +-# cmake_to_pkg_config_link_flags to process CMake link flags into ++# pkgconfig macro using the pkg_check_modules macro; ++# pkg_config_link_flags to process CMake link flags into + # pkg-config standard form for the configured output *.pc files, and +-# pkg_config_to_cmake_link_flags to process input link flags delivered ++# cmake_link_flags to process input link flags delivered + # by pkg-config into CMake standard form. + + # The following variables are set: +@@ -155,8 +155,10 @@ + set(${_link_flags_out}) + else("${_link_flags_in}" STREQUAL ""}) + #message("(original link flags) = ${_link_flags_in}") +- # Convert link flags to a list. +- string(REGEX REPLACE " " ";" _link_flags_list "${_link_flags_in}") ++ # Convert link flags to a list. Note some link flags are blank-delimited ++ # (such as "-framework whatever") so preserve those by splitting into ++ # separate list elements only if the next element starts with a hyphen. ++ string(REGEX REPLACE " -" ";-" _link_flags_list "${_link_flags_in}") + # Extract list of directories from -L options. + list(LENGTH _link_flags_list _link_flags_length) + math(EXPR _link_flags_length "${_link_flags_length} - 1") +@@ -164,7 +166,7 @@ + set(_link_directory_list) + foreach(_list_index RANGE ${_link_flags_length}) + list(GET _link_flags_list ${_list_index} _list_element) +- string(REGEX REPLACE "^-L" "" _list_element1 ${_list_element}) ++ string(REGEX REPLACE "^-L" "" _list_element1 "${_list_element}") + if(_list_element STREQUAL "-L${_list_element1}") + list(APPEND _index_list ${_list_index}) + list(APPEND _link_directory_list ${_list_element1}) +@@ -186,7 +188,7 @@ + set(${_link_flags_out}) + foreach(_list_index RANGE ${_link_flags_length}) + list(GET _link_flags_list ${_list_index} _list_element) +- string(REGEX REPLACE "^-l" "" _list_element1 ${_list_element}) ++ string(REGEX REPLACE "^-l" "" _list_element1 "${_list_element}") + if(_list_element STREQUAL "-l${_list_element1}") + set(_library_pathname "_library_pathname-NOTFOUND") + find_library( +diff -ur plplot-5.9.0-orig/cmake/modules/tcl-related.cmake plplot-5.9.0/cmake/modules/tcl-related.cmake +--- plplot-5.9.0-orig/cmake/modules/tcl-related.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/tcl-related.cmake 2008-07-15 16:55:58.000000000 +0100 +@@ -135,12 +135,7 @@ + endif(ENABLE_tk AND NOT X11_FOUND) + if(ENABLE_tk) + set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR}) +- set( +- TK_LIBRARY +- ${TK_LIBRARY} +- -L${X11_LIBRARY_DIR} +- ${X11_LIBRARIES} +- ) ++ set(TK_LIBRARY ${TK_LIBRARY} ${X11_LIBRARIES}) + message(STATUS "TK_INCLUDE_PATH = ${TK_INCLUDE_PATH}") + message(STATUS "TK_LIBRARY = ${TK_LIBRARY}") + else(ENABLE_tk) +@@ -157,7 +152,7 @@ + message(STATUS "Looking for itk library") + set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0) + foreach(version ${itk_library_versions}) +- find_library(ITK_LIBRARY itk${version} ${TK_LIBRARY} ++ find_library(ITK_LIBRARY itk${version} + PATH_SUFFIXES itk${version}) + endforeach(version ${itk_library_versions}) + if(ITK_LIBRARY) +diff -ur plplot-5.9.0-orig/cmake/modules/wxwidgets.cmake plplot-5.9.0/cmake/modules/wxwidgets.cmake +--- plplot-5.9.0-orig/cmake/modules/wxwidgets.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/wxwidgets.cmake 2008-07-15 16:31:27.000000000 +0100 +@@ -23,8 +23,10 @@ + # PLD_wxwidgets - ON means the wxwidgets device is enabled. + # wxwidgets_COMPILE_FLAGS - individual COMPILE_FLAGS required to compile wxwidgets + # device. +-# wxwidgets_LINK_FLAGS - individual LINK_FLAGS for dynamic wxwidgets device. +-# DRIVERS_LINK_FLAGS - list of LINK_FLAGS for all static devices. ++# wxwidgets_LINK_FLAGS - list of full path names of libraries and ++# linker flags for dynamic wxwidgets device driver. ++# DRIVERS_LINK_FLAGS - list of device LINK_FLAGS for case ++# when ENABLE_DYNDRIVERS OFF. + + # Find wxWidgets needed for driver and bindings + if(PLD_wxwidgets) +@@ -39,11 +41,21 @@ + endif(PLD_wxwidgets) + + if(PLD_wxwidgets) ++ #message("wxWidgets_INCLUDE_DIRS = ${wxWidgets_INCLUDE_DIRS}") ++ #message("wxWidgets_DEFINITIONS = ${wxWidgets_DEFINITIONS}") + string(REGEX REPLACE ";" " -I" + wxwidgets_COMPILE_FLAGS +- "-I${wxWidgets_INCLUDE_DIRS} ${wxWidgets_DEFINITIONS}" ++ "-I${wxWidgets_INCLUDE_DIRS}" + ) +- set(wxwidgets_LINK_FLAGS ${wxWidgets_LIBRARIES}) ++ # For case (cvs version of CMake as of 2008-03-23, but not cmake-2.4.8) ++ # when wxWidgets_DEFINITIONS is a list. ++ string(REGEX REPLACE ";" " " ++ wxwidgets_COMPILE_FLAGS ++ ${wxwidgets_COMPILE_FLAGS} ++ " ${wxWidgets_DEFINITIONS}" ++ ) ++ # Convert wxWidgets_LIBRARIES to full pathname form. ++ cmake_link_flags(wxwidgets_LINK_FLAGS "${wxWidgets_LIBRARIES}") + if(WITH_FREETYPE) + set( + wxwidgets_COMPILE_FLAGS +diff -ur plplot-5.9.0-orig/cmake/modules/xwin.cmake plplot-5.9.0/cmake/modules/xwin.cmake +--- plplot-5.9.0-orig/cmake/modules/xwin.cmake 2008-02-10 15:53:59.000000000 +0000 ++++ plplot-5.9.0/cmake/modules/xwin.cmake 2008-07-15 16:31:23.000000000 +0100 +@@ -30,12 +30,7 @@ + if(PLD_xwin) + if(X11_FOUND) + set(xwin_COMPILE_FLAGS "${X11_COMPILE_FLAGS}") +- # N.B. X11_LIBRARY_DIR is used internally by FindX11.cmake but not +- # documented for external use so we may have to replace this +- # some day by the appropriate +- # "GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ??? PATH)" logic. +- # But this works for now.... +- set(xwin_LINK_FLAGS "-L${X11_LIBRARY_DIR} ${X11_LIBRARIES}") ++ set(xwin_LINK_FLAGS "${X11_LIBRARIES}") + option(HAVE_PTHREAD "Use pthreads with the xwin driver" OFF) + if(HAVE_PTHREAD) + find_package(Threads) +diff -ur plplot-5.9.0-orig/CMakeLists.txt plplot-5.9.0/CMakeLists.txt +--- plplot-5.9.0-orig/CMakeLists.txt 2008-02-10 15:54:06.000000000 +0000 ++++ plplot-5.9.0/CMakeLists.txt 2008-07-15 16:06:05.000000000 +0100 +@@ -21,6 +21,12 @@ + + # Version 2.4.5 or above of cmake is required! + CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR) ++# set CMake 2.6.x policy if the cmake_policy command exists, (i.e., if ++# the user is using CMake 2.6.0 or newer). ++if(COMMAND cmake_policy) ++ # empty elements are not ignored in lists. ++ cmake_policy(SET CMP0007 NEW) ++endif(COMMAND cmake_policy) + + # Recommended way to do user overrides of C-related variables, is given at + # http://public.kitware.com/pipermail/cmake/2006-July/010334.html. +diff -ur plplot-5.9.0-orig/examples/f95/CMakeLists.txt plplot-5.9.0/examples/f95/CMakeLists.txt +--- plplot-5.9.0-orig/examples/f95/CMakeLists.txt 2008-02-10 15:54:08.000000000 +0000 ++++ plplot-5.9.0/examples/f95/CMakeLists.txt 2008-07-15 16:04:44.000000000 +0100 +@@ -50,32 +50,43 @@ + + if(BUILD_TEST) + remove_definitions("-DHAVE_CONFIG_H") +- # N.B. This is required because it's the location of plplot.mod +- # generated as a by-product of building libplplotf95${LIB_TAG}. +- include_directories(${CMAKE_BINARY_DIR}) + +- # Temporary workaround for module handling bug in CMake 2.4.3. Create a +- # file with arbitrary contents called plplot.mod.proxy in top-level +- # build tree. As a temporary measure we use cmake_workaround.f as the +- # generator of this file. (cmake_workaround.f was previously compiled, +- # but that is no longer the case.) Note, once CMake is fixed this comment +- # the following configure_file command and cmake_workaround.f should all +- # just disappear. +- configure_file( +- ${CMAKE_CURRENT_SOURCE_DIR}/cmake_workaround.f +- ${CMAKE_BINARY_DIR}/plplot.mod.proxy +- COPYONLY +- ) ++ if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) ++ # Temporary workaround for module handling bug in CMake 2.4.3. Create a ++ # file with arbitrary contents called plplot.mod.proxy in top-level ++ # build tree. As a temporary measure we use cmake_workaround.f as the ++ # generator of this file. (cmake_workaround.f was previously compiled, ++ # but that is no longer the case.) Note, once CMake is fixed this comment ++ # the following configure_file command and cmake_workaround.f should all ++ # just disappear. ++ configure_file( ++ ${CMAKE_CURRENT_SOURCE_DIR}/cmake_workaround.f ++ ${CMAKE_BINARY_DIR}/plplot.mod.proxy ++ COPYONLY ++ ) ++ # The generated module location for 2.4.x CMake is the top-level build ++ # tree. ++ include_directories(${CMAKE_BINARY_DIR}) ++ else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) ++ # The generated module location for cvs CMake is the build-tree ++ # location where the corresponding library is generated. ++ include_directories(${CMAKE_BINARY_DIR}/bindings/f95) ++ endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) + endif(BUILD_TEST) + foreach(STRING_INDEX ${f95_STRING_INDICES}) + set(f95_SRCS ${f95_SRCS} x${STRING_INDEX}f.f90) + if(BUILD_TEST) +- add_executable(x${STRING_INDEX}f x${STRING_INDEX}f.f90) +- target_link_libraries(x${STRING_INDEX}f plplotf95${LIB_TAG}) ++ # Need unique target name ++ add_executable(x${STRING_INDEX}f95 x${STRING_INDEX}f.f90) ++ set_target_properties( ++ x${STRING_INDEX}f95 PROPERTIES ++ OUTPUT_NAME x${STRING_INDEX}f ++ ) ++ target_link_libraries(x${STRING_INDEX}f95 plplotf95${LIB_TAG}) + endif(BUILD_TEST) + endforeach(STRING_INDEX ${f95_STRING_INDICES}) + +-install(FILES ${f95_SRCS} ++install(FILES ${f95_SRCS} + DESTINATION ${DATA_DIR}/examples/f95 + ) + Property changes on: trunk/debian/patches/12_cmake-2.6-fixes.diff ___________________________________________________________________ Added: svn:executable + * Added: trunk/debian/patches/series =================================================================== --- trunk/debian/patches/series (rev 0) +++ trunk/debian/patches/series 2008-09-05 20:01:13 UTC (rev 8751) @@ -0,0 +1,7 @@ +02_unset-python-path.diff +04_use-mkoctfile.diff +07_octave_prune_examples.diff +09_pdftex-EC-encoding.diff +10_print-usage-octave-3.0.diff +11_minus-sign-manpage.diff +12_cmake-2.6-fixes.diff Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-09-05 10:11:15 UTC (rev 8750) +++ trunk/debian/rules 2008-09-05 20:01:13 UTC (rev 8751) @@ -12,7 +12,7 @@ #export DH_VERBOSE=1 include /usr/share/octave/debian/defs.make -include /usr/share/dpatch/dpatch.make +include /usr/share/quilt/quilt.make version := $(shell perl debian/get-upstream-version.pl < cmake/modules/plplot_version.cmake) libpkg := libplplot9 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-01-26 07:55:52
|
Revision: 9385 http://plplot.svn.sourceforge.net/plplot/?rev=9385&view=rev Author: andrewross Date: 2009-01-26 07:55:45 +0000 (Mon, 26 Jan 2009) Log Message: ----------- Update debian packaging for an initial 5.9.2 release. Remove / change patches now incorporated upstream. Add patch to fix bug on kfreeBSD. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in trunk/debian/patches/07_octave_prune_examples.diff trunk/debian/patches/series trunk/debian/rules Added Paths: ----------- trunk/debian/patches/13_fix-kfreeBSD-build.diff Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-01-25 17:09:13 UTC (rev 9384) +++ trunk/debian/changelog 2009-01-26 07:55:45 UTC (rev 9385) @@ -1,3 +1,27 @@ +plplot (5.9.2-1) unstable; urgency=low + + * New upstream release. + + * debian/patches/series: Remove patches + 09_pdftex-EC-encoding.diff + 10_print-usage-octave-3.0.diff + 12_cmake-2.6-fixes.diff + which are now incorporated upstream. + + * debian/patches/07_octave_prune_examples.diff: + Update patch to reflect upstream changes. + + * debian/patches/13_fix-kfreeBSD-build.diff: + debian/control.in: + New patch to fix build of plplot on Debian kfreeBSD. Also disable + ada packages on kfreeBSD-amd64. Fixes bug #497895. + + * debian/rules: Explicitly enable tk driver. This is current disabled + upstream as there are some issues with segfaults for the interactive + tests. Use at your own risk until patches are forthcoming. + + -- Andrew Ross <and...@us...> Sun, 25 Jan 2009 15:28:58 +0000 + plplot (5.9.0-9) UNRELEASED; urgency=low * Switch from dpatch to quilt Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2009-01-25 17:09:13 UTC (rev 9384) +++ trunk/debian/control.in 2009-01-26 07:55:45 UTC (rev 9385) @@ -14,7 +14,7 @@ python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk-builddep [!alpha !arm !hppa !hurd-i386], - fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel] + fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel !kfreebsd-amd64] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex Build-Conflicts: libplplot5, octave2.1-headers Modified: trunk/debian/patches/07_octave_prune_examples.diff =================================================================== --- trunk/debian/patches/07_octave_prune_examples.diff 2009-01-25 17:09:13 UTC (rev 9384) +++ trunk/debian/patches/07_octave_prune_examples.diff 2009-01-26 07:55:45 UTC (rev 9385) @@ -6,15 +6,14 @@ @DPATCH@ ---- plplot-5.8.0.orig/test/test_octave.sh.in 2007-10-16 07:57:38.000000000 +0100 -+++ plplot-5.8.0/test/test_octave.sh.in 2007-12-07 15:02:43.000000000 +0000 -@@ -45,7 +45,7 @@ +--- plplot-5.8.0.orig/plplot_test/test_octave.sh.in 2007-10-16 07:57:38.000000000 +0100 ++++ plplot-5.8.0/plplot_test/test_octave.sh.in 2007-12-07 15:02:43.000000000 +0000 +@@ -62,7 +62,7 @@ # These require octave-2.1.50 so comment out since not everybody has # this. --for i=[1:7 8 9 13 15 16]; -+for i=[1:6 8 9 13 15 16]; - figure(i,"$device",sprintf("${OUTPUT_DIR}/p%d.$dsuffix",i)); - feval(sprintf("p%d",i)) - closefig - +- for i=[1:7 8 9 13 15 16] ; ++ for i=[1:6 8 9 13 15 16] ; + if (verbose_test) + printf("p%d\n",i); + endif Added: trunk/debian/patches/13_fix-kfreeBSD-build.diff =================================================================== --- trunk/debian/patches/13_fix-kfreeBSD-build.diff (rev 0) +++ trunk/debian/patches/13_fix-kfreeBSD-build.diff 2009-01-26 07:55:45 UTC (rev 9385) @@ -0,0 +1,15 @@ + +# Patch to fix build of plplot on debian kfreeBSD sustems. + +diff -ur plplot-5.9.2-orig/cmake/modules/xwin.cmake plplot-5.9.2/cmake/modules/xwin.cmake +--- plplot-5.9.2-orig/cmake/modules/xwin.cmake 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/cmake/modules/xwin.cmake 2009-01-26 07:38:20.000000000 +0000 +@@ -49,6 +49,8 @@ + cmake_link_flags(xwin_LINK_FLAGS "${xwin_LINK_FLAGS}") + if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(PLPLOT_MUTEX_RECURSIVE "PTHREAD_MUTEX_RECURSIVE_NP") ++ elseif(CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD") ++ set(PLPLOT_MUTEX_RECURSIVE "PTHREAD_MUTEX_RECURSIVE_NP") + else(CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(PLPLOT_MUTEX_RECURSIVE "PTHREAD_MUTEX_RECURSIVE") + endif(CMAKE_SYSTEM_NAME STREQUAL "Linux") Property changes on: trunk/debian/patches/13_fix-kfreeBSD-build.diff ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/debian/patches/series =================================================================== --- trunk/debian/patches/series 2009-01-25 17:09:13 UTC (rev 9384) +++ trunk/debian/patches/series 2009-01-26 07:55:45 UTC (rev 9385) @@ -1,7 +1,5 @@ 02_unset-python-path.diff 04_use-mkoctfile.diff 07_octave_prune_examples.diff -09_pdftex-EC-encoding.diff -10_print-usage-octave-3.0.diff 11_minus-sign-manpage.diff -12_cmake-2.6-fixes.diff +13_fix-kfreeBSD-build.diff Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2009-01-25 17:09:13 UTC (rev 9384) +++ trunk/debian/rules 2009-01-26 07:55:45 UTC (rev 9385) @@ -67,8 +67,8 @@ CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ -DOCTAVE_OCT_DIR=$(OCTDIR) \ - -DUSE_RPATH=OFF -DPLD_psttf=OFF \ - $(ADA_OPTIONS) $(JAVA_OPTIONS) + -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON \ + $(ADA_OPTIONS) $(JAVA_OPTIONS) BUILD_DIR = $(debbase)/build_tmp SRC_DIR = $(shell pwd) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-02-27 22:17:07
|
Revision: 9637 http://plplot.svn.sourceforge.net/plplot/?rev=9637&view=rev Author: andrewross Date: 2009-02-27 22:17:00 +0000 (Fri, 27 Feb 2009) Log Message: ----------- Update Debian package descriptions to fix some lintian warnings. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-02-27 21:30:47 UTC (rev 9636) +++ trunk/debian/changelog 2009-02-27 22:17:00 UTC (rev 9637) @@ -1,3 +1,10 @@ +plplot (5.9.2-2) unstable; urgency=low + + * debian/control.in: Update package descriptions to fix lintian + warnings. + + -- Andrew Ross <and...@us...> Fri, 27 Feb 2009 22:14:07 +0000 + plplot (5.9.2-1) unstable; urgency=low * New upstream release. Closes: #517233. Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2009-02-27 21:30:47 UTC (rev 9636) +++ trunk/debian/control.in 2009-02-27 22:17:00 UTC (rev 9637) @@ -23,7 +23,7 @@ Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian Vcs-Browser: http://plplot.svn.sourceforge.net/viewvc/plplot/trunk/debian/ -Package: libplplot9 + Architecture: any Section: libs Conflicts: libplplot5, plplot (<< 5) @@ -39,8 +39,8 @@ handful of function calls is typically required. For more advanced use, virtually all aspects of plotting are configurable. . - This package contains the PLplot libraries for C and Fortran77, as - well as the necessary data files. + This package contains the PLplot library for C, as well as the necessary + data files. Package: libplplot-dev Architecture: any @@ -49,11 +49,18 @@ Depends: libplplot9 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}), plplot9-driver-gnome2 Description: Scientific plotting library (development files) + PLplot is relatively small, portable, freely distributable, and is rich + enough to satisfy most users. It has a wide range of plot types including + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. + . This package contains all that is needed for doing development in C, C++, - and Fortran with PLplot, a scientific plotting library. Examples of - programs for these languages are also included. For development in - Tcl/Tk, Python, and Octave, install the plplot-tcl, python-plplot, - and octave-plplot packages, respectively. + and Fortran with PLplot. Examples of programs for these languages are + also included. For development in Tcl/Tk, Python, and Octave, install + the plplot-tcl, python-plplot, and octave-plplot packages, respectively. Package: libplplot-c++9c2 Architecture: any @@ -61,23 +68,38 @@ Conflicts: libplplot5, libplplot-c++9 Replaces: libplplot-c++9 Depends: ${shlibs:Depends} -Description: Scientific plotting library - This package contains the C++ binding for PLplot, a scientific plotting - library. +Description: Scientific plotting library (C++ binding) + PLplot is relatively small, portable, freely distributable, and is rich + enough to satisfy most users. It has a wide range of plot types including + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. + . + This package contains the C++ binding for PLplot. Package: libplplot-fortran9 Architecture: any Section: libs Depends: ${shlibs:Depends} -Description: Scientific plotting library +Description: Scientific plotting library (fortran bindings) + PLplot is relatively small, portable, freely distributable, and is rich + enough to satisfy most users. It has a wide range of plot types including + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. + . This package contains the Fortran 77 and Fortran 95 bindings for - PLplot, a scientific plotting library. + PLplot. [JAVA:Package: libplplot9-java Architecture: any Section: libs Depends: java-gcj-compat, ${shlibs:Depends} -Description: Scientific plotting library +Description: Scientific plotting library (Java bindings) This packages contains the Java bindings for PLplot, a scientific plotting library. :] @@ -86,7 +108,7 @@ Section: libs Conflicts: libplplot5, libplplot9 (<< 5.3.0.cvs.20040303) Depends: ${shlibs:Depends} -Description: Scientific plotting library +Description: Scientific plotting library (CSIRO libraries) This package contains two libraries developed by Pavel Sakov, from the CSIRO Marine Research, used in geometry applications: . @@ -98,13 +120,19 @@ Package: plplot-bin Architecture: any -Section: math Conflicts: libplplot9 (<= 5.3.0-4), plplot (<< 5) Depends: ${shlibs:Depends} Description: Scientific plotting library (utilities) - This package contains the following utilities associated with PLplot, - a scientific plotting library: + PLplot is relatively small, portable, freely distributable, and is rich + enough to satisfy most users. It has a wide range of plot types including + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. . + This package contains the following utilities associated with PLplot. + . * pltek - review a Tektronix vector file * plm2gif - converts PLplot metafiles to GIF files * plpr - converts PLplot metafile to something the printer will understand @@ -115,8 +143,15 @@ Depends: ${shlibs:Depends} Conflicts: plplot-lib, plplot (<< 5) Description: Scientific plotting library (X11 driver) - This package provides the X11 driver module for PLplot, a scientific - plotting library. + PLplot is relatively small, portable, freely distributable, and is rich + enough to satisfy most users. It has a wide range of plot types including + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. + . + This package provides the X11 driver module for PLplot. Package: plplot9-driver-gnome2 Architecture: any @@ -125,28 +160,49 @@ Conflicts: plplot9-driver-gnome Replaces: plplot9-driver-gnome Description: Scientific plotting library (GNOME Canvas Widget driver) - This package provides the GNOME Canvas Widget driver module for PLplot, a - scientific plotting library. This package replaces the (now deprecated) - plplot9-driver-gnome package. + PLplot is relatively small, portable, freely distributable, and is rich + enough to satisfy most users. It has a wide range of plot types including + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. + . + This package provides the GNOME Canvas Widget driver module for PLplot. + This package replaces the (now deprecated) plplot9-driver-gnome package. Package: plplot9-driver-wxwidgets Architecture: any Section: libs Depends: libplplot9, ${shlibs:Depends} Description: Scientific plotting library (wxWidgets driver) - This package provides the wxWidgets driver module for PLplot, a - scientific plotting library. + PLplot is relatively small, portable, freely distributable, and is rich + enough to satisfy most users. It has a wide range of plot types including + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. + . + This package provides the wxWidgets driver module for PLplot. Package: plplot-tcl Architecture: any Priority: extra Depends: plplot9-driver-xwin, iwidgets4, ${shlibs:Depends} Description: Tcl/Tk support for PLplot, a plotting library - This package contains the Tcl/Tk support for PLplot, a scientific - plotting library: shared libraries, Tcl modules, the Tk driver, and - some programs for interactive use of PLplot (plserver and pltcl). - Also included is the utility program plrender to render PLplot - metafiles. + PLplot is relatively small, portable, freely distributable, and is rich + enough to satisfy most users. It has a wide range of plot types including + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. + . + This package contains the Tcl/Tk support for PLplot: shared libraries, + Tcl modules, the Tk driver, and some programs for interactive use of + PLplot (plserver and pltcl). Also included is the utility program + plrender to render PLplot metafiles. Package: plplot-tcl-dev Architecture: any @@ -154,9 +210,16 @@ Depends: libplplot9 (= ${binary:Version}), plplot-tcl Conflicts: plplot-tcl (<= 5.2.0.cvs.20030224-1) Description: Tcl/Tk development support for PLplot, a plotting library + PLplot is relatively small, portable, freely distributable, and is rich + enough to satisfy most users. It has a wide range of plot types including + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. + . This package contains the necessary files to do development in Tcl/Tk - with PLplot, a scientific plotting library: header files, shared - libraries links, and examples. + with PLplot: header files, shared libraries links, and examples. Package: plplot9-driver-gd Architecture: any @@ -164,9 +227,16 @@ Depends: ${shlibs:Depends} Recommends: ttf-freefont Description: Scientific plotting library (GD driver) - This package provides the GD driver module for PLplot, a scientific plotting - library. It allows the generation of PNG and JPEG files directly from - PLplot programs. + PLplot is relatively small, portable, freely distributable, and is rich + enough to satisfy most users. It has a wide range of plot types including + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. + . + This package provides the GD driver module for PLplot. It allows the + generation of PNG and JPEG files directly from PLplot programs. Package: plplot9-driver-cairo Architecture: any @@ -175,10 +245,17 @@ Conflicts: plplot9-driver-psttf Replaces: plplot9-driver-psttf Description: Scientific plotting library (Cairo driver) - This package provides the Cairo driver module for PLplot, a - scientific plotting library. It is based on the Cairo 2D - graphics library with supportting multiple output devices (X-Window, - PDF, PostScript, and PNG). + PLplot is relatively small, portable, freely distributable, and is rich + enough to satisfy most users. It has a wide range of plot types including + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. + . + This package provides the Cairo driver module for PLplot. It is based + on the Cairo 2D graphics library with supportting multiple output devices + (X-Window, PDF, PostScript, and PNG). Package: python-plplot Architecture: any @@ -188,6 +265,14 @@ Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python support for PLplot, a plotting library + PLplot is relatively small, portable, freely distributable, and is rich + enough to satisfy most users. It has a wide range of plot types including + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. + . This package contains the library plmodule.so for gluing the PLplot scientific plotting library into Python applications. Examples are also provided. @@ -197,24 +282,47 @@ Priority: extra Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends} Description: Octave support for PLplot, a plotting library - This package contains the Octave bindings for PLplot, a scientific plotting - library. It provides an almost drop-in replacement for the traditional - Gnuplot graphical interface in Octave. Examples are also provided. + PLplot is relatively small, portable, freely distributable, and is rich + enough to satisfy most users. It has a wide range of plot types including + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. + . + This package contains the Octave bindings for PLplot. It provides an + almost drop-in replacement for the traditional Gnuplot graphical + interface in Octave. Examples are also provided. [ADA:Package: libplplot-ada Architecture: any Priority: extra Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends} Description: Ada support for PLplot, a plotting library - This package contains the Ada bindings for PLplot, a scientific plotting - library. The ada bindings are currently under development and should be - considered experimental. + PLplot is relatively small, portable, freely distributable, and is rich + enough to satisfy most users. It has a wide range of plot types including + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. + . + This package contains the Ada bindings for PLplot. The ada bindings are + currently under development and should be considered experimental. :] Package: plplot-doc Architecture: all Section: doc Suggests: libplplot-dev Description: Documentation for PLplot, a plotting library + PLplot is relatively small, portable, freely distributable, and is rich + enough to satisfy most users. It has a wide range of plot types including + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. + . This package contains the HTML, PDF, PostScript and info forms of the PLplot documentation. It also contains the man pages for the API functions. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-03-03 21:12:30
|
Revision: 9669 http://plplot.svn.sourceforge.net/plplot/?rev=9669&view=rev Author: andrewross Date: 2009-03-03 21:12:28 +0000 (Tue, 03 Mar 2009) Log Message: ----------- Disable ocaml bindings explicitly since there is currently no debian packaging of these. Backport octave changes from svn to remove irritating warnings from octave 2.0/2.1 support and to fix automatic replotting of figures (required for p*.m examples.) Modified Paths: -------------- trunk/debian/changelog trunk/debian/patches/series trunk/debian/rules Added Paths: ----------- trunk/debian/patches/14_octave-3.0-fixes.diff Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-03-03 21:10:23 UTC (rev 9668) +++ trunk/debian/changelog 2009-03-03 21:12:28 UTC (rev 9669) @@ -3,6 +3,14 @@ * debian/control.in: Update package descriptions to fix lintian warnings. + * debian/patches/14_octave-3.0-fixes.diff: + New patch ported from upstream to fix octave with octave 3.0. + Patch removes support for octave 2.0/2.1 which gets rids of a + large number of warnings. Also fixes automatic_replot support. + + * debian/rules: Disable ocaml support to prevent ocaml bindings + being build if ocamlc is installed. + -- Andrew Ross <and...@us...> Fri, 27 Feb 2009 22:14:07 +0000 plplot (5.9.2-1) unstable; urgency=low Added: trunk/debian/patches/14_octave-3.0-fixes.diff =================================================================== --- trunk/debian/patches/14_octave-3.0-fixes.diff (rev 0) +++ trunk/debian/patches/14_octave-3.0-fixes.diff 2009-03-03 21:12:28 UTC (rev 9669) @@ -0,0 +1,1150 @@ +# Patch to remove obsolete octave 2.0/2.1 support and fix automatic +# replotting. This is a backport from upstream svn. + +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p10.m plplot-5.9.2/bindings/octave/demos/p10.m +--- plplot-5.9.2-orig/bindings/octave/demos/p10.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p10.m 2009-01-20 18:31:04.000000000 +0000 +@@ -15,10 +15,9 @@ + + function p10 + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + title("Comet"); + xlabel ""; +@@ -26,9 +25,7 @@ + t = -pi:pi/200:0; + comet(t,tan(sin(t))-sin(tan(t))); + +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction + +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p11.m plplot-5.9.2/bindings/octave/demos/p11.m +--- plplot-5.9.2-orig/bindings/octave/demos/p11.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p11.m 2009-01-20 18:31:04.000000000 +0000 +@@ -14,10 +14,9 @@ + + function p11 + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + title("Stripchart demo 1 (sliding)"); + xlabel("Time"); +@@ -50,8 +49,6 @@ + ## Destroy strip chart and it's memory */ + + stripc_del(id1); +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p12.m plplot-5.9.2/bindings/octave/demos/p12.m +--- plplot-5.9.2-orig/bindings/octave/demos/p12.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p12.m 2009-01-20 18:31:04.000000000 +0000 +@@ -14,10 +14,9 @@ + + function p12 + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + title("War Game"); + legend("off"); +@@ -32,8 +31,6 @@ + endif + legend("on"); + +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p13.m plplot-5.9.2/bindings/octave/demos/p13.m +--- plplot-5.9.2-orig/bindings/octave/demos/p13.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p13.m 2009-01-20 18:31:04.000000000 +0000 +@@ -14,10 +14,9 @@ + + function p13 + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + legend("opaque"); + title("Matrix with individual line attributes"); +@@ -36,8 +35,6 @@ + + ## plot(randn(10,3),fmt) + plot(g,fmt) +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p14.m plplot-5.9.2/bindings/octave/demos/p14.m +--- plplot-5.9.2-orig/bindings/octave/demos/p14.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p14.m 2009-01-20 18:31:04.000000000 +0000 +@@ -17,10 +17,9 @@ + + ## And now, in the Theatre near you, "Octave, the movie" + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + if (!nargin) + plsetopt "db"; +@@ -64,9 +63,7 @@ + closefig; # the "db" option has negative side effects on other plots. + plsetopt "reset"; # reset options + endif +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction + +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p15.m plplot-5.9.2/bindings/octave/demos/p15.m +--- plplot-5.9.2-orig/bindings/octave/demos/p15.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p15.m 2009-01-20 18:31:04.000000000 +0000 +@@ -15,10 +15,9 @@ + + function p15 + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + title "Lighted and shaded surface"; + xlabel ""; +@@ -35,9 +34,7 @@ + surf(x, y, z); + colormap('default'); + +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction + +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p16.m plplot-5.9.2/bindings/octave/demos/p16.m +--- plplot-5.9.2-orig/bindings/octave/demos/p16.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p16.m 2009-01-20 18:31:04.000000000 +0000 +@@ -14,10 +14,9 @@ + + function p16 + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + multiplot(1, 2); + p1; +@@ -31,8 +30,6 @@ + shade(x, y, z); + + oneplot; +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p17.m plplot-5.9.2/bindings/octave/demos/p17.m +--- plplot-5.9.2-orig/bindings/octave/demos/p17.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p17.m 2009-01-20 18:31:04.000000000 +0000 +@@ -14,10 +14,9 @@ + + function p17(fg) + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + title "Click and Drag button 1 to select"; + xlabel "Button 2 to restart and button 3 to finish"; +@@ -32,8 +31,6 @@ + plimage (img, x1, x2, y1, y2); + endif + +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p18.m plplot-5.9.2/bindings/octave/demos/p18.m +--- plplot-5.9.2-orig/bindings/octave/demos/p18.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p18.m 2009-01-20 18:31:04.000000000 +0000 +@@ -14,10 +14,9 @@ + + function p18 + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + plsetopt "db"; + fig( free_fig); # unused plot window +@@ -33,8 +32,6 @@ + set_view("meshc", x, y, z); + closefig + +- if (exist("automatic_replot")) +- automatic_replot = 0; +- endif ++ pl_automatic_replot = t; + + endfunction +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p19.m plplot-5.9.2/bindings/octave/demos/p19.m +--- plplot-5.9.2-orig/bindings/octave/demos/p19.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p19.m 2009-01-20 18:31:04.000000000 +0000 +@@ -14,10 +14,9 @@ + + function p19 + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + f0=figure; + multiplot(1,2); +@@ -100,8 +99,6 @@ + closefig(f1); + oneplot; + +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p1.m plplot-5.9.2/bindings/octave/demos/p1.m +--- plplot-5.9.2-orig/bindings/octave/demos/p1.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p1.m 2009-01-20 18:31:04.000000000 +0000 +@@ -15,10 +15,9 @@ + + function p1 + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot; ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + xscale = 6.; + yscale = 1.; +@@ -41,9 +40,7 @@ + + plot(x, y, xs, ys, 'og; ;'); + +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction + +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p21.m plplot-5.9.2/bindings/octave/demos/p21.m +--- plplot-5.9.2-orig/bindings/octave/demos/p21.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p21.m 2009-01-20 18:31:04.000000000 +0000 +@@ -20,10 +20,9 @@ + ##ocmap = colormap; + colormap(bgr); + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + gx = 30; + gy = 40; +@@ -52,16 +51,15 @@ + pladv(j++); + zg = griddata(x, y, z, xg, yg, i, opt(i)); + ## zg(isnan(zg)) = 0; +- ofi = do_fortran_indexing; do_fortran_indexing = 1; ++ old_dofi = warning("query","Octave:fortran-indexing"); ++ warning("off","Octave:fortran-indexing"); + zg(isnan(zg)) = 0; +- do_fortran_indexing = ofi; ++ warning(old_dofi.state,"Octave:fortran-indexing"); + title(alg(i,:)); + meshc(xg, yg, zg'); + endfor + +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + ##colormap(ocmap); + + endfunction +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p2.m plplot-5.9.2/bindings/octave/demos/p2.m +--- plplot-5.9.2-orig/bindings/octave/demos/p2.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p2.m 2009-01-20 18:31:04.000000000 +0000 +@@ -14,10 +14,9 @@ + + function p2 + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot; ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + legend("opaque",0) + title("PLplot Example 2"); +@@ -30,9 +29,7 @@ + x, y2, 'b;sin(x)*cos(2*x);', + x, y3, 'g;x*sin(x);'); + +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction + +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p3.m plplot-5.9.2/bindings/octave/demos/p3.m +--- plplot-5.9.2-orig/bindings/octave/demos/p3.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p3.m 2009-01-20 18:31:04.000000000 +0000 +@@ -14,10 +14,9 @@ + + function p3 + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot; ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + xscale = 6.; + yscale = 1.; +@@ -39,8 +38,6 @@ + title("#frPLplot Example 3 - y=x#u2 #d(with error bars)"); + plot(x, y, [xs' xe'], [ys' yel' yer'], '~g; ;'); + +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p4.m plplot-5.9.2/bindings/octave/demos/p4.m +--- plplot-5.9.2-orig/bindings/octave/demos/p4.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p4.m 2009-01-20 18:31:04.000000000 +0000 +@@ -14,10 +14,9 @@ + + function p4 + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot; ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + x=0.01:0.1:10; + y=exp(x); +@@ -27,8 +26,6 @@ + loglog(x,y,'y') + grid (og); + +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p5.m plplot-5.9.2/bindings/octave/demos/p5.m +--- plplot-5.9.2-orig/bindings/octave/demos/p5.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p5.m 2009-01-20 18:31:04.000000000 +0000 +@@ -14,10 +14,9 @@ + + function p5 + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + x=-pi:0.01:pi; + y=sin(x).+cos(3*x); +@@ -27,8 +26,6 @@ + polar(x,y,'y') + grid (og); + +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p6.m plplot-5.9.2/bindings/octave/demos/p6.m +--- plplot-5.9.2-orig/bindings/octave/demos/p6.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p6.m 2009-01-20 18:31:04.000000000 +0000 +@@ -16,10 +16,9 @@ + + [x y z] = rosenbrock; z = log(z); + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + as = autostyle; + autostyle "off"; +@@ -28,8 +27,6 @@ + contour(x,y,z) + + autostyle(as); +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p7.m plplot-5.9.2/bindings/octave/demos/p7.m +--- plplot-5.9.2-orig/bindings/octave/demos/p7.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p7.m 2009-01-20 18:31:04.000000000 +0000 +@@ -14,10 +14,9 @@ + + function p7 + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + [x y z]=rosenbrock;z=log(z); + +@@ -36,7 +35,5 @@ + shade(x,y,z,15,3); + axis; + +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + endfunction +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p8.m plplot-5.9.2/bindings/octave/demos/p8.m +--- plplot-5.9.2-orig/bindings/octave/demos/p8.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p8.m 2009-01-20 18:31:04.000000000 +0000 +@@ -14,10 +14,9 @@ + + function p8 + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + xlabel("X"); ylabel("Y"); + title("Mesh example"); +@@ -27,9 +26,7 @@ + pause(1); + meshc(x,y,z) + +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction + +diff -ur plplot-5.9.2-orig/bindings/octave/demos/p9.m plplot-5.9.2/bindings/octave/demos/p9.m +--- plplot-5.9.2-orig/bindings/octave/demos/p9.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/demos/p9.m 2009-01-20 18:31:04.000000000 +0000 +@@ -14,10 +14,9 @@ + + function p9 + +- if (exist("automatic_replot")) +- t = automatic_replot; +- automatic_replot = 0; +- endif ++ global pl_automatic_replot ++ t = pl_automatic_replot; ++ pl_automatic_replot = 0; + + as = autostyle; + autostyle ("off"); +@@ -40,8 +39,6 @@ + + legend(ls); + autostyle(as); +- if (exist("automatic_replot")) +- automatic_replot = t; +- endif ++ pl_automatic_replot = t; + + endfunction +diff -ur plplot-5.9.2-orig/bindings/octave/octaverc.in plplot-5.9.2/bindings/octave/octaverc.in +--- plplot-5.9.2-orig/bindings/octave/octaverc.in 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/octaverc.in 2009-01-20 18:31:04.000000000 +0000 +@@ -1,9 +1,4 @@ +-if (exist("LOADPATH")) +- automatic_replot=1; +- LOADPATH="@CMAKE_SOURCE_DIR@/bindings/octave//:@CMAKE_BINARY_DIR@/bindings/octave//:"; +-else +- addpath("@CMAKE_SOURCE_DIR@/bindings/octave/PLplot/","@CMAKE_SOURCE_DIR@/bindings/octave/PLplot/support/","@CMAKE_SOURCE_DIR@/bindings/octave/demos/","@CMAKE_SOURCE_DIR@/bindings/octave/misc/","@CMAKE_BINARY_DIR@/bindings/octave/","@CMAKE_BINARY_DIR@/bindings/octave/PLplot"); +- # Suppress spurious warnings for the test. +- warning("off","Octave:built-in-variable-assignment"); +-endif ++addpath("@CMAKE_SOURCE_DIR@/bindings/octave/PLplot/","@CMAKE_SOURCE_DIR@/bindings/octave/PLplot/support/","@CMAKE_SOURCE_DIR@/bindings/octave/demos/","@CMAKE_SOURCE_DIR@/bindings/octave/misc/","@CMAKE_BINARY_DIR@/bindings/octave/","@CMAKE_BINARY_DIR@/bindings/octave/PLplot"); + putenv("PLPLOT_LIB","@CMAKE_SOURCE_DIR@/data/"); ++global pl_automatic_replot ++pl_automatic_replot=1; +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/autostyle.m plplot-5.9.2/bindings/octave/PLplot/autostyle.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/autostyle.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/autostyle.m 2009-01-20 18:31:04.000000000 +0000 +@@ -21,6 +21,7 @@ + function st = autostyle(x) + + global __pl ++ global pl_automatic_replot + strm = __pl_init; + + if (nargin == 1) +@@ -49,8 +50,8 @@ + + st = __pl.line_style(strm); + +- if (exist("automatic_replot")) +- if (automatic_replot) ++ if (exist("pl_automatic_replot")) ++ if (pl_automatic_replot) + __pl_plotit; + endif + endif +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/axis.m plplot-5.9.2/bindings/octave/PLplot/axis.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/axis.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/axis.m 2009-01-20 18:31:04.000000000 +0000 +@@ -61,6 +61,7 @@ + ## as setup by the user, or automaticaly. It interacts with hold mode. + + global __pl ++ global pl_automatic_replot + strm = __pl_init; + + if (nargin == 0) +@@ -193,8 +194,8 @@ + endswitch + endif + +- if (exist("automatic_replot")) +- if (automatic_replot) ++ if (exist("pl_automatic_replot")) ++ if (pl_automatic_replot) + __pl_plotit; + endif + endif +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/colormap.m plplot-5.9.2/bindings/octave/PLplot/colormap.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/colormap.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/colormap.m 2009-01-20 18:31:04.000000000 +0000 +@@ -23,6 +23,7 @@ + function ccmap = colormap(map) + + global __pl ++ global pl_automatic_replot + __pl_init; + + if (nargin == 0) +@@ -68,8 +69,8 @@ + plscmap1(map(:,1), map(:,2), map(:,3)); + plflush;#pleop; + +- if (exist("automatic_replot")) +- if (automatic_replot) ++ if (exist("pl_automatic_replot")) ++ if (pl_automatic_replot) + ## can cause problems on plot scripts that dont support automatic _replot + __pl_plotit; + endif +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/figure.m plplot-5.9.2/bindings/octave/PLplot/figure.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/figure.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/figure.m 2009-01-20 18:31:04.000000000 +0000 +@@ -46,15 +46,15 @@ + function [n, driver, intp]= figure (n, device, file, win_id, tk_file, plot_frame) + + global __pl __tk_name ++ global pl_automatic_replot + + if (!exist("__pl") || !struct_contains (__pl,"inited")) + v = split(version ,'.'); + if (! ((str2num(v(1,:)) > 2) || +- (str2num(v(1,:)) == 2 && str2num(v(2,:)) > 1) || +- (str2num(v(1,:)) == 2 && str2num(v(2,:)) == 1 && +- str2num(v(3,:)) >= 57))) ++ (str2num(v(1,:)) == 2 && str2num(v(2,:)) == 9 && ++ str2num(v(3,:)) >= 0))) + error("The PLplot-Octave scripts need an Octave version \n\ +- greater than or equal to 2.1.57.\n"); ++ greater than or equal to 2.9.0.\n"); + endif + + plplot_stub; +@@ -65,13 +65,13 @@ + + __pl.inited = 1; + +- if (exist("automatic_replot")) +- if (automatic_replot == 0) +- warning("It is recommended that you set 'automatic_replot=1' \n\ +- in your ~/.octaverc file."); +- ##automatic_replot = 1; +- endif +- endif ++## if (exist("pl_automatic_replot")) ++## if (pl_automatic_replot == 0) ++## warning("It is recommended that you set 'pl_automatic_replot=1' \n\ ++## in your ~/.octaverc file."); ++## ##automatic_replot = 1; ++## endif ++## endif + endif + + if (nargin == 0) +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/grid.m plplot-5.9.2/bindings/octave/PLplot/grid.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/grid.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/grid.m 2009-01-20 18:31:04.000000000 +0000 +@@ -23,6 +23,7 @@ + function st = grid (x) + + global __pl ++ global pl_automatic_replot + strm = __pl_init; + + st = __pl.grid(strm); +@@ -57,8 +58,8 @@ + help grid + endif + +- if (exist("automatic_replot")) +- if (automatic_replot) ++ if (exist("pl_automatic_replot")) ++ if (pl_automatic_replot) + __pl_plotit; + endif + endif +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/legend.m plplot-5.9.2/bindings/octave/PLplot/legend.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/legend.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/legend.m 2009-01-20 18:31:04.000000000 +0000 +@@ -29,6 +29,7 @@ + function st = legend (x, xpos, varargin) + + global __pl ++ global pl_automatic_replot + strm = __pl_init; + + if (nargin == 0) +@@ -66,8 +67,8 @@ + help "legend" + endif + +- if (exist("automatic_replot")) +- if (automatic_replot) ++ if (exist("pl_automatic_replot")) ++ if (pl_automatic_replot) + __pl_plotit; + endif + endif +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/plot_margin.m plplot-5.9.2/bindings/octave/PLplot/plot_margin.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/plot_margin.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/plot_margin.m 2009-01-20 18:31:04.000000000 +0000 +@@ -22,6 +22,7 @@ + function ost = plot_margin(st) + + global __pl ++ global pl_automatic_replot + n = __pl_init; + + ost = __pl.margin(n); +@@ -30,8 +31,8 @@ + __pl.margin(n) = st; + endif + +- if (exist("automatic_replot")) +- if (automatic_replot) ++ if (exist("pl_automatic_replot")) ++ if (pl_automatic_replot) + __pl_plotit; + endif + endif +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/plplot_octave_path.m.in plplot-5.9.2/bindings/octave/PLplot/plplot_octave_path.m.in +--- plplot-5.9.2-orig/bindings/octave/PLplot/plplot_octave_path.m.in 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/plplot_octave_path.m.in 2009-01-20 18:31:04.000000000 +0000 +@@ -22,7 +22,7 @@ + global __pl_plplot_octave_path + + if (!exist("__pl_plplot_octave_path") || isempty(__pl_plplot_octave_path)) +- __pl_plplot_octave_path = "@PLPLOT_OCTAVE_DIR@//"; ++ __pl_plplot_octave_path = "@PLPLOT_OCTAVE_DIR@"; + endif + + if (nargin == 0) +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/shade.m plplot-5.9.2/bindings/octave/PLplot/shade.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/shade.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/shade.m 2009-02-19 22:50:56.000000000 +0000 +@@ -28,13 +28,8 @@ + + unwind_protect + +- if (exist("warn_empty_list_elements")) +- old_empty_list_elements_ok = warn_empty_list_elements; +- warn_empty_list_elements = 0; +- else +- old_empty_list_elements_ok = warning("query", "Octave:empty-list-elements"); +- warning("off","Octave:empty-list-elements"); +- endif ++ old_empty_list_elements_ok = warning("query", "Octave:empty-list-elements"); ++ warning("off","Octave:empty-list-elements"); + + if (nargin == 1 && ismatrix(x)) + levels = 20; +@@ -119,6 +114,7 @@ + if (!isscalar(levels)) + n = length(levels)-1; + clevel = levels; ++ cclevel = clevel; + else + n = levels; + clevel = linspace(zm, zM, levels+1); +@@ -177,11 +173,7 @@ + + unwind_protect_cleanup + +- if (exist("warn_empty_list_elements")) +- warn_empty_list_elements = old_empty_list_elements_ok; +- else +- warning(old_empty_list_elements_ok.state, "Octave:empty-list-elements"); +- endif ++ warning(old_empty_list_elements_ok.state, "Octave:empty-list-elements"); + + end_unwind_protect + +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/shading.m plplot-5.9.2/bindings/octave/PLplot/shading.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/shading.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/shading.m 2009-01-20 18:31:04.000000000 +0000 +@@ -19,6 +19,7 @@ + function type = shading(type) + + global __pl ++ global pl_automatic_replot + strm = __pl_init; + + if (nargin == 0) +@@ -35,8 +36,8 @@ + return; + endif + +- if (exist("automatic_replot")) +- if (automatic_replot) ++ if (exist("pl_automatic_replot")) ++ if (pl_automatic_replot) + __pl_plotit; + endif + endif +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/support/__pl_contour.m plplot-5.9.2/bindings/octave/PLplot/support/__pl_contour.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/support/__pl_contour.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/support/__pl_contour.m 2009-01-20 18:31:04.000000000 +0000 +@@ -21,13 +21,8 @@ + + unwind_protect + +- if (exist("warn_empty_list_elements")) +- old_empty_list_elements_ok = warn_empty_list_elements; +- warn_empty_list_elements = 0; +- else +- old_empty_list_elements_ok = warning("query","Octave:empty-list-elements"); +- warning("off","Octave:empty-list-elements"); +- endif ++ old_empty_list_elements_ok = warning("query","Octave:empty-list-elements"); ++ warning("off","Octave:empty-list-elements"); + + grid = 0; + if (__pl.grid(strm)) +@@ -117,11 +112,7 @@ + + unwind_protect_cleanup + +- if (exist("warn_empty_list_elements")) +- warn_empty_list_elements = old_empty_list_elements_ok; +- else +- warning(old_empty_list_elements_ok.state,"Octave:empty-list-elements"); +- endif ++ warning(old_empty_list_elements_ok.state,"Octave:empty-list-elements"); + + end_unwind_protect + +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/support/__pl_matstr.m plplot-5.9.2/bindings/octave/PLplot/support/__pl_matstr.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/support/__pl_matstr.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/support/__pl_matstr.m 2009-01-20 18:31:04.000000000 +0000 +@@ -34,17 +34,10 @@ + out(nn,:) = ""; + endif + endif +- if (exist("warn_fortran_indexing")) +- old_dofi = warn_fortran_indexing; +- warn_fortran_indexing = 0; +- out(toascii (out) == 0) = " "; +- warn_fortran_indexing = old_dofi; +- else +- old_dofi = warning("query","Octave:fortran-indexing"); +- warning("off","Octave:fortran-indexing"); +- out(toascii (out) == 0) = " "; +- warning(old_dofi.state,"Octave:fortran-indexing"); +- endif ++ old_dofi = warning("query","Octave:fortran-indexing"); ++ warning("off","Octave:fortran-indexing"); ++ out(toascii (out) == 0) = " "; ++ warning(old_dofi.state,"Octave:fortran-indexing"); + + else + help __pl_matstr +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/support/__pl_plotit.m plplot-5.9.2/bindings/octave/PLplot/support/__pl_plotit.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/support/__pl_plotit.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/support/__pl_plotit.m 2009-01-20 18:31:04.000000000 +0000 +@@ -28,13 +28,8 @@ + + unwind_protect + +- if (exist("warn_empty_list_elements")) +- old_empty_list_elements_ok = warn_empty_list_elements; +- warn_empty_list_elements = 0; +- else +- old_empty_list_elements_ok = warning("query","Octave:empty-list-elements"); +- warning("off","Octave:empty-list-elements"); +- endif ++ old_empty_list_elements_ok = warning("query","Octave:empty-list-elements"); ++ warning("off","Octave:empty-list-elements"); + + if (__pl.type(strm) >= 100 && __pl.type(strm) < 200) + __pl_meshplotit; +@@ -286,11 +281,7 @@ + + unwind_protect_cleanup + +- if (exist("warn_empty_list_elements")) +- warn_empty_list_elements = old_empty_list_elements_ok; +- else +- warning(old_empty_list_elements_ok.state,"Octave:empty-list-elements"); +- endif ++ warning(old_empty_list_elements_ok.state,"Octave:empty-list-elements"); + + end_unwind_protect + +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/title.m plplot-5.9.2/bindings/octave/PLplot/title.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/title.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/title.m 2009-01-20 18:31:04.000000000 +0000 +@@ -40,6 +40,7 @@ + function text = title (text) + + global __pl ++ global pl_automatic_replot + + strm = __pl_init; + +@@ -57,8 +58,8 @@ + __pl.tlabel = __pl_matstr(__pl.tlabel, text, strm); + endif + +- if (exist("automatic_replot")) +- if (automatic_replot) ++ if (exist("pl_automatic_replot")) ++ if (pl_automatic_replot) + __pl_plotit; + endif + endif +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/toggle_plplot_use.m plplot-5.9.2/bindings/octave/PLplot/toggle_plplot_use.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/toggle_plplot_use.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/toggle_plplot_use.m 2009-01-20 18:31:04.000000000 +0000 +@@ -3,7 +3,7 @@ + ## Use this script to activate/deactivate the default library for the + ## PLplot plotting function (plot, mesh, etc.), as both the native + ## gnuplot and the new octave-plplot libraries use similar names to the +-## functions. toggle_plplot_use post-/pre-pends to LOADPATH the path for ++## functions. toggle_plplot_use post-/pre-pends to the path for + ## the PLplot functions in successive calls. + + ## File: toggle_plplot_use.m +@@ -23,13 +23,6 @@ + if ! exist ("use_plplot_state") + global use_plplot_state + use_plplot_state = "on"; +- # Warn user about spurious warnings with octave 2.9 +- ver = str2num(split(version,".")); +- if ((ver(1) == 2 && ver(2) == 9) || (ver(1) >= 3)) +- if (warning("query","Octave:built-in-variable-assignment").state == "on") +- warning("You may want to call\n warning(\"off\",\"Octave:built-in-variable-assignment\");\nto prevent spurious warnings from the plplot code for compatability with octave 2.0/2.1.\n"); +- endif +- endif + else + if strcmp (use_plplot_state, "on") + use_plplot_state = "off"; +@@ -39,38 +32,22 @@ + endif + + use_plplot_path = plplot_octave_path; +-# Strip of trailing // for octave >= 2.9 +-if (!exist("LOADPATH")) +- use_plplot_path = use_plplot_path(1:end-2); +-endif +-if (exist("LOADPATH")) +- use_plplot_i = findstr (LOADPATH, use_plplot_path); +- if (!isempty (use_plplot_i)) +- LOADPATH (use_plplot_i(1):use_plplot_i(1)+length(use_plplot_path)-1)= ""; +- LOADPATH = strrep (LOADPATH, "::", ":"); ++plplot_path_to_remove = split(genpath(use_plplot_path),pathsep); ++for i=1:size(plplot_path_to_remove)(1) ++ if (findstr(path,deblank(plplot_path_to_remove(i,:))) > 0) ++ rmpath(deblank(plplot_path_to_remove(i,:))); + endif +-else +- plplot_path_to_remove = split(genpath(use_plplot_path),pathsep); +- for i=1:size(plplot_path_to_remove)(1) +- if (findstr(path,deblank(plplot_path_to_remove(i,:))) > 0) +- rmpath(deblank(plplot_path_to_remove(i,:))); +- endif +- endfor +-endif ++endfor + + if (strcmp (use_plplot_state, "on")) +- if (exist("LOADPATH")) +- LOADPATH = [use_plplot_path, ":", LOADPATH]; +- else +- addpath(genpath(use_plplot_path)); +- endif ++ addpath(genpath(use_plplot_path)); + plplot_stub; +-elseif (strcmp (use_plplot_state, "off")) +- if (exist("LOADPATH")) +- LOADPATH = [LOADPATH, ":", use_plplot_path]; +- else +- addpath(genpath(use_plplot_path),"-end"); ++ if ! exist ("pl_automatic_replot") ++ global pl_automatic_replot ++ pl_automatic_replot = 1; + endif ++elseif (strcmp (use_plplot_state, "off")) ++ addpath(genpath(use_plplot_path),"-end"); + endif + + use_plplot_lcd = pwd; +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/xlabel.m plplot-5.9.2/bindings/octave/PLplot/xlabel.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/xlabel.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/xlabel.m 2009-01-20 18:31:04.000000000 +0000 +@@ -21,6 +21,7 @@ + function text = xlabel (text) + + global __pl ++ global pl_automatic_replot + + strm = __pl_init; + +@@ -38,8 +39,8 @@ + __pl.xlabel = __pl_matstr(__pl.xlabel, text, strm); + endif + +- if (exist("automatic_replot")) +- if (automatic_replot) ++ if (exist("pl_automatic_replot")) ++ if (pl_automatic_replot) + __pl_plotit; + endif + endif +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/xticks.m plplot-5.9.2/bindings/octave/PLplot/xticks.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/xticks.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/xticks.m 2009-01-20 18:31:04.000000000 +0000 +@@ -26,6 +26,7 @@ + function xticks (int, num) + + global __pl ++ global pl_automatic_replot + + strm = __pl_init; + +@@ -55,8 +56,8 @@ + endif + endif + +- if (exist("automatic_replot")) +- if (automatic_replot) ++ if (exist("pl_automatic_replot")) ++ if (pl_automatic_replot) + __pl_plotit; + endif + endif +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/ylabel.m plplot-5.9.2/bindings/octave/PLplot/ylabel.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/ylabel.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/ylabel.m 2009-01-20 18:31:04.000000000 +0000 +@@ -21,6 +21,7 @@ + function text = ylabel (text) + + global __pl ++ global pl_automatic_replot + + strm = __pl_init; + +@@ -38,8 +39,8 @@ + __pl.ylabel = __pl_matstr(__pl.ylabel, text, strm); + endif + +- if (exist("automatic_replot")) +- if (automatic_replot) ++ if (exist("pl_automatic_replot")) ++ if (pl_automatic_replot) + __pl_plotit; + endif + endif +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/yticks.m plplot-5.9.2/bindings/octave/PLplot/yticks.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/yticks.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/yticks.m 2009-01-20 18:31:04.000000000 +0000 +@@ -26,6 +26,7 @@ + function yticks (int, num) + + global __pl ++ global pl_automatic_replot + + strm = __pl_init; + +@@ -55,10 +56,10 @@ + endif + endif + +- if (exist("automatic_replot")) +- if (automatic_replot) ++ if (exist("pl_automatic_replot")) ++ if (pl_automatic_replot) + __pl_plotit; + endif +- endif ++## endif + + endfunction +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/zlabel.m plplot-5.9.2/bindings/octave/PLplot/zlabel.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/zlabel.m 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/PLplot/zlabel.m 2009-01-20 18:31:04.000000000 +0000 +@@ -21,6 +21,7 @@ + function text = zlabel (text) + + global __pl ++ global pl_automatic_replot + + strm =__pl_init; + +@@ -38,8 +39,8 @@ + __pl.zlabel = __pl_matstr(__pl.zlabel, text, strm); + endif + +- if (exist("automatic_replot")) +- if (automatic_replot) ++ if (exist("pl_automatic_replot")) ++ if (pl_automatic_replot) + __pl_plotit; + endif + endif +diff -ur plplot-5.9.2-orig/bindings/octave/USAGE plplot-5.9.2/bindings/octave/USAGE +--- plplot-5.9.2-orig/bindings/octave/USAGE 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/octave/USAGE 2009-01-20 18:31:04.000000000 +0000 +@@ -78,18 +78,9 @@ + plfill(n, x, y) ... + + NOTES: - You don't need to specify vector or matrix dimensions. +- - When setting Octave variable "automatic_replot = 1", changes take +- effect immediately, otherwise they only take effect at the next plot. +- (This does not yet apply to all plot types and does not work with +- octave 2.9). +- - With octave 2.9 you will see various spurious warnings about variables +- which are no longer builtins. These warnings can safely be ignored. +- Plplot is just testing to see if these variables exist as part of +- the octave 2.1 compatibility code. To suppress these warnings add +- warning("off","Octave:built-in-variable-assignment"); +- to your .octaverc. +- +- ++ - When setting the plplot variable "pl_automatic_replot = 1", ++ changes take effect immediately, otherwise they only take ++ effect at the next plot. + + --- Plot window control + fig, Property changes on: trunk/debian/patches/14_octave-3.0-fixes.diff ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/debian/patches/series =================================================================== --- trunk/debian/patches/series 2009-03-03 21:10:23 UTC (rev 9668) +++ trunk/debian/patches/series 2009-03-03 21:12:28 UTC (rev 9669) @@ -3,3 +3,4 @@ 07_octave_prune_examples.diff 11_minus-sign-manpage.diff 13_fix-kfreeBSD-build.diff +14_octave-3.0-fixes.diff Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2009-03-03 21:10:23 UTC (rev 9668) +++ trunk/debian/rules 2009-03-03 21:12:28 UTC (rev 9669) @@ -67,7 +67,7 @@ CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ -DOCTAVE_OCT_DIR=$(OCTDIR) \ - -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON \ + -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON -DENABLE_ocaml=OFF\ $(ADA_OPTIONS) $(JAVA_OPTIONS) BUILD_DIR = $(debbase)/build_tmp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2009-04-01 22:25:48
|
Revision: 9786 http://plplot.svn.sourceforge.net/plplot/?rev=9786&view=rev Author: rlaboiss Date: 2009-04-01 22:25:45 +0000 (Wed, 01 Apr 2009) Log Message: ----------- libplplot-dev depend on fortran and ada library packages Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-04-01 05:38:16 UTC (rev 9785) +++ trunk/debian/changelog 2009-04-01 22:25:45 UTC (rev 9786) @@ -1,14 +1,21 @@ +plplot (5.9.2-2) UNRELEASED; urgency=low + + * debian/control (libplplot-dev): Depend on libplplot-fortran9 + libplplot-ada, avoiding dangling symlinks (closes: #522125) + + -- Rafael Laboissiere <ra...@de...> Thu, 02 Apr 2009 00:21:46 +0200 + plplot (5.9.2-2) unstable; urgency=low - * debian/control.in: Update package descriptions to fix lintian + * debian/control.in: Update package descriptions to fix lintian warnings. - * debian/patches/14_octave-3.0-fixes.diff: - New patch ported from upstream to fix octave with octave 3.0. - Patch removes support for octave 2.0/2.1 which gets rids of a + * debian/patches/14_octave-3.0-fixes.diff: + New patch ported from upstream to fix octave with octave 3.0. + Patch removes support for octave 2.0/2.1 which gets rids of a large number of warnings. Also fixes automatic_replot support. - * debian/rules: Disable ocaml support to prevent ocaml bindings + * debian/rules: Disable ocaml support to prevent ocaml bindings being build if ocamlc is installed. -- Andrew Ross <and...@us...> Fri, 27 Feb 2009 22:14:07 +0000 @@ -23,12 +30,12 @@ 12_cmake-2.6-fixes.diff which are now incorporated upstream. - * debian/patches/07_octave_prune_examples.diff: + * debian/patches/07_octave_prune_examples.diff: Update patch to reflect upstream changes. - * debian/patches/13_fix-kfreeBSD-build.diff: - debian/control.in: - New patch to fix build of plplot on Debian kfreeBSD. Also disable + * debian/patches/13_fix-kfreeBSD-build.diff: + debian/control.in: + New patch to fix build of plplot on Debian kfreeBSD. Also disable ada packages on kfreeBSD-amd64. Closes: #497895. * debian/rules: Explicitly enable tk driver. This is current disabled Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2009-04-01 05:38:16 UTC (rev 9785) +++ trunk/debian/control.in 2009-04-01 22:25:45 UTC (rev 9786) @@ -47,7 +47,8 @@ Section: libdevel Recommends: pkg-config Depends: libplplot9 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, - libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}), plplot9-driver-gnome2 + libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}), plplot9-driver-gnome2, + libplplot-fortran9 (= ${binary:Version}), libplplot-ada (= ${binary:Version}) Description: Scientific plotting library (development files) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -58,8 +59,8 @@ virtually all aspects of plotting are configurable. . This package contains all that is needed for doing development in C, C++, - and Fortran with PLplot. Examples of programs for these languages are - also included. For development in Tcl/Tk, Python, and Octave, install + and Fortran with PLplot. Examples of programs for these languages are + also included. For development in Tcl/Tk, Python, and Octave, install the plplot-tcl, python-plplot, and octave-plplot packages, respectively. Package: libplplot-c++9c2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-04-16 14:23:06
|
Revision: 9805 http://plplot.svn.sourceforge.net/plplot/?rev=9805&view=rev Author: andrewross Date: 2009-04-16 14:22:56 +0000 (Thu, 16 Apr 2009) Log Message: ----------- Fix some lintian warnings and close octave bug which is fixed by recent patch to remove octave 2.0/2.1 backwards compatibility. Modified Paths: -------------- trunk/debian/changelog trunk/debian/compat trunk/debian/control.in Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-04-16 14:08:44 UTC (rev 9804) +++ trunk/debian/changelog 2009-04-16 14:22:56 UTC (rev 9805) @@ -1,3 +1,12 @@ +plplot (5.9.2-4) UNRELEASED; urgency=low + + * debian/compat: Update compatibility version for debhelper to + remove lintian warning. + * debian/control: Change section for libplplot9-java to match + override in debian archives. Fixes lintian warning + + -- Andrew Ross <and...@us...> Thu, 16 Apr 2009 15:16:07 +0100 + plplot (5.9.2-3) UNRELEASED; urgency=low * debian/control (libplplot-dev): Depend on libplplot-fortran9 @@ -13,7 +22,8 @@ * debian/patches/14_octave-3.0-fixes.diff: New patch ported from upstream to fix octave with octave 3.0. Patch removes support for octave 2.0/2.1 which gets rids of a - large number of warnings. Also fixes automatic_replot support. + large number of warnings. Also fixes automatic_replot support. + (closes: #522423) * debian/rules: Disable ocaml support to prevent ocaml bindings being build if ocamlc is installed. Modified: trunk/debian/compat =================================================================== --- trunk/debian/compat 2009-04-16 14:08:44 UTC (rev 9804) +++ trunk/debian/compat 2009-04-16 14:22:56 UTC (rev 9805) @@ -1 +1 @@ -4 +7 Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2009-04-16 14:08:44 UTC (rev 9804) +++ trunk/debian/control.in 2009-04-16 14:22:56 UTC (rev 9805) @@ -98,7 +98,7 @@ [JAVA:Package: libplplot9-java Architecture: any -Section: libs +Section: java Depends: java-gcj-compat, ${shlibs:Depends} Description: Scientific plotting library (Java bindings) PLplot is relatively small, portable, freely distributable, and is rich This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2010-01-14 22:12:21
|
Revision: 10755 http://plplot.svn.sourceforge.net/plplot/?rev=10755&view=rev Author: andrewross Date: 2010-01-14 22:12:07 +0000 (Thu, 14 Jan 2010) Log Message: ----------- Fix up some lintian warnings in debian packages. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2010-01-14 21:34:06 UTC (rev 10754) +++ trunk/debian/changelog 2010-01-14 22:12:07 UTC (rev 10755) @@ -6,10 +6,12 @@ + Remove arm build dependency on g++-4.1. (closes: #533806) + Update build dependency on tcl / tk to 8.5 (compatible with latest itcl). (closes: #545302) - + Add dpkg (>=1.15.4) dependency for plplot-doc to correctly + + Add dpkg (>=1.15.4) | install-info dependency for plplot-doc to correctly handle info install triggers. Fixes lintian warning. + Bump debian standards version to 3.8.3. + Fix typo in java bindings package description. (closes: #557677) + + Add ${misc:Depends} to all binary package dependencies. Fixes lintian + warning. * debian/control.in, debian/rules: + Update java to build-dep on default-jdk and runtime depend on default-jre which should work for all architectures. Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2010-01-14 21:34:06 UTC (rev 10754) +++ trunk/debian/control.in 2010-01-14 22:12:07 UTC (rev 10755) @@ -27,7 +27,7 @@ Architecture: any Section: libs Conflicts: libplplot5, plplot (<< 5) -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: plplot9-driver-xwin, plplot9-driver-gnome2, plplot9-driver-gd, plplot9-driver-cairo, plplot9-driver-wxwidgets, plplot-tcl Description: Scientific plotting library @@ -48,7 +48,8 @@ Recommends: pkg-config Depends: libplplot9 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}), plplot9-driver-gnome2, - libplplot-fortran9 (= ${binary:Version})[ADA:, libplplot-ada (= ${binary:Version}):] + libplplot-fortran9 (= ${binary:Version})[ADA:, libplplot-ada (= ${binary:Version}):], + ${misc:Depends} Description: Scientific plotting library (development files) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -68,7 +69,7 @@ Section: libs Conflicts: libplplot5, libplplot-c++9 Replaces: libplplot-c++9 -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (C++ binding) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -83,7 +84,7 @@ Package: libplplot-fortran9 Architecture: any Section: libs -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends} , ${misc:Depends} Description: Scientific plotting library (fortran bindings) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -99,7 +100,7 @@ Package: libplplot9-java Architecture: any Section: java -Depends: default-jre, ${shlibs:Depends} +Depends: default-jre, ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (Java bindings) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -115,7 +116,7 @@ Architecture: any Section: libs Conflicts: libplplot5, libplplot9 (<< 5.3.0.cvs.20040303) -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (CSIRO libraries) This package contains two libraries developed by Pavel Sakov, from the CSIRO Marine Research, used in geometry applications: @@ -129,7 +130,7 @@ Package: plplot-bin Architecture: any Conflicts: libplplot9 (<= 5.3.0-4), plplot (<< 5) -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (utilities) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -148,7 +149,7 @@ Package: plplot9-driver-xwin Architecture: any Section: libs -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: plplot-lib, plplot (<< 5) Description: Scientific plotting library (X11 driver) PLplot is relatively small, portable, freely distributable, and is rich @@ -164,7 +165,7 @@ Package: plplot9-driver-gnome2 Architecture: any Section: libs -Depends: libplplot9, ${shlibs:Depends} +Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} Conflicts: plplot9-driver-gnome Replaces: plplot9-driver-gnome Description: Scientific plotting library (GNOME Canvas Widget driver) @@ -182,7 +183,7 @@ Package: plplot9-driver-wxwidgets Architecture: any Section: libs -Depends: libplplot9, ${shlibs:Depends} +Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (wxWidgets driver) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -197,7 +198,7 @@ Package: plplot-tcl Architecture: any Priority: extra -Depends: plplot9-driver-xwin, iwidgets4, ${shlibs:Depends} +Depends: plplot9-driver-xwin, iwidgets4, ${shlibs:Depends}, ${misc:Depends} Description: Tcl/Tk support for PLplot, a plotting library PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -215,7 +216,7 @@ Package: plplot-tcl-dev Architecture: any Priority: extra -Depends: libplplot9 (= ${binary:Version}), plplot-tcl +Depends: libplplot9 (= ${binary:Version}), plplot-tcl, ${misc:Depends} Conflicts: plplot-tcl (<= 5.2.0.cvs.20030224-1) Description: Tcl/Tk development support for PLplot, a plotting library PLplot is relatively small, portable, freely distributable, and is rich @@ -232,7 +233,7 @@ Package: plplot9-driver-gd Architecture: any Section: libs -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: ttf-freefont Description: Scientific plotting library (GD driver) PLplot is relatively small, portable, freely distributable, and is rich @@ -249,7 +250,7 @@ Package: plplot9-driver-cairo Architecture: any Section: libs -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: plplot9-driver-psttf Replaces: plplot9-driver-psttf Description: Scientific plotting library (Cairo driver) @@ -269,7 +270,7 @@ Architecture: any Section: python Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, - ${python:Depends}, python-numpy + ${python:Depends}, python-numpy, ${misc:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python support for PLplot, a plotting library @@ -288,7 +289,8 @@ Package: octave-plplot Architecture: any Priority: extra -Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends} +Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends}, + ${misc:Depends} Description: Octave support for PLplot, a plotting library PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -305,7 +307,7 @@ [ADA:Package: libplplot-ada Architecture: any Priority: extra -Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends} +Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Ada support for PLplot, a plotting library PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -322,7 +324,7 @@ Architecture: all Section: doc Suggests: libplplot-dev -Depends: dpkg (>= 1.15.4) +Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends} Description: Documentation for PLplot, a plotting library PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-10-27 20:47:17
|
Revision: 12004 http://plplot.svn.sourceforge.net/plplot/?rev=12004&view=rev Author: andrewross Date: 2011-10-27 20:47:11 +0000 (Thu, 27 Oct 2011) Log Message: ----------- Tinker with wording of the Debian package descriptions. Modified Paths: -------------- trunk/debian/control trunk/debian/control.in Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2011-10-27 20:34:11 UTC (rev 12003) +++ trunk/debian/control 2011-10-27 20:47:11 UTC (rev 12004) @@ -52,7 +52,6 @@ Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, libltdl3-dev, libqsastime-dev, ${misc:Depends}, libplplot-c++10 (= ${binary:Version}), libplplot-fortran9 (= ${binary:Version}) - , libplplot-ada (= ${binary:Version}) Breaks: libplplot-fortran9 (<< 5.9.8-1) Description: Scientific plotting library (development files) PLplot is relatively small, portable, freely distributable, and is rich @@ -63,13 +62,13 @@ handful of function calls is typically required. For more advanced use, virtually all aspects of plotting are configurable. . - This package contains all that is needed for doing development in C, C++, - Fortran and Ada with PLplot. Examples of programs for these languages are - also included. For development in Tcl/Tk, Python, Octave, and Java install - the plplot-tcl-dev, python-plplot, octave-plplot and libplplot-java packages, - respectively. This package also includes the OCaml, lua and D examples. To use - one of these languages you will also need to install the libplplot-xxx package - for that language. + This package contains all that is needed for doing development in C, C++ + and Fortran with PLplot. Examples of programs for these languages are + also included. For development in Tcl/Tk, Python, Octave, Ada and Java + install the plplot-tcl-dev, python-plplot, octave-plplot, libplplot-ada0-dev + and libplplot-java packages, respectively. This package also includes the + OCaml, lua and D examples. To use one of these languages you will also + need to install the libplplot-xxx package for that language. Package: libplplot-c++10 Architecture: any @@ -330,9 +329,11 @@ almost drop-in replacement for the traditional Gnuplot graphical interface in Octave. Examples are also provided. -Package: libplplot-ada +Package: libplplot-ada0 Architecture: any Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Breaks: libplplot-ada (<< 5.9.8-2) +Replaces: libplplot-ada (<< 5.9.8-2) Description: Ada support for PLplot, a plotting library PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -342,9 +343,31 @@ handful of function calls is typically required. For more advanced use, virtually all aspects of plotting are configurable. . - This package contains the Ada bindings for PLplot. + This package contains the runtime Ada bindings library for PLplot. +Package: libplplot-ada0-dev +Architecture: any +Section: libdevel +Suggests: plplot-doc +Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, + libltdl3-dev, libqsastime-dev, ada-compiler, gnat, gnat-4.6, ${misc:Depends}, + libplplot-ada0 (= ${binary:Version}) +Recommends: libplplot-dev +Breaks: libplplot-ada (<< 5.9.8-2), libplplot-dev (<< 5.9.8-2) +Description: Scientific plotting library (development files) + PLplot is relatively small, portable, freely distributable, and is rich + enough to satisfy most users. It has a wide range of plot types including + line (linear, log), contour, 3D, fill, and almost 1000 characters + (including Greek and mathematical) in its extended font set. The package + is designed to make it easy to quickly get graphical output; only a + handful of function calls is typically required. For more advanced use, + virtually all aspects of plotting are configurable. + . + This package contains all that is needed for doing PLplot development in + Ada. + + Package: plplot-doc Architecture: all Section: doc Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2011-10-27 20:34:11 UTC (rev 12003) +++ trunk/debian/control.in 2011-10-27 20:47:11 UTC (rev 12004) @@ -64,11 +64,11 @@ . This package contains all that is needed for doing development in C, C++ and Fortran with PLplot. Examples of programs for these languages are - also included. For development in Tcl/Tk, Python, Octave, and Java install - the plplot-tcl-dev, python-plplot, octave-plplot and libplplot-java packages, - respectively. This package also includes the OCaml, lua and D examples. To use - one of these languages you will also need to install the libplplot-xxx package - for that language. + also included. For development in Tcl/Tk, Python, Octave, Ada and Java + install the plplot-tcl-dev, python-plplot, octave-plplot, libplplot-ada0-dev + and libplplot-java packages, respectively. This package also includes the + OCaml, lua and D examples. To use one of these languages you will also + need to install the libplplot-xxx package for that language. Package: libplplot-c++10 Architecture: any This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-11-24 20:10:02
|
Revision: 12038 http://plplot.svn.sourceforge.net/plplot/?rev=12038&view=rev Author: andrewross Date: 2011-11-24 20:09:56 +0000 (Thu, 24 Nov 2011) Log Message: ----------- Update dependencies for Debian packages so cmake is required for -dev package. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2011-11-24 20:09:15 UTC (rev 12037) +++ trunk/debian/changelog 2011-11-24 20:09:56 UTC (rev 12038) @@ -1,3 +1,10 @@ +plplot (5.9.9-2) unstable; urgency=low + + * debian/control.in: Add recommends on cmake for libplplot-dev since + this provides a better way of building the examples. + + -- Andrew Ross <and...@us...> Mon, 31 Oct 2011 15:10:57 +0000 + plplot (5.9.9-1) unstable; urgency=low * New upstream release. Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2011-11-24 20:09:15 UTC (rev 12037) +++ trunk/debian/control.in 2011-11-24 20:09:56 UTC (rev 12038) @@ -47,7 +47,7 @@ Package: libplplot-dev Architecture: any Section: libdevel -Recommends: pkg-config, libplplot-ocaml, libplplot-lua, libplplot-d +Recommends: pkg-config, cmake, libplplot-ocaml, libplplot-lua, libplplot-d Suggests: plplot-doc Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, libltdl3-dev, libqsastime-dev, ${misc:Depends}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2012-02-27 21:39:13
|
Revision: 12182 http://plplot.svn.sourceforge.net/plplot/?rev=12182&view=rev Author: andrewross Date: 2012-02-27 21:39:06 +0000 (Mon, 27 Feb 2012) Log Message: ----------- Number of changes to debian packages, principally to clean up debian/rules and to fix some dpkg-shlibdeps, lintian and buildd check warnings. Ensures -fvisibilty=hidden flag is now applied. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control trunk/debian/control.in trunk/debian/patches/series trunk/debian/rules Added Paths: ----------- trunk/debian/patches/08_nn_link_libm.diff Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2012-02-26 22:31:05 UTC (rev 12181) +++ trunk/debian/changelog 2012-02-27 21:39:06 UTC (rev 12182) @@ -5,8 +5,21 @@ + Fix broken suggests package plplot11-tcl for libplplot11. + Remove reference to ada-compiler in libplplot-ada0-dev package as per new Debian Ada policy. Fixes lintian warning. + + Add note for fortran bindings package description that Fortran 77 support + is deprecated in the current upstream SVN and will be dropped in a future + release. New code should use the Fortran 95 bindings. + * debian/rules: + + Tidy up obsolete / unneeded code. + + Ensure CFLAGS, CXXFLAGS and LDFLAGS are properly exported to cmake. Add in + FFLAGS. -fvisibility=hidden and --as-needed should now work properly. The + latter fixes a lot of dpkg-shlibdeps warnings. + * debian/patches/series, debian/patches/08_nn_link_libm.diff: Add patch to + explicitly link nn library against maths library. Fixes dpkg-shlibdeps + warning. + * Rebuild python-plplot package against new version of numpy as part of the + numpy transition. - -- Andrew Ross <and...@us...> Sun, 26 Feb 2012 22:29:21 +0000 + -- Andrew Ross <and...@us...> Mon, 27 Feb 2012 21:34:46 +0000 plplot (5.9.9-2) unstable; urgency=low Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2012-02-26 22:31:05 UTC (rev 12181) +++ trunk/debian/control 2012-02-27 21:39:06 UTC (rev 12182) @@ -2,7 +2,7 @@ Section: math Priority: optional Maintainer: Andrew Ross <and...@us...> -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Build-Depends: cmake (>= 2.6.3), debhelper (>= 7), tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, octave3.2-headers, @@ -29,7 +29,7 @@ Conflicts: libplplot9 Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: plplot11-driver-xwin, plplot11-driver-gd, - plplot11-driver-cairo, plplot11-driver-qt, plplot11-driver-wxwidgets, plplot11-tcl + plplot11-driver-cairo, plplot11-driver-qt, plplot11-driver-wxwidgets, plplot-tcl Replaces: plplot-bin (<< 5.9.6-1) Breaks: plplot-bin (<<5.9.6-1) Description: Scientific plotting library @@ -101,7 +101,9 @@ virtually all aspects of plotting are configurable. . This package contains the Fortran 77 and Fortran 95 bindings for - PLplot. + PLplot. Note: the Fortran 77 bindings have been deprecated in the latest + version of PLplot, and will be dropped from a future release. New code + should use the Fortran 95 bindings. Package: libplplot-java Architecture: any @@ -351,7 +353,7 @@ Section: libdevel Suggests: plplot-doc Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, - libltdl3-dev, libqsastime-dev, ada-compiler, gnat, gnat-4.6, ${misc:Depends}, + libltdl3-dev, libqsastime-dev, gnat, gnat-4.6, ${misc:Depends}, libplplot-ada0 (= ${binary:Version}) Recommends: libplplot-dev Breaks: libplplot-ada (<< 5.9.8-2), libplplot-dev (<< 5.9.8-2) Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2012-02-26 22:31:05 UTC (rev 12181) +++ trunk/debian/control.in 2012-02-27 21:39:06 UTC (rev 12182) @@ -101,7 +101,9 @@ virtually all aspects of plotting are configurable. . This package contains the Fortran 77 and Fortran 95 bindings for - PLplot. + PLplot. Note: the Fortran 77 bindings have been deprecated in the latest + version of PLplot, and will be dropped from a future release. New code + should use the Fortran 95 bindings. Package: libplplot-java Architecture: any Added: trunk/debian/patches/08_nn_link_libm.diff =================================================================== --- trunk/debian/patches/08_nn_link_libm.diff (rev 0) +++ trunk/debian/patches/08_nn_link_libm.diff 2012-02-27 21:39:06 UTC (rev 12182) @@ -0,0 +1,23 @@ +# +# Patch from upstream to ensure nn library is linked against the maths library. +# +Index: plplot-5.9.9/lib/nn/CMakeLists.txt +=================================================================== +--- plplot-5.9.9.orig/lib/nn/CMakeLists.txt 2012-02-27 21:27:23.839569576 +0000 ++++ plplot-5.9.9/lib/nn/CMakeLists.txt 2012-02-27 21:28:06.623570811 +0000 +@@ -38,6 +38,15 @@ + endif(BUILD_SHARED_LIBS) + + add_library(csironn ${csironn_LIB_SRCS}) ++ ++ if(MATH_LIB) ++ set( ++ csironn_LINK_LIBRARIES ++ ${csironn_LINK_LIBRARIES} ++ ${MATH_LIB} ++ ) ++ endif(MATH_LIB) ++ + set_target_properties( + csironn + PROPERTIES Property changes on: trunk/debian/patches/08_nn_link_libm.diff ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/debian/patches/series =================================================================== --- trunk/debian/patches/series 2012-02-26 22:31:05 UTC (rev 12181) +++ trunk/debian/patches/series 2012-02-27 21:39:06 UTC (rev 12182) @@ -1,3 +1,4 @@ 02_unset-python-path.diff #04_use-mkoctfile.diff #07_octave_prune_examples.diff +08_nn_link_libm.diff Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2012-02-26 22:31:05 UTC (rev 12181) +++ trunk/debian/rules 2012-02-27 21:39:06 UTC (rev 12182) @@ -12,7 +12,7 @@ #export DH_VERBOSE=1 include /usr/share/octave/debian/defs.make -include /usr/share/quilt/quilt.make +#include /usr/share/quilt/quilt.make version := $(shell perl debian/get-upstream-version.pl < cmake/modules/plplot_version.cmake) libpkg := libplplot11 @@ -32,6 +32,8 @@ #Don't add -fvisibility=hidden to CXXFLAGS for now as this breaks the octave bindings. CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) #CXXFLAGS += -fvisibility=hidden +FFLAGS = $(shell dpkg-buildflags --get FFLAGS) +FFLAGS += -fvisibility=hidden LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) LDFLAGS += -Wl,--as-needed DC = gdc-v1 @@ -92,30 +94,31 @@ mkdir $(BUILD_DIR) (cd $(BUILD_DIR) ; \ PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \ - JAVA_HOME=$(JAVA_HOME) \ - DC=$(DC) \ + JAVA_HOME=$(JAVA_HOME) DC=$(DC) \ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \ + LDFLAGS="$(LDFLAGS)" \ cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) ) touch config-stamp build-arch: build-arch-stamp -build-arch-stamp: patch config-stamp +build-arch-stamp: config-stamp dh_testdir ( cd $(BUILD_DIR) ; $(MAKE) ) -( cd $(BUILD_DIR) ; unset DISPLAY ; $(MAKE) test_noninteractive ) touch build-arch-stamp build-indep: build-indep-stamp -build-indep-stamp: patch +build-indep-stamp: dh_testdir ( cd $(BUILD_DIR) ; cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DBUILD_DOC=ON ; \ cd doc ; $(MAKE) ) touch build-indep-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-arch-stamp build-indep-stamp install-arch-stamp install-indep-stamp \ - config-stamp patch-stamp debian/files install-python* + config-stamp debian/files install-python* rm -rf $(BUILD_DIR) rm -rf $(debbase)/$(libpkg) dh_clean @@ -245,12 +248,9 @@ dh_md5sums -a dh_builddeb -a -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary config \ - patch unpatch control + control .NOTPARALLEL: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2013-06-26 21:34:51
|
Revision: 12389 http://sourceforge.net/p/plplot/code/12389 Author: andrewross Date: 2013-06-26 21:34:49 +0000 (Wed, 26 Jun 2013) Log Message: ----------- Update debian 5.9.9 packages so they compile on Debian unstable. Modified Paths: -------------- trunk/debian/changelog trunk/debian/patches/fix-cmake-ada-support.diff trunk/debian/patches/series trunk/debian/rules Added Paths: ----------- trunk/debian/patches/fix-cmake-d-support.diff Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2013-06-26 06:03:55 UTC (rev 12388) +++ trunk/debian/changelog 2013-06-26 21:34:49 UTC (rev 12389) @@ -1,3 +1,13 @@ +plplot (5.9.9-7ubuntu2) UNRELEASED; urgency=low + + * debian/patches/fix-cmake-ada-support.diff: Update ada support from + upstream to ensure plplot builds with latest Ada compiler in unstable. + * debian/rules: Update python library path. + * debian/patches/fix-cmake-d-support.diff: Add patch from upstream to + fix D language support. + + -- Andrew Ross <and...@us...> Wed, 26 Jun 2013 22:29:59 +0100 + plplot (5.9.9-6) unstable; urgency=low * debian/control.in: Remove build dependency on quilt since this is Modified: trunk/debian/patches/fix-cmake-ada-support.diff =================================================================== --- trunk/debian/patches/fix-cmake-ada-support.diff 2013-06-26 06:03:55 UTC (rev 12388) +++ trunk/debian/patches/fix-cmake-ada-support.diff 2013-06-26 21:34:49 UTC (rev 12389) @@ -2,6 +2,8 @@ Author: Andrew Ross <and...@us...> Last-Update: 2012-07-19 +Index: plplot-5.9.9/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake +=================================================================== --- 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 @@ @@ -23,3 +25,20 @@ 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) +Index: plplot-5.9.9/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake +=================================================================== +--- plplot-5.9.9.orig/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake 2011-10-13 01:43:01.000000000 +0100 ++++ plplot-5.9.9/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake 2013-06-25 16:55:17.698208176 +0100 +@@ -55,8 +55,11 @@ + + # configure variables set in this file for fast reload later on + #CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeAdaCompiler.cmake.in ++#message(STATUS "DEBUG: CMAKE_BINARY_DIR = ${CMAKE_BINARY_DIR}") ++#message(STATUS "DEBUG: CMAKE_FILES_DIRECTORY = ${CMAKE_FILES_DIRECTORY}") ++#message(STATUS "DEBUG: CMAKE_PLATFORM_INFO_DIR = ${CMAKE_PLATFORM_INFO_DIR}") + CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeAdaCompiler.cmake.in +- "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeAdaCompiler.cmake" IMMEDIATE) ++ "${CMAKE_PLATFORM_INFO_DIR}/CMakeAdaCompiler.cmake" IMMEDIATE) + MARK_AS_ADVANCED(CMAKE_AR) + + SET(CMAKE_Ada_COMPILER_ENV_VAR "ADA") Added: trunk/debian/patches/fix-cmake-d-support.diff =================================================================== --- trunk/debian/patches/fix-cmake-d-support.diff (rev 0) +++ trunk/debian/patches/fix-cmake-d-support.diff 2013-06-26 21:34:49 UTC (rev 12389) @@ -0,0 +1,20 @@ +Description: Fix cmake D language support +Author: Andrew Ross <and...@us...> +Origin: upstream +Index: plplot-5.9.9/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake +=================================================================== +--- plplot-5.9.9.orig/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake 2011-10-13 01:43:01.000000000 +0100 ++++ plplot-5.9.9/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake 2013-06-26 21:52:27.309698965 +0100 +@@ -99,10 +99,10 @@ + # a different location. + IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in) + CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in +- "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE) ++ "${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake" IMMEDIATE) + ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in) + CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in +- "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE) ++ "${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake" IMMEDIATE) + ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in) + + MARK_AS_ADVANCED(CMAKE_AR) Property changes on: trunk/debian/patches/fix-cmake-d-support.diff ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/debian/patches/series =================================================================== --- trunk/debian/patches/series 2013-06-26 06:03:55 UTC (rev 12388) +++ trunk/debian/patches/series 2013-06-26 21:34:49 UTC (rev 12389) @@ -7,3 +7,4 @@ fix-boolean-operators.diff fix-cmake-ada-support.diff fix-lua-includes.diff +fix-cmake-d-support.diff Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2013-06-26 06:03:55 UTC (rev 12388) +++ trunk/debian/rules 2013-06-26 21:34:49 UTC (rev 12389) @@ -91,9 +91,9 @@ endif config: config-stamp -config-stamp: control +config-stamp: control mkdir -p $(BUILD_DIR) - (cd $(BUILD_DIR) ; \ + ( cd $(BUILD_DIR) ; \ PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \ JAVA_HOME=$(JAVA_HOME) DC=$(DC) \ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \ @@ -201,7 +201,7 @@ install-python%: build-arch-stamp ( cd $(BUILD_DIR) ; \ - cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=/usr/lib/python$*/config/libpython$*.so -DPYTHON_INCLUDE_PATH="/usr/include/python$*;/usr/include/numpy;/usr/lib/pyshared/python$*/numpy/core/include/numpy" -DNUMERIC_INCLUDE_PATH=/usr/include/numpy ; \ + cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=`python-config --config-dir`/libpython$*.so -DPYTHON_INCLUDE_PATH="/usr/include/python$*;/usr/include/numpy;/usr/lib/pyshared/python$*/numpy/core/include/numpy" -DNUMERIC_INCLUDE_PATH=/usr/include/numpy ; \ for d in python qt_gui/pyqt4 ; do \ ( cd bindings/$$d; \ $(MAKE) clean ; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-04-23 08:17:15
|
Revision: 9831 http://plplot.svn.sourceforge.net/plplot/?rev=9831&view=rev Author: andrewross Date: 2009-04-23 08:16:46 +0000 (Thu, 23 Apr 2009) Log Message: ----------- Backport svn fix for octave variable namespace clash from svn to the debian 5.9.2 package. Closes Debian bug report. Modified Paths: -------------- trunk/debian/changelog trunk/debian/patches/series Added Paths: ----------- trunk/debian/patches/15_octave-toggle-plplot-use.diff Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-04-23 07:59:38 UTC (rev 9830) +++ trunk/debian/changelog 2009-04-23 08:16:46 UTC (rev 9831) @@ -4,8 +4,11 @@ remove lintian warning. * debian/control: Change section for libplplot9-java to match override in debian archives. Fixes lintian warning + * debian/patches/15_octave-toggle-plplot-use.diff: + New patch ported from upstream to fix namespace clash in the + toggle_plplot_use.m script. (closes: #525198) - -- Andrew Ross <and...@us...> Thu, 16 Apr 2009 15:16:07 +0100 + -- Andrew Ross <and...@us...> Thu, 23 Apr 2009 09:13:07 +0100 plplot (5.9.2-3) UNRELEASED; urgency=low Added: trunk/debian/patches/15_octave-toggle-plplot-use.diff =================================================================== --- trunk/debian/patches/15_octave-toggle-plplot-use.diff (rev 0) +++ trunk/debian/patches/15_octave-toggle-plplot-use.diff 2009-04-23 08:16:46 UTC (rev 9831) @@ -0,0 +1,20 @@ +# Patch from upstream svn to rename the variable i to use_plplot_i in +# the toggle_plplot_use script to prevent namespace clash with the +# octave constant i = sqrt(-1). + +diff -ur plplot-5.9.2-orig/bindings/octave/PLplot/toggle_plplot_use.m plplot-5.9.2/bindings/octave/PLplot/toggle_plplot_use.m +--- plplot-5.9.2-orig/bindings/octave/PLplot/toggle_plplot_use.m (revision 9829) ++++ plplot-5.9.2/bindings/octave/PLplot/toggle_plplot_use.m (working copy) +@@ -33,9 +33,9 @@ + + use_plplot_path = plplot_octave_path; + plplot_path_to_remove = split(genpath(use_plplot_path),pathsep); +-for i=1:size(plplot_path_to_remove)(1) +- if (findstr(path,deblank(plplot_path_to_remove(i,:))) > 0) +- rmpath(deblank(plplot_path_to_remove(i,:))); ++for use_plplot_i=1:size(plplot_path_to_remove)(1) ++ if (findstr(path,deblank(plplot_path_to_remove(use_plplot_i,:))) > 0) ++ rmpath(deblank(plplot_path_to_remove(use_plplot_i,:))); + endif + endfor + Property changes on: trunk/debian/patches/15_octave-toggle-plplot-use.diff ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/debian/patches/series =================================================================== --- trunk/debian/patches/series 2009-04-23 07:59:38 UTC (rev 9830) +++ trunk/debian/patches/series 2009-04-23 08:16:46 UTC (rev 9831) @@ -4,3 +4,4 @@ 11_minus-sign-manpage.diff 13_fix-kfreeBSD-build.diff 14_octave-3.0-fixes.diff +15_octave-toggle-plplot-use.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-04-23 11:18:51
|
Revision: 9833 http://plplot.svn.sourceforge.net/plplot/?rev=9833&view=rev Author: andrewross Date: 2009-04-23 11:18:49 +0000 (Thu, 23 Apr 2009) Log Message: ----------- Remove obsolete postinst / prerm scripts. Index updates for info files are now automatically triggered by dpkg. Modified Paths: -------------- trunk/debian/changelog Removed Paths: ------------- trunk/debian/plplot-doc.postinst trunk/debian/plplot-doc.prerm Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-04-23 09:11:28 UTC (rev 9832) +++ trunk/debian/changelog 2009-04-23 11:18:49 UTC (rev 9833) @@ -8,6 +8,10 @@ * debian/patches/15_octave-toggle-plplot-use.diff: New patch ported from upstream to fix namespace clash in the toggle_plplot_use.m script. (closes: #525198) + * debian/plplot-doc.postinst, debian/plplot-doc.prerm: + Remove obsolete scripts. Handling of index updates for info + file installs is now done automatically by dpkg. Removes + lintian warning. * debian/control.in: Update package descriptions to fix lintian warnings. Deleted: trunk/debian/plplot-doc.postinst =================================================================== --- trunk/debian/plplot-doc.postinst 2009-04-23 09:11:28 UTC (rev 9832) +++ trunk/debian/plplot-doc.postinst 2009-04-23 11:18:49 UTC (rev 9833) @@ -1,12 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "configure" ]; then - install-info --quiet --menuentry="PLplot" \ - --description="Scientific plotting library" \ - --section math Math /usr/share/info/plplotdoc.info -fi - -#DEBHELPER# - Deleted: trunk/debian/plplot-doc.prerm =================================================================== --- trunk/debian/plplot-doc.prerm 2009-04-23 09:11:28 UTC (rev 9832) +++ trunk/debian/plplot-doc.prerm 2009-04-23 11:18:49 UTC (rev 9833) @@ -1,22 +0,0 @@ -#! /bin/sh -# prerm script for plplot-doc - -set -e - -case "$1" in - remove|upgrade|deconfigure) - install-info --quiet --remove /usr/share/info/plplotdoc.info - ;; - failed-upgrade) - ;; - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2009-04-23 21:45:36
|
Revision: 9837 http://plplot.svn.sourceforge.net/plplot/?rev=9837&view=rev Author: rlaboiss Date: 2009-04-23 21:45:26 +0000 (Thu, 23 Apr 2009) Log Message: ----------- Build-depend on debhelper >= 7 Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-04-23 20:56:23 UTC (rev 9836) +++ trunk/debian/changelog 2009-04-23 21:45:26 UTC (rev 9837) @@ -1,15 +1,15 @@ plplot (5.9.2-2) UNRELEASED; urgency=low [ Andrew Ross ] - * debian/compat: Update compatibility version for debhelper to - remove lintian warning. + * debian/compat, debian/control.in: Update compatibility version for + debhelper to remove lintian warning. * debian/control: Change section for libplplot9-java to match override in debian archives. Fixes lintian warning * debian/patches/15_octave-toggle-plplot-use.diff: New patch ported from upstream to fix namespace clash in the toggle_plplot_use.m script. (closes: #525198) * debian/plplot-doc.postinst, debian/plplot-doc.prerm: - Remove obsolete scripts. Handling of index updates for info + Remove obsolete scripts. Handling of index updates for info file installs is now done automatically by dpkg. Removes lintian warning. Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2009-04-23 20:56:23 UTC (rev 9836) +++ trunk/debian/control.in 2009-04-23 21:45:26 UTC (rev 9837) @@ -4,7 +4,7 @@ Maintainer: Andrew Ross <and...@us...> Uploaders: Rafael Laboissiere <ra...@de...> Standards-Version: 3.8.0 -Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38), g++-4.1 [arm], +Build-Depends: cmake (>= 2.4.5), debhelper (>= 7), g++-4.1 [arm], tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2), libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2009-04-23 21:52:28
|
Revision: 9838 http://plplot.svn.sourceforge.net/plplot/?rev=9838&view=rev Author: rlaboiss Date: 2009-04-23 21:52:26 +0000 (Thu, 23 Apr 2009) Log Message: ----------- Bump Standards-Version to 3.8.1 This version of the Policy requires that packages using a patch system to alter the upstream sources document it in the debian/README.source file. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in Added Paths: ----------- trunk/debian/README.source Added: trunk/debian/README.source =================================================================== --- trunk/debian/README.source (rev 0) +++ trunk/debian/README.source 2009-04-23 21:52:26 UTC (rev 9838) @@ -0,0 +1,8 @@ +README.source for plplot +======================== + +This package uses quilt to manage all modifications to the upstream sources. +See `/usr/share/doc/quilt/README.source' to get more information on how to +use it. + + -- Rafael Laboissiere <ra...@de...> Thu, 23 Apr 2009 09:13:07 +0100 Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-04-23 21:45:26 UTC (rev 9837) +++ trunk/debian/changelog 2009-04-23 21:52:26 UTC (rev 9838) @@ -28,6 +28,8 @@ [ Rafael Laboissiere ] * debian/control (libplplot-dev): Depend on libplplot-fortran9 libplplot-ada, avoiding dangling symlinks (closes: #522125) + * debian/control.in: Bump Standards-Version to 3.8.1 (add needed file + debian/README.source explaining the patch system) -- Andrew Ross <and...@us...> Thu, 23 Apr 2009 09:13:07 +0100 Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2009-04-23 21:45:26 UTC (rev 9837) +++ trunk/debian/control.in 2009-04-23 21:52:26 UTC (rev 9838) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Andrew Ross <and...@us...> Uploaders: Rafael Laboissiere <ra...@de...> -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Build-Depends: cmake (>= 2.4.5), debhelper (>= 7), g++-4.1 [arm], tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-05-28 09:23:45
|
Revision: 10008 http://plplot.svn.sourceforge.net/plplot/?rev=10008&view=rev Author: andrewross Date: 2009-05-28 09:23:39 +0000 (Thu, 28 May 2009) Log Message: ----------- Fix debian bug which prevents libplplot-dev installing on platforms where ada is not available. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-05-27 18:01:22 UTC (rev 10007) +++ trunk/debian/changelog 2009-05-28 09:23:39 UTC (rev 10008) @@ -1,3 +1,12 @@ +plplot (5.9.2-3) unstable; urgency=low + + [ Andrew Ross ] + * debian/control.in: Ensure libplplot-dev only depends on + libplplot-ada for architectures where that exists. + (closes: #530847) + + -- Andrew Ross <and...@us...> Thu, 28 May 2009 10:22:07 +0100 + plplot (5.9.2-2) unstable; urgency=low [ Andrew Ross ] Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2009-05-27 18:01:22 UTC (rev 10007) +++ trunk/debian/control.in 2009-05-28 09:23:39 UTC (rev 10008) @@ -48,7 +48,8 @@ Recommends: pkg-config Depends: libplplot9 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}), plplot9-driver-gnome2, - libplplot-fortran9 (= ${binary:Version}), libplplot-ada (= ${binary:Version}) + libplplot-fortran9 (= ${binary:Version}), + libplplot-ada (= ${binary:Version}) [!alpha !arm !armeb !armel !mips !mipsel !kfreebsd-amd64] Description: Scientific plotting library (development files) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-08-20 12:41:56
|
Revision: 10307 http://plplot.svn.sourceforge.net/plplot/?rev=10307&view=rev Author: andrewross Date: 2009-08-20 12:41:42 +0000 (Thu, 20 Aug 2009) Log Message: ----------- Fix debian patch to remove quilt warning. Modified Paths: -------------- trunk/debian/changelog trunk/debian/patches/02_unset-python-path.diff Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-08-20 12:14:17 UTC (rev 10306) +++ trunk/debian/changelog 2009-08-20 12:41:42 UTC (rev 10307) @@ -1,3 +1,10 @@ +plplot (5.9.2-4) unstable; urgency=low + + * debian/patches/02_unset-python-path.diff: Fix offset in patch + to remove quilt warning. (closes: #538533) + + -- Andrew Ross <and...@us...> Thu, 20 Aug 2009 13:40:07 +0100 + plplot (5.9.2-3) unstable; urgency=low * debian/control.in: Ensure libplplot-dev only depends on Modified: trunk/debian/patches/02_unset-python-path.diff =================================================================== --- trunk/debian/patches/02_unset-python-path.diff 2009-08-20 12:14:17 UTC (rev 10306) +++ trunk/debian/patches/02_unset-python-path.diff 2009-08-20 12:41:42 UTC (rev 10307) @@ -9,7 +9,7 @@ --- plplot/examples/python/CMakeLists.txt.old +++ plplot/examples/python/CMakeLists.txt -@@ -147,7 +147,7 @@ +@@ -161,7 +161,7 @@ @ONLY ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-09-23 13:17:25
|
Revision: 10460 http://plplot.svn.sourceforge.net/plplot/?rev=10460&view=rev Author: andrewross Date: 2009-09-23 13:16:55 +0000 (Wed, 23 Sep 2009) Log Message: ----------- Fix several bugs in the Debian packages. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-09-23 10:13:35 UTC (rev 10459) +++ trunk/debian/changelog 2009-09-23 13:16:55 UTC (rev 10460) @@ -2,8 +2,15 @@ * debian/patches/02_unset-python-path.diff: Fix offset in patch to remove quilt warning. (closes: #538533) + * debian/control.in: + + Remove arm build dependency on g++-4.1. (closes: #533806) + + Update build dependency on tcl / tk to 8.5 (compatible with + latest itcl). (closes: #545302) + + Add dpkg (>=1.15.4) dependency for plplot-doc to correctly + handle info install triggers. Fixes lintian warning. + + Bump debian standards version to 3.8.3. - -- Andrew Ross <and...@us...> Thu, 20 Aug 2009 13:40:07 +0100 + -- Andrew Ross <and...@us...> Wed, 23 Aug 2009 12:05:07 +0100 plplot (5.9.2-3) unstable; urgency=low Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2009-09-23 10:13:35 UTC (rev 10459) +++ trunk/debian/control.in 2009-09-23 13:16:55 UTC (rev 10460) @@ -3,9 +3,9 @@ Priority: optional Maintainer: Andrew Ross <and...@us...> Uploaders: Rafael Laboissiere <ra...@de...> -Standards-Version: 3.8.1 -Build-Depends: cmake (>= 2.4.5), debhelper (>= 7), g++-4.1 [arm], - tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, +Standards-Version: 3.8.3 +Build-Depends: cmake (>= 2.4.5), debhelper (>= 7), + tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2), libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, libgnomeprintui2.2-dev, libgnomeui-dev, @@ -17,7 +17,7 @@ fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel !kfreebsd-amd64] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex -Build-Conflicts: libplplot5, octave2.1-headers, tcl8.5, tcl8.5-dev +Build-Conflicts: libplplot5, octave2.1-headers XS-Python-Version: all Homepage: http://www.plplot.org Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian @@ -322,6 +322,7 @@ Architecture: all Section: doc Suggests: libplplot-dev +Depends: dpkg (>= 1.15.4) Description: Documentation for PLplot, a plotting library PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-11-23 21:51:39
|
Revision: 10625 http://plplot.svn.sourceforge.net/plplot/?rev=10625&view=rev Author: andrewross Date: 2009-11-23 21:51:24 +0000 (Mon, 23 Nov 2009) Log Message: ----------- Fix spelling mistake in debian control.in file. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-11-23 05:38:54 UTC (rev 10624) +++ trunk/debian/changelog 2009-11-23 21:51:24 UTC (rev 10625) @@ -9,6 +9,7 @@ + Add dpkg (>=1.15.4) dependency for plplot-doc to correctly handle info install triggers. Fixes lintian warning. + Bump debian standards version to 3.8.3. + + Fix typo in java bindings package description. (closes: #557677) -- Andrew Ross <and...@us...> Wed, 23 Aug 2009 12:05:07 +0100 Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2009-11-23 05:38:54 UTC (rev 10624) +++ trunk/debian/control.in 2009-11-23 21:51:24 UTC (rev 10625) @@ -109,7 +109,7 @@ handful of function calls is typically required. For more advanced use, virtually all aspects of plotting are configurable. . - This packages contains the Java bindings for PLplot. + This package contains the Java bindings for PLplot. :] Package: libcsiro0 Architecture: any This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-12-01 07:25:03
|
Revision: 10654 http://plplot.svn.sourceforge.net/plplot/?rev=10654&view=rev Author: andrewross Date: 2009-12-01 07:24:53 +0000 (Tue, 01 Dec 2009) Log Message: ----------- Update build-dependencies and rules for debian packages. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in trunk/debian/rules Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-12-01 05:46:38 UTC (rev 10653) +++ trunk/debian/changelog 2009-12-01 07:24:53 UTC (rev 10654) @@ -10,6 +10,11 @@ handle info install triggers. Fixes lintian warning. + Bump debian standards version to 3.8.3. + Fix typo in java bindings package description. (closes: #557677) + * debian/control.in, debian/rules: + + Update java to build-dep on default-jdk and runtime depend on default-jre + which should work for all architectures. + + Update ada packages so built on all architectures except armel where gnat + seems to be unavailable. (closes: #544187) -- Andrew Ross <and...@us...> Wed, 23 Aug 2009 12:05:07 +0100 Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2009-12-01 05:46:38 UTC (rev 10653) +++ trunk/debian/control.in 2009-12-01 07:24:53 UTC (rev 10654) @@ -13,7 +13,7 @@ libltdl3-dev, pkg-config, quilt, slice, python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), - python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk-builddep [!alpha !arm !hppa !hurd-i386], + python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk, fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel !kfreebsd-amd64] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex @@ -96,10 +96,10 @@ This package contains the Fortran 77 and Fortran 95 bindings for PLplot. -[JAVA:Package: libplplot9-java +Package: libplplot9-java Architecture: any Section: java -Depends: java-gcj-compat, ${shlibs:Depends} +Depends: default-jre, ${shlibs:Depends} Description: Scientific plotting library (Java bindings) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -110,7 +110,7 @@ virtually all aspects of plotting are configurable. . This package contains the Java bindings for PLplot. -:] + Package: libcsiro0 Architecture: any Section: libs Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2009-12-01 05:46:38 UTC (rev 10653) +++ trunk/debian/rules 2009-12-01 07:24:53 UTC (rev 10654) @@ -32,21 +32,14 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) -# Disable java and ada build on arm - problems with java-gcj-compat-dev -# at the moment. Also gnat not available on arm, mips, and mipsel. +# Disable Ada build on armel - gnat not available on armel at the moment. -ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:alpha:arm:armeb:armel:mips:mipsel:kfreebsd-amd64:)) +ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:armel:)) BUILD_ADA = no else BUILD_ADA = yes endif -ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:alpha:arm:hppa:hurd-i386:)) -BUILD_JAVA = no -else -BUILD_JAVA = yes -endif - # Configure options ifeq ($(BUILD_ADA),yes) @@ -55,14 +48,10 @@ ADA_OPTIONS = -DENABLE_ada=OFF endif -ifeq ($(BUILD_JAVA),yes) JAVA_OPTIONS = \ -DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \ -DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \ -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar -else -JAVA_OPTIONS = -DENABLE_java=OFF -endif CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ @@ -76,18 +65,10 @@ control: ifeq ($(BUILD_ADA),no) -ifeq ($(BUILD_JAVA),no) - slice -o UNDEF:debian/control debian/control.in -else - slice -o UNDEF+JAVA:debian/control debian/control.in -endif -else -ifeq ($(BUILD_JAVA),no) slice -o UNDEF+ADA:debian/control debian/control.in else - slice -o UNDEF+JAVA+ADA:debian/control debian/control.in + slice -o UNDEF+ADA:debian/control debian/control.in endif -endif config: config-stamp config-stamp: control @@ -133,9 +114,7 @@ --no-package=libplplot9-java --no-package=libplplot-ada dh_movefiles --package=python-plplot dh_movefiles --package=plplot-bin -ifeq ($(BUILD_JAVA),yes) dh_movefiles --package=libplplot9-java -endif ifeq ($(BUILD_ADA),yes) dh_movefiles --package=libplplot-ada dh_movefiles --package=libplplot-dev usr/share/ada @@ -170,11 +149,9 @@ ln -s $(libpkg) $(debdoc)/$$i ; \ done -ifeq ($(BUILD_JAVA),yes) ln -s $(libpkg) $(debdoc)/libplplot9-java mv $(debshr)/java/plplot.jar $(debshr)/java/plplot-$(version).jar ( cd $(debshr)/java ; ln -s plplot-$(version).jar plplot.jar ) -endif ifeq ($(BUILD_ADA),yes) ln -s $(libpkg) $(debdoc)/libplplot-ada This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2010-01-19 00:11:37
|
Revision: 10757 http://plplot.svn.sourceforge.net/plplot/?rev=10757&view=rev Author: andrewross Date: 2010-01-19 00:11:03 +0000 (Tue, 19 Jan 2010) Log Message: ----------- Update debian build to backport wxwidget fix for cmake 2.8.0 from svn. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in trunk/debian/patches/series Added Paths: ----------- trunk/debian/patches/16_wxwidget-with-cmake-2.8.diff Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2010-01-15 19:38:54 UTC (rev 10756) +++ trunk/debian/changelog 2010-01-19 00:11:03 UTC (rev 10757) @@ -17,6 +17,9 @@ which should work for all architectures. + Update ada packages so built on all architectures except armel where gnat seems to be unavailable. (closes: #544187) + * debian/patches/16_wxwidget-with-cmake-2.8.diff: New patch ported from + upstream to fix wxwidget build with cmake 2.8.0. + * debian/control.in: Bump wxgtk version to 2.8. Require cmake 2.8.0 to build. -- Andrew Ross <and...@us...> Wed, 23 Aug 2009 12:05:07 +0100 Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2010-01-15 19:38:54 UTC (rev 10756) +++ trunk/debian/control.in 2010-01-19 00:11:03 UTC (rev 10757) @@ -4,14 +4,14 @@ Maintainer: Andrew Ross <and...@us...> Uploaders: Rafael Laboissiere <ra...@de...> Standards-Version: 3.8.3 -Build-Depends: cmake (>= 2.4.5), debhelper (>= 7), +Build-Depends: cmake (>= 2.8.0), debhelper (>= 7), tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2), libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, libgnomeprintui2.2-dev, libgnomeui-dev, m4, libqhull-dev (>= 2003.1-8), libxml-parser-perl, libxml-dom-perl, libltdl3-dev, pkg-config, quilt, slice, - python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, + python-gtk2-dev, libwxgtk2.8-dev, python-gnome2-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk, fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel !kfreebsd-amd64] Added: trunk/debian/patches/16_wxwidget-with-cmake-2.8.diff =================================================================== --- trunk/debian/patches/16_wxwidget-with-cmake-2.8.diff (rev 0) +++ trunk/debian/patches/16_wxwidget-with-cmake-2.8.diff 2010-01-19 00:11:03 UTC (rev 10757) @@ -0,0 +1,71 @@ +# Patch from upstream to ensure wxwidgets support works with cmake 2.8.0 + +diff -ur plplot-5.9.2-orig/cmake/modules/wxwidgets.cmake plplot-5.9.2/cmake/modules/wxwidgets.cmake +--- plplot-5.9.2.orig/cmake/modules/wxwidgets.cmake 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/cmake/modules/wxwidgets.cmake 2010-01-18 23:52:40.000000000 +0000 +@@ -58,12 +58,21 @@ + wxwidgets_COMPILE_FLAGS + "-I${wxWidgets_INCLUDE_DIRS}" + ) +- # For case (cvs version of CMake as of 2008-03-23, but not cmake-2.4.8) +- # when wxWidgets_DEFINITIONS is a list. ++ string(REGEX REPLACE ";" " -D" ++ wxWidgets_DEFINITIONS_wD ++ "-D${wxWidgets_DEFINITIONS}" ++ ) ++ set(wxWidgets_DEFINITIONS_DEBUG_wD "") ++ if(wxWidgets_DEFINITIONS_DEBUG) ++ string(REGEX REPLACE ";" " -D" ++ wxWidgets_DEFINITIONS_DEBUG_wD ++ "-D${wxWidgets_DEFINITIONS_DEBUG}" ++ ) ++ endif(wxWidgets_DEFINITIONS_DEBUG) + string(REGEX REPLACE ";" " " + wxwidgets_COMPILE_FLAGS + ${wxwidgets_COMPILE_FLAGS} +- " ${wxWidgets_DEFINITIONS}" ++ " ${wxWidgets_DEFINITIONS_wD} ${wxWidgets_DEFINITIONS_DEBUG_wD}" + ) + # Convert wxWidgets_LIBRARIES to full pathname form. + cmake_link_flags(wxwidgets_LINK_FLAGS "${wxWidgets_LIBRARIES}") +diff -ur plplot-5.9.2.orig/bindings/wxwidgets/CMakeLists.txt plplot-5.9.2/bindings/wxwidgets/CMakeLists.txt +--- plplot-5.9.2.orig/bindings/wxwidgets/CMakeLists.txt 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/wxwidgets/CMakeLists.txt 2010-01-18 23:55:55.000000000 +0000 +@@ -54,9 +54,18 @@ + endif(BUILD_SHARED_LIBS) + + INCLUDE_DIRECTORIES( ${wxWidgets_INCLUDE_DIRS} ) +- ADD_DEFINITIONS( ${wxWidgets_DEFINITIONS} ) + +- target_link_libraries( ++ IF(wxWidgets_DEFINITIONS) ++ SET_PROPERTY(DIRECTORY APPEND ++ PROPERTY COMPILE_DEFINITIONS ${wxWidgets_DEFINITIONS}) ++ ENDIF(wxWidgets_DEFINITIONS) ++ ++ IF(wxWidgets_DEFINITIONS_DEBUG) ++ SET_PROPERTY(DIRECTORY APPEND ++ PROPERTY COMPILE_DEFINITIONS_DEBUG ${wxWidgets_DEFINITIONS_DEBUG}) ++ ENDIF(wxWidgets_DEFINITIONS_DEBUG) ++ ++target_link_libraries( + plplotwxwidgets${LIB_TAG} + plplotcxx${LIB_TAG} + ${wxwidgets_LINK_FLAGS} +@@ -101,9 +110,14 @@ + endif(LIB_TAG) + + # Determine libplplotwxwidgets${LIB_TAG}_COMPILE_FLAGS +- STRING(REGEX REPLACE ";" " " ++ set(wxWidgets_DEFINITIONS_all "${wxWidgets_DEFINITIONS}") ++ if(wxWidgets_DEFINITIONS_DEBUG) ++ set(wxWidgets_DEFINITIONS_all "${wxWidgets_DEFINITIONS};${wxWidgets_DEFINITIONS_DEBUG}") ++ endif(wxWidgets_DEFINITIONS_DEBUG) ++ ++ STRING(REGEX REPLACE ";" " -D" + libplplotwxwidgets${LIB_TAG}_COMPILE_FLAGS +- "${wxWidgets_DEFINITIONS}" ++ "-D${wxWidgets_DEFINITIONS_all}" + ) + STRING(REGEX REPLACE ";" " -I" + wxWidgets_IFLAGS Property changes on: trunk/debian/patches/16_wxwidget-with-cmake-2.8.diff ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/debian/patches/series =================================================================== --- trunk/debian/patches/series 2010-01-15 19:38:54 UTC (rev 10756) +++ trunk/debian/patches/series 2010-01-19 00:11:03 UTC (rev 10757) @@ -5,3 +5,4 @@ 13_fix-kfreeBSD-build.diff 14_octave-3.0-fixes.diff 15_octave-toggle-plplot-use.diff +16_wxwidget-with-cmake-2.8.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2010-05-19 10:21:43
|
Revision: 11012 http://plplot.svn.sourceforge.net/plplot/?rev=11012&view=rev Author: andrewross Date: 2010-05-19 10:21:36 +0000 (Wed, 19 May 2010) Log Message: ----------- Merge in debian changes from v5_9_5_debian branch. Update ready for 5.9.6 release. Modified Paths: -------------- trunk/debian/changelog trunk/debian/control.in trunk/debian/libplplot9.README.Debian trunk/debian/libplplot9.files trunk/debian/patches/02_unset-python-path.diff trunk/debian/patches/04_use-mkoctfile.diff trunk/debian/patches/07_octave_prune_examples.diff trunk/debian/patches/series trunk/debian/rules Removed Paths: ------------- trunk/debian/patches/00list trunk/debian/patches/01_check-for-octave2.9.dpatch trunk/debian/patches/02_unset-python-path.dpatch trunk/debian/patches/04_use-mkoctfile.dpatch trunk/debian/patches/07_octave_prune_examples.dpatch trunk/debian/patches/09_pdftex-EC-encoding.diff trunk/debian/patches/09_pdftex-EC-encoding.dpatch trunk/debian/patches/10_print-usage-octave-3.0.diff trunk/debian/patches/10_print-usage-octave-3.0.dpatch trunk/debian/patches/11_minus-sign-manpage.diff trunk/debian/patches/11_minus-sign-manpage.dpatch trunk/debian/patches/12_cmake-2.6-fixes.diff trunk/debian/patches/12_cmake-2.6-fixes.dpatch trunk/debian/patches/13_fix-kfreeBSD-build.diff trunk/debian/patches/14_octave-3.0-fixes.diff trunk/debian/patches/15_octave-toggle-plplot-use.diff trunk/debian/patches/16_wxwidget-with-cmake-2.8.diff trunk/debian/plplot9-driver-gnome2.files trunk/debian/python-plplot-gnome2.files Property Changed: ---------------- trunk/debian/ Property changes on: trunk/debian ___________________________________________________________________ Added: svn:mergeinfo + /branches/v5_9_5_debian/debian:10762-11010 Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/changelog 2010-05-19 10:21:36 UTC (rev 11012) @@ -1,5 +1,78 @@ -plplot (5.9.2-4) unstable; urgency=low +plplot (5.9.6-1) unstable; urgency=low + * New upstream release (closes: #564216). + * debian/patches/series: Remove the following patches which are included upstream + 11_minus-sign-manpage.diff + 16_wxwidget-with-cmake-2.8.diff + 17_fix_cmap_support.diff + and delete the patches from the patches directory. + + -- Andrew Ross <and...@us...> Wed, 19 May 2010 11:14:30 +0100 + +plplot (5.9.5-3) unstable; urgency=low + + * debian/control.in: + + Remove Rafael Laboissiere from the list of uploaders as he has + now retired from Debian (closes: #571874). + + Bump Debian standards version to 3.8.4. + * debian/control.in, debian/rules: Correctly disable ada support for + sh4 (closes: #572028). Enable ada support on armel now that gnat is + available (closes: #568451). + * debian/rules: Force tclsh to /usr/bin/tclsh8.5 - avoids problems if + tcl8.4 is also installed so /usr/bin/tclsh points to a different + version. + * debian/patches/17_fix_cmap_support.diff, debian/patches/series: Add + bug fix patch from upstream to fix cmap palette support. This fixes + the blank pages in the ada examples (and possibly user code). + + -- Andrew Ross <and...@us...> Tue, 01 Mar 2010 14:03:40 +0000 + +plplot (5.9.5-2) unstable; urgency=low + + * debian/control.in: Update to use octave3.2 - octave 3.0 will shortly be + dropped. + * debian/rules: explicitly enable jpeg, png and gif drivers as they are + now disabled by default. Eventually these will be replaced by cairo + and qt drivers, but keep them in for now until these packages have + settled down. + + -- Andrew Ross <and...@us...> Mon, 22 Feb 2010 12:50:40 +0000 + +plplot (5.9.5-1) UNRELEASED; urgency=low + + * New upstream release. + * debian/patches/series: Remove the following patches which are no longer + required as they are now included upstream + 13_fix-kfreeBSD-build.diff + 14_octave-3.0-fixes.diff + 15_octave-toggle-plplot-use.diff + and clean up directory by deleting unused patches. + * debian/patches/02_unset-python-path.diff, + debian/patches/04_use-mkoctfile.diff, + debian/patches/07_octave_prune_examples.diff, + debian/patches/16_wxwidget-with-cmake-2.8.diff: + + Update patches to work with plplot 5.9.5 + * debian/control.in, debian/rules: + + Properly enable support for ada on all architectures (except armel) + - build dependencies were not updated. + + Add sh4 to the list of architectures where gnat is not available and + so ada support is disabled. (closes: #562238) + + Drop the plplot9-driver-gnome2 package which is unmaintained + upstream and depends on libgnomeprintui-2.2 which is to be dropped + from Debian. (closes: #542577) + + Ensure ghostscript is installed in Build-Depends-Indep: since this + is needed to generate fonts for pdfjadetex, but is not automatically + pulled in. + * debian/rules: Remove setting of ITCL_LIBRARY which is not required + with latest version of itcl. + * debian/libplplot9.files: Ensures .pal palette files are correctly installed + * Rebuild package to use latest versions of gfortran (closes: #564065) + and python (closes: #562411) + + -- Andrew Ross <and...@us...> Mon, 25 Jan 2010 21:19:07 +0000 + +plplot (5.9.2-4) UNRELEASED; urgency=low + * debian/patches/02_unset-python-path.diff: Fix offset in patch to remove quilt warning. (closes: #538533) * debian/control.in: Modified: trunk/debian/control.in =================================================================== --- trunk/debian/control.in 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/control.in 2010-05-19 10:21:36 UTC (rev 11012) @@ -2,22 +2,19 @@ Section: math Priority: optional Maintainer: Andrew Ross <and...@us...> -Uploaders: Rafael Laboissiere <ra...@de...> -Standards-Version: 3.8.3 -Build-Depends: cmake (>= 2.8.0), debhelper (>= 7), +Standards-Version: 3.8.4 +Build-Depends: cmake (>= 2.6.3), debhelper (>= 7), tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev, - libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2), - libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, - libgnomeprintui2.2-dev, libgnomeui-dev, - m4, libqhull-dev (>= 2003.1-8), libxml-parser-perl, libxml-dom-perl, - libltdl3-dev, pkg-config, quilt, slice, - python-gtk2-dev, libwxgtk2.8-dev, python-gnome2-dev, + libxi-dev, gfortran, itk3-dev, octave3.2-headers, + libgd2-noxpm-dev | libgd2-xpm-dev, m4, libqhull-dev (>= 2003.1-8), + libxml-parser-perl, libxml-dom-perl, libltdl3-dev, pkg-config, + quilt, slice, python-gtk2-dev, libwxgtk2.8-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk, - fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel !kfreebsd-amd64] + fastjar, swig, gnat [!sh4] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, - docbook2x, opensp, jadetex -Build-Conflicts: libplplot5, octave2.1-headers + docbook2x, opensp, jadetex, ghostscript +Build-Conflicts: libplplot5, octave3.0-headers XS-Python-Version: all Homepage: http://www.plplot.org Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian @@ -28,7 +25,7 @@ Section: libs Conflicts: libplplot5, plplot (<< 5) Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: plplot9-driver-xwin, plplot9-driver-gnome2, plplot9-driver-gd, +Suggests: plplot9-driver-xwin, plplot9-driver-gd, plplot9-driver-cairo, plplot9-driver-wxwidgets, plplot-tcl Description: Scientific plotting library PLplot is relatively small, portable, freely distributable, and is rich @@ -47,7 +44,7 @@ Section: libdevel Recommends: pkg-config Depends: libplplot9 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, - libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}), plplot9-driver-gnome2, + libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}), libplplot-fortran9 (= ${binary:Version})[ADA:, libplplot-ada (= ${binary:Version}):], ${misc:Depends} Description: Scientific plotting library (development files) @@ -162,24 +159,6 @@ . This package provides the X11 driver module for PLplot. -Package: plplot9-driver-gnome2 -Architecture: any -Section: libs -Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} -Conflicts: plplot9-driver-gnome -Replaces: plplot9-driver-gnome -Description: Scientific plotting library (GNOME Canvas Widget driver) - PLplot is relatively small, portable, freely distributable, and is rich - enough to satisfy most users. It has a wide range of plot types including - line (linear, log), contour, 3D, fill, and almost 1000 characters - (including Greek and mathematical) in its extended font set. The package - is designed to make it easy to quickly get graphical output; only a - handful of function calls is typically required. For more advanced use, - virtually all aspects of plotting are configurable. - . - This package provides the GNOME Canvas Widget driver module for PLplot. - This package replaces the (now deprecated) plplot9-driver-gnome package. - Package: plplot9-driver-wxwidgets Architecture: any Section: libs Modified: trunk/debian/libplplot9.README.Debian =================================================================== --- trunk/debian/libplplot9.README.Debian 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/libplplot9.README.Debian 2010-05-19 10:21:36 UTC (rev 11012) @@ -30,8 +30,6 @@ * plplot9-driver-gd: Provides the GD driver module, which allows direct generation of PNG and JPEG files. - * plplot9-driver-gnome2: Provides the Gnome canvas driver module. - * plplot9-driver-cairo: Provides the cairo driver module. This uses the cairo library to produce higher quality text using truetype fonts. It produces postscript, pdf, svg, png, mem and X output. Modified: trunk/debian/libplplot9.files =================================================================== --- trunk/debian/libplplot9.files 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/libplplot9.files 2010-05-19 10:21:36 UTC (rev 11012) @@ -1,6 +1,7 @@ usr/lib usr/share/plplot*/*.map usr/share/plplot*/*.fnt +usr/share/plplot*/*.pal usr/share/doc/libplplot9 Deleted: trunk/debian/patches/00list =================================================================== --- trunk/debian/patches/00list 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/patches/00list 2010-05-19 10:21:36 UTC (rev 11012) @@ -1,8 +0,0 @@ -01_check-for-octave2.9 -02_unset-python-path -04_use-mkoctfile -07_octave_prune_examples -09_pdftex-EC-encoding -10_print-usage-octave-3.0 -11_minus-sign-manpage -12_cmake-2.6-fixes.dpatch Deleted: trunk/debian/patches/01_check-for-octave2.9.dpatch =================================================================== --- trunk/debian/patches/01_check-for-octave2.9.dpatch 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/patches/01_check-for-octave2.9.dpatch 2010-05-19 10:21:36 UTC (rev 11012) @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_check-for-octave2.9.dpatch by Rafael Laboissiere <ra...@de...> -## -## DP: Abort toggle_plplot_use if not using Octave 2.9 or newer - -@DPATCH@ - ---- plplot-5.6.0.rc1.5.6.1.orig/bindings/octave/PLplot/toggle_plplot_use.m -+++ plplot-5.6.0.rc1.5.6.1/bindings/octave/PLplot/toggle_plplot_use.m -@@ -20,6 +20,11 @@ - - 1; - -+## Abort if not using Octave 2.9 or newer -+if ! ((split (version , '.') (1, 1) == '2' && split (version , '.') (1, 2) == '9') || split (version , '.') (1, 1) > '2' ) -+ error ("This version of octave-plplot only works with Octave 2.9 or newer\n"); -+endif -+ - if ! exist ("use_plplot_state") - global use_plplot_state - use_plplot_state = "on"; Modified: trunk/debian/patches/02_unset-python-path.diff =================================================================== --- trunk/debian/patches/02_unset-python-path.diff 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/patches/02_unset-python-path.diff 2010-05-19 10:21:36 UTC (rev 11012) @@ -9,12 +9,12 @@ --- plplot/examples/python/CMakeLists.txt.old +++ plplot/examples/python/CMakeLists.txt -@@ -161,7 +161,7 @@ - @ONLY - ) - +@@ -195,7 +195,7 @@ + @ONLY + ) + -set(python_location1 ${PYTHON_INSTDIR}) +set(python_location1) set(python_location2) + set(python_location3) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake Deleted: trunk/debian/patches/02_unset-python-path.dpatch =================================================================== --- trunk/debian/patches/02_unset-python-path.dpatch 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/patches/02_unset-python-path.dpatch 2010-05-19 10:21:36 UTC (rev 11012) @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_unset-python-path.dpatch by <and...@us...> -## -## DP: No need to explicitly set python path with debian since the -## DP: default path is correct. This ensure the examples work with -## DP: multiple version of python. - -@DPATCH@ - ---- plplot/examples/python/CMakeLists.txt.old -+++ plplot/examples/python/CMakeLists.txt -@@ -147,7 +147,7 @@ - @ONLY - ) - --set(python_location1 ${PYTHON_INSTDIR}) -+set(python_location1) - set(python_location2) - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake Modified: trunk/debian/patches/04_use-mkoctfile.diff =================================================================== --- trunk/debian/patches/04_use-mkoctfile.diff 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/patches/04_use-mkoctfile.diff 2010-05-19 10:21:36 UTC (rev 11012) @@ -5,110 +5,81 @@ @DPATCH@ ---- plplot-5.8.0~RC1.orig/bindings/octave/CMakeLists.txt -+++ plplot-5.8.0~RC1/bindings/octave/CMakeLists.txt -@@ -133,64 +133,34 @@ - ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h - ) +--- plplot-5.9.5.orig/bindings/octave/CMakeLists.txt ++++ plplot-5.9.5/bindings/octave/CMakeLists.txt +@@ -134,49 +134,6 @@ + ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h + ) --# Build octave interface. --set(octave_interface_INCLUDE_PATHS --${CMAKE_SOURCE_DIR}/include --${CMAKE_BINARY_DIR} --${CMAKE_BINARY_DIR}/include --${CMAKE_CURRENT_SOURCE_DIR} --${CMAKE_CURRENT_BINARY_DIR} --${OCTAVE_INCLUDE_PATH} --) --include_directories(${octave_interface_INCLUDE_PATHS}) +- # Build octave interface. +- set(octave_interface_INCLUDE_PATHS +- ${CMAKE_SOURCE_DIR}/include +- ${CMAKE_BINARY_DIR} +- ${CMAKE_BINARY_DIR}/include +- ${CMAKE_CURRENT_SOURCE_DIR} +- ${CMAKE_CURRENT_BINARY_DIR} +- ${OCTAVE_INCLUDE_PATH} +- ) +- include_directories(${octave_interface_INCLUDE_PATHS}) - --add_library(plplot_octave MODULE ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc) --target_link_libraries( --plplot_octave --plplot${LIB_TAG} --"${OCTAVE_LIBRARIES}" --"${OCTINTERP_LIBRARIES}" --) +- add_library(plplot_octave MODULE ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc) +- target_link_libraries( +- plplot_octave +- plplot${LIB_TAG} +- "${OCTAVE_LIBRARIES}" +- "${OCTINTERP_LIBRARIES}" +- ) - --if(USE_RPATH) -- get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH) -- # (Reasonable) assumption here is that OCTAVE_LIBRARIES and -- # OCTINTERP_LIBRARIES have the same path. -- get_filename_component(OCTAVE_INSTALL_RPATH "${OCTAVE_LIBRARIES}" PATH) -- set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${OCTAVE_INSTALL_RPATH}) -- set_target_properties( -- plplot_octave -- PROPERTIES -- PREFIX "" -- SUFFIX ".oct" -- INSTALL_RPATH "${LIB_INSTALL_RPATH}" -- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}" -- ) --else(USE_RPATH) -- set_target_properties( -- plplot_octave -- PROPERTIES -- PREFIX "" -- SUFFIX ".oct" -- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}" -- ) --endif(USE_RPATH) +- if(USE_RPATH) +- get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH) +- # (Reasonable) assumption here is that OCTAVE_LIBRARIES and +- # OCTINTERP_LIBRARIES have the same path. +- get_filename_component(OCTAVE_INSTALL_RPATH "${OCTAVE_LIBRARIES}" PATH) +- set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${OCTAVE_INSTALL_RPATH}) +- set_target_properties( +- plplot_octave +- PROPERTIES +- PREFIX "" +- SUFFIX ".oct" +- INSTALL_RPATH "${LIB_INSTALL_RPATH}" +- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}" +- ) +- else(USE_RPATH) +- set_target_properties( +- plplot_octave +- PROPERTIES +- PREFIX "" +- SUFFIX ".oct" +- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}" +- ) +- endif(USE_RPATH) - - # Have to be specific about permissions for some reason (probably oct suffix). - set(PERM_MODULES - OWNER_READ - OWNER_WRITE - OWNER_EXECUTE - GROUP_READ - GROUP_EXECUTE - WORLD_READ - WORLD_EXECUTE - ) + # Have to be specific about permissions for some reason (probably oct suffix). + set(PERM_MODULES + OWNER_READ +@@ -188,9 +145,22 @@ + WORLD_EXECUTE + ) -+add_custom_command( -+OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct -+DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc -+COMMAND ${MKOCTFILE} ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc -+-I${CMAKE_CURRENT_BINARY_DIR} -I${CMAKE_SOURCE_DIR}/bindings/octave -+-I${CMAKE_SOURCE_DIR}/include --strip -+-L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} -+) ++ add_custom_command( ++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc ++ COMMAND ${MKOCTFILE} ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc ++ -I${CMAKE_CURRENT_BINARY_DIR} -I${CMAKE_SOURCE_DIR}/bindings/octave ++ -I${CMAKE_SOURCE_DIR}/include --strip ++ -L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ++ ) + -+add_custom_target( -+plplot_octave_oct_file ALL -+DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct -+) -+ - install( --TARGETS --plplot_octave --LIBRARY -+FILES -+${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct - DESTINATION ${OCTAVE_OCT_DIR} - PERMISSIONS ${PERM_MODULES} - ) -@@ -238,23 +208,4 @@ - DESTINATION ${PLPLOT_OCTAVE_DIR} - ) - --if(never) --add_custom_command( --OUTPUT --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o --COMMAND --touch --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o --DEPENDS --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc --) -- --# Link octave interface. --add_custom_target( --plplot_octave-libdir.oct ALL --DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o --) --endif(never) - endif(ENABLE_octave) ++ add_custom_target( ++ plplot_octave_oct_file ALL ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct ++ ) ++ ++ install( ++ FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct +- install(TARGETS plplot_octave +- EXPORT export_plplot +- LIBRARY + DESTINATION ${OCTAVE_OCT_DIR} + PERMISSIONS ${PERM_MODULES} + ) Deleted: trunk/debian/patches/04_use-mkoctfile.dpatch =================================================================== --- trunk/debian/patches/04_use-mkoctfile.dpatch 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/patches/04_use-mkoctfile.dpatch 2010-05-19 10:21:36 UTC (rev 11012) @@ -1,114 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_use-mkoctfile.dpatch by Rafael Laboissiere <ra...@de...> -## -## DP: Build plplot_octave.oct using mkoctfile and not as a shared library - -@DPATCH@ - ---- plplot-5.8.0~RC1.orig/bindings/octave/CMakeLists.txt -+++ plplot-5.8.0~RC1/bindings/octave/CMakeLists.txt -@@ -133,64 +133,34 @@ - ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h - ) - --# Build octave interface. --set(octave_interface_INCLUDE_PATHS --${CMAKE_SOURCE_DIR}/include --${CMAKE_BINARY_DIR} --${CMAKE_BINARY_DIR}/include --${CMAKE_CURRENT_SOURCE_DIR} --${CMAKE_CURRENT_BINARY_DIR} --${OCTAVE_INCLUDE_PATH} --) --include_directories(${octave_interface_INCLUDE_PATHS}) -- --add_library(plplot_octave MODULE ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc) --target_link_libraries( --plplot_octave --plplot${LIB_TAG} --"${OCTAVE_LIBRARIES}" --"${OCTINTERP_LIBRARIES}" --) -- --if(USE_RPATH) -- get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH) -- # (Reasonable) assumption here is that OCTAVE_LIBRARIES and -- # OCTINTERP_LIBRARIES have the same path. -- get_filename_component(OCTAVE_INSTALL_RPATH "${OCTAVE_LIBRARIES}" PATH) -- set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${OCTAVE_INSTALL_RPATH}) -- set_target_properties( -- plplot_octave -- PROPERTIES -- PREFIX "" -- SUFFIX ".oct" -- INSTALL_RPATH "${LIB_INSTALL_RPATH}" -- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}" -- ) --else(USE_RPATH) -- set_target_properties( -- plplot_octave -- PROPERTIES -- PREFIX "" -- SUFFIX ".oct" -- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}" -- ) --endif(USE_RPATH) -- - # Have to be specific about permissions for some reason (probably oct suffix). - set(PERM_MODULES - OWNER_READ - OWNER_WRITE - OWNER_EXECUTE - GROUP_READ - GROUP_EXECUTE - WORLD_READ - WORLD_EXECUTE - ) - -+add_custom_command( -+OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct -+DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc -+COMMAND ${MKOCTFILE} ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc -+-I${CMAKE_CURRENT_BINARY_DIR} -I${CMAKE_SOURCE_DIR}/bindings/octave -+-I${CMAKE_SOURCE_DIR}/include --strip -+-L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} -+) -+ -+add_custom_target( -+plplot_octave_oct_file ALL -+DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct -+) -+ - install( --TARGETS --plplot_octave --LIBRARY -+FILES -+${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct - DESTINATION ${OCTAVE_OCT_DIR} - PERMISSIONS ${PERM_MODULES} - ) -@@ -238,23 +208,4 @@ - DESTINATION ${PLPLOT_OCTAVE_DIR} - ) - --if(never) --add_custom_command( --OUTPUT --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o --COMMAND --touch --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o --DEPENDS --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc --) -- --# Link octave interface. --add_custom_target( --plplot_octave-libdir.oct ALL --DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o --) --endif(never) - endif(ENABLE_octave) Modified: trunk/debian/patches/07_octave_prune_examples.diff =================================================================== --- trunk/debian/patches/07_octave_prune_examples.diff 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/patches/07_octave_prune_examples.diff 2010-05-19 10:21:36 UTC (rev 11012) @@ -6,14 +6,14 @@ @DPATCH@ ---- plplot-5.8.0.orig/plplot_test/test_octave.sh.in 2007-10-16 07:57:38.000000000 +0100 -+++ plplot-5.8.0/plplot_test/test_octave.sh.in 2007-12-07 15:02:43.000000000 +0000 -@@ -62,7 +62,7 @@ - # These require octave-2.1.50 so comment out since not everybody has - # this. - -- for i=[1:7 8 9 13 15 16] ; -+ for i=[1:6 8 9 13 15 16] ; - if (verbose_test) - printf("p%d\n",i); - endif +--- plplot-5.9.5.orig/plplot_test/test_octave.sh.in 2007-10-16 07:57:38.000000000 +0100 ++++ plplot-5.9.5/plplot_test/test_octave.sh.in 2007-12-07 15:02:43.000000000 +0000 +@@ -54,7 +54,7 @@ + + # p7 works OK with plmeta, e.g., but not ps or psc. pleop/plbop issue? + +- for i=[1:7 8 9 13 15 16 21] ; ++ for i=[1:6 8 9 13 15 16 21] ; + if (verbose_test) + printf("p%d\n",i); + endif Deleted: trunk/debian/patches/07_octave_prune_examples.dpatch =================================================================== --- trunk/debian/patches/07_octave_prune_examples.dpatch 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/patches/07_octave_prune_examples.dpatch 2010-05-19 10:21:36 UTC (rev 11012) @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 07_octave_prune_examples.dpatch by Andrew Ross <and...@us...> -## -## DP: Don't run example p7 as part of ctest. It does not work well with postscript -## DP: and also fails on the alpha architecure, for reasons as yet unknown. - -@DPATCH@ - ---- plplot-5.8.0.orig/test/test_octave.sh.in 2007-10-16 07:57:38.000000000 +0100 -+++ plplot-5.8.0/test/test_octave.sh.in 2007-12-07 15:02:43.000000000 +0000 -@@ -45,7 +45,7 @@ - # These require octave-2.1.50 so comment out since not everybody has - # this. - --for i=[1:7 8 9 13 15 16]; -+for i=[1:6 8 9 13 15 16]; - figure(i,"$device",sprintf("${OUTPUT_DIR}/p%d.$dsuffix",i)); - feval(sprintf("p%d",i)) - closefig - Deleted: trunk/debian/patches/09_pdftex-EC-encoding.diff =================================================================== --- trunk/debian/patches/09_pdftex-EC-encoding.diff 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/patches/09_pdftex-EC-encoding.diff 2010-05-19 10:21:36 UTC (rev 11012) @@ -1,69 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 09_pdftex-EC-encoding by Rafael Laboissiere <ra...@de...> -## -## DP: Use ec.enc file instead of EC.enc, which does not exist in Debian - -@DPATCH@ - ---- plplot-5.8.0.orig/doc/docbook/src/pdftex.map -+++ plplot-5.8.0/doc/docbook/src/pdftex.map -@@ -1,31 +1,31 @@ --cmr10 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb -+cmr10 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb - cmmi10 <cmmi10.pfb - cmsy10 <cmsy10.pfb - cmsy9 <cmsy9.pfb --ectt0800 "ECEncoding ReEncodeFont"<EC.enc <cmtt8.pfb --ecit0900 "0.9 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmitt10.pfb --ecit1000 "ECEncoding ReEncodeFont"<EC.enc <cmitt10.pfb --tcrm0800 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb --ecrm0600 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb --ectt0900 "ECEncoding ReEncodeFont"<EC.enc <cmtt9.pfb --ecti1000 "ECEncoding ReEncodeFont"<EC.enc <cmti10.pfb --ecbx1000 "ECEncoding ReEncodeFont"<EC.enc <cmbx10.pfb --ecrb1000 "ECEncoding ReEncodeFont"<EC.enc <cmbx10.pfb --ecrm0800 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb --ecti0800 "ECEncoding ReEncodeFont"<EC.enc <cmti8.pfb --tcrm1000 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb --ecrm1000 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb --ecrm0900 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb --ecsx1000 "ECEncoding ReEncodeFont"<EC.enc <cmssbx10.pfb --ecss1000 "ECEncoding ReEncodeFont"<EC.enc <cmssbx10.pfb --ecsx1200 "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecss1200 "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecsx1440 "1.2 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecss1440 "1.2 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecsx1728 "1.44 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecss1728 "1.44 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecsx2074 "1.0165 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb --ecss2074 "1.0165 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb --ecsx2488 "1.4635 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb --ecss2488 "1.4635 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb --ectt1095 "1.095 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmtt10.pfb -+ectt0800 "ecEncoding ReEncodeFont"<ec.enc <cmtt8.pfb -+ecit0900 "0.9 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmitt10.pfb -+ecit1000 "ecEncoding ReEncodeFont"<ec.enc <cmitt10.pfb -+tcrm0800 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb -+ecrm0600 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb -+ectt0900 "ecEncoding ReEncodeFont"<ec.enc <cmtt9.pfb -+ecti1000 "ecEncoding ReEncodeFont"<ec.enc <cmti10.pfb -+ecbx1000 "ecEncoding ReEncodeFont"<ec.enc <cmbx10.pfb -+ecrb1000 "ecEncoding ReEncodeFont"<ec.enc <cmbx10.pfb -+ecrm0800 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb -+ecti0800 "ecEncoding ReEncodeFont"<ec.enc <cmti8.pfb -+tcrm1000 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb -+ecrm1000 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb -+ecrm0900 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb -+ecsx1000 "ecEncoding ReEncodeFont"<ec.enc <cmssbx10.pfb -+ecss1000 "ecEncoding ReEncodeFont"<ec.enc <cmssbx10.pfb -+ecsx1200 "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecss1200 "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecsx1440 "1.2 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecss1440 "1.2 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecsx1728 "1.44 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecss1728 "1.44 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecsx2074 "1.0165 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb -+ecss2074 "1.0165 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb -+ecsx2488 "1.4635 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb -+ecss2488 "1.4635 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb -+ectt1095 "1.095 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmtt10.pfb Deleted: trunk/debian/patches/09_pdftex-EC-encoding.dpatch =================================================================== --- trunk/debian/patches/09_pdftex-EC-encoding.dpatch 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/patches/09_pdftex-EC-encoding.dpatch 2010-05-19 10:21:36 UTC (rev 11012) @@ -1,69 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 09_pdftex-EC-encoding by Rafael Laboissiere <ra...@de...> -## -## DP: Use ec.enc file instead of EC.enc, which does not exist in Debian - -@DPATCH@ - ---- plplot-5.8.0.orig/doc/docbook/src/pdftex.map -+++ plplot-5.8.0/doc/docbook/src/pdftex.map -@@ -1,31 +1,31 @@ --cmr10 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb -+cmr10 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb - cmmi10 <cmmi10.pfb - cmsy10 <cmsy10.pfb - cmsy9 <cmsy9.pfb --ectt0800 "ECEncoding ReEncodeFont"<EC.enc <cmtt8.pfb --ecit0900 "0.9 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmitt10.pfb --ecit1000 "ECEncoding ReEncodeFont"<EC.enc <cmitt10.pfb --tcrm0800 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb --ecrm0600 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb --ectt0900 "ECEncoding ReEncodeFont"<EC.enc <cmtt9.pfb --ecti1000 "ECEncoding ReEncodeFont"<EC.enc <cmti10.pfb --ecbx1000 "ECEncoding ReEncodeFont"<EC.enc <cmbx10.pfb --ecrb1000 "ECEncoding ReEncodeFont"<EC.enc <cmbx10.pfb --ecrm0800 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb --ecti0800 "ECEncoding ReEncodeFont"<EC.enc <cmti8.pfb --tcrm1000 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb --ecrm1000 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb --ecrm0900 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb --ecsx1000 "ECEncoding ReEncodeFont"<EC.enc <cmssbx10.pfb --ecss1000 "ECEncoding ReEncodeFont"<EC.enc <cmssbx10.pfb --ecsx1200 "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecss1200 "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecsx1440 "1.2 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecss1440 "1.2 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecsx1728 "1.44 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecss1728 "1.44 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecsx2074 "1.0165 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb --ecss2074 "1.0165 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb --ecsx2488 "1.4635 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb --ecss2488 "1.4635 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb --ectt1095 "1.095 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmtt10.pfb -+ectt0800 "ecEncoding ReEncodeFont"<ec.enc <cmtt8.pfb -+ecit0900 "0.9 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmitt10.pfb -+ecit1000 "ecEncoding ReEncodeFont"<ec.enc <cmitt10.pfb -+tcrm0800 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb -+ecrm0600 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb -+ectt0900 "ecEncoding ReEncodeFont"<ec.enc <cmtt9.pfb -+ecti1000 "ecEncoding ReEncodeFont"<ec.enc <cmti10.pfb -+ecbx1000 "ecEncoding ReEncodeFont"<ec.enc <cmbx10.pfb -+ecrb1000 "ecEncoding ReEncodeFont"<ec.enc <cmbx10.pfb -+ecrm0800 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb -+ecti0800 "ecEncoding ReEncodeFont"<ec.enc <cmti8.pfb -+tcrm1000 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb -+ecrm1000 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb -+ecrm0900 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb -+ecsx1000 "ecEncoding ReEncodeFont"<ec.enc <cmssbx10.pfb -+ecss1000 "ecEncoding ReEncodeFont"<ec.enc <cmssbx10.pfb -+ecsx1200 "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecss1200 "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecsx1440 "1.2 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecss1440 "1.2 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecsx1728 "1.44 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecss1728 "1.44 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecsx2074 "1.0165 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb -+ecss2074 "1.0165 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb -+ecsx2488 "1.4635 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb -+ecss2488 "1.4635 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb -+ectt1095 "1.095 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmtt10.pfb Deleted: trunk/debian/patches/10_print-usage-octave-3.0.diff =================================================================== --- trunk/debian/patches/10_print-usage-octave-3.0.diff 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/patches/10_print-usage-octave-3.0.diff 2010-05-19 10:21:36 UTC (rev 11012) @@ -1,38 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_print-usage-octave-3.0.dpatch by Rafael Laboissiere <ra...@de...> -## -## DP: Use correct call to print_usage in wrap_octave.pl when compiling -## DP: against octave3.0 - -@DPATCH@ - ---- plplot-5.9.0.orig/bindings/octave/matwrap/wrap_octave.pl -+++ plplot-5.9.0/bindings/octave/matwrap/wrap_octave.pl -@@ -10,7 +10,7 @@ - # Copyright (c) 1997 Gary R. Holt. This is distributed under the terms of the - # perl artistic license (http://language.perl.com/misc/Artistic.html). - # --# Modifications 2007 Andrew Ross -+# Modifications 2007 Andrew Ross - # This version contains three local fixes for plplot - # 1) Change _dim function to allow a zero length array (required by plstyl) - # 2) Alter string to std::string for compatibility with gcc3.2 and later -@@ -18,6 +18,9 @@ - # from v2.1 to v2.9. This requires a file octave_version.pl which defines - # the variable octave_version. - # -+# Modifications 2008 Rafael Laboissiere -+# Change 3) above is adapted for Octave v3.0 -+ - - package octave; # Everything should be in this package. - -@@ -158,7 +161,7 @@ - # Permissible not to specify output args - # if there is only one. - @ver = split(/\./,$octave_version); -- if ($ver[0] >= 2 && $ver[1] >= 9) { -+ if ($ver[0] >= 3 || ($ver[0] >= 2 && $ver[1] >= 9)) { - $retstr .= (")\n" . - " {\n" . - " print_usage();\n" . # Give an error. Deleted: trunk/debian/patches/10_print-usage-octave-3.0.dpatch =================================================================== --- trunk/debian/patches/10_print-usage-octave-3.0.dpatch 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/patches/10_print-usage-octave-3.0.dpatch 2010-05-19 10:21:36 UTC (rev 11012) @@ -1,38 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_print-usage-octave-3.0.dpatch by Rafael Laboissiere <ra...@de...> -## -## DP: Use correct call to print_usage in wrap_octave.pl when compiling -## DP: against octave3.0 - -@DPATCH@ - ---- plplot-5.9.0.orig/bindings/octave/matwrap/wrap_octave.pl -+++ plplot-5.9.0/bindings/octave/matwrap/wrap_octave.pl -@@ -10,7 +10,7 @@ - # Copyright (c) 1997 Gary R. Holt. This is distributed under the terms of the - # perl artistic license (http://language.perl.com/misc/Artistic.html). - # --# Modifications 2007 Andrew Ross -+# Modifications 2007 Andrew Ross - # This version contains three local fixes for plplot - # 1) Change _dim function to allow a zero length array (required by plstyl) - # 2) Alter string to std::string for compatibility with gcc3.2 and later -@@ -18,6 +18,9 @@ - # from v2.1 to v2.9. This requires a file octave_version.pl which defines - # the variable octave_version. - # -+# Modifications 2008 Rafael Laboissiere -+# Change 3) above is adapted for Octave v3.0 -+ - - package octave; # Everything should be in this package. - -@@ -158,7 +161,7 @@ - # Permissible not to specify output args - # if there is only one. - @ver = split(/\./,$octave_version); -- if ($ver[0] >= 2 && $ver[1] >= 9) { -+ if ($ver[0] >= 3 || ($ver[0] >= 2 && $ver[1] >= 9)) { - $retstr .= (")\n" . - " {\n" . - " print_usage();\n" . # Give an error. Deleted: trunk/debian/patches/11_minus-sign-manpage.diff =================================================================== --- trunk/debian/patches/11_minus-sign-manpage.diff 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/patches/11_minus-sign-manpage.diff 2010-05-19 10:21:36 UTC (rev 11012) @@ -1,22 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 11_minus-sign-manpage.dpatch by Rafael Laboissiere <ra...@de...> -## -## DP: Escape "-" signs that mean the "minus" character - -@DPATCH@ - ---- plplot-5.9.0.orig/doc/plserver.1 -+++ plplot-5.9.0/doc/plserver.1 -@@ -14,10 +14,10 @@ - is just a front-end to the pltkMain() function. Structured along the - preferred lines for extended wish'es. It typically runs as a child - process from the PLplot TK driver to render output. Can use either TK --send or Tcl-DP RPC for communication, depending on how it is invoked. -+send or Tcl\-DP RPC for communication, depending on how it is invoked. - .PP - Note that plserver can be used the same way as wish or dpwish, as it --contains the functionality of each of these (except the -notk Tcl-DP -+contains the functionality of each of these (except the \-notk Tcl-DP - command-line option is not supported). - .SH "SEE ALSO" - See /usr/share/doc/plplot/plplot.ps.gz for more details. Deleted: trunk/debian/patches/11_minus-sign-manpage.dpatch =================================================================== --- trunk/debian/patches/11_minus-sign-manpage.dpatch 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/patches/11_minus-sign-manpage.dpatch 2010-05-19 10:21:36 UTC (rev 11012) @@ -1,22 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 11_minus-sign-manpage.dpatch by Rafael Laboissiere <ra...@de...> -## -## DP: Escape "-" signs that mean the "minus" character - -@DPATCH@ - ---- plplot-5.9.0.orig/doc/plserver.1 -+++ plplot-5.9.0/doc/plserver.1 -@@ -14,10 +14,10 @@ - is just a front-end to the pltkMain() function. Structured along the - preferred lines for extended wish'es. It typically runs as a child - process from the PLplot TK driver to render output. Can use either TK --send or Tcl-DP RPC for communication, depending on how it is invoked. -+send or Tcl\-DP RPC for communication, depending on how it is invoked. - .PP - Note that plserver can be used the same way as wish or dpwish, as it --contains the functionality of each of these (except the -notk Tcl-DP -+contains the functionality of each of these (except the \-notk Tcl-DP - command-line option is not supported). - .SH "SEE ALSO" - See /usr/share/doc/plplot/plplot.ps.gz for more details. Deleted: trunk/debian/patches/12_cmake-2.6-fixes.diff =================================================================== --- trunk/debian/patches/12_cmake-2.6-fixes.diff 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/patches/12_cmake-2.6-fixes.diff 2010-05-19 10:21:36 UTC (rev 11012) @@ -1,364 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 12_cmake-2.6-fixes.dpatch by <and...@us...> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix the build system to work with cmake 2.6. -## DP: This patch is extracted from the upstream SVN version of plplot. - -@DPATCH@ - -diff -ur plplot-5.9.0-orig/bindings/f95/CMakeLists.txt plplot-5.9.0/bindings/f95/CMakeLists.txt ---- plplot-5.9.0-orig/bindings/f95/CMakeLists.txt 2008-02-10 15:54:01.000000000 +0000 -+++ plplot-5.9.0/bindings/f95/CMakeLists.txt 2008-07-16 10:53:26.000000000 +0100 -@@ -141,14 +141,30 @@ - RUNTIME DESTINATION ${BIN_DIR} - ) - --# Yuk! All Makefiles are run from the top level build directory and --# so the f90 .mod files end up there rather than in the bindings/f95 --# directory. Ifort and pgf90 both have a -module command line option to --# override this location, but I'm not sure how portable that? --install( --FILES ${CMAKE_BINARY_DIR}/plplot.mod ${CMAKE_BINARY_DIR}/plplotp.mod ${CMAKE_BINARY_DIR}/plplot_flt.mod --DESTINATION ${F95_MOD_DIR} --) -+if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) -+ # Yuk! All Makefiles are run from the top level build directory and -+ # so the f90 .mod files end up there rather than in the bindings/f95 -+ # directory. Ifort and pgf90 both have a -module command line option to -+ # override this location, but I'm not sure how portable that? -+ install( -+ FILES -+ ${CMAKE_BINARY_DIR}/plplot.mod -+ ${CMAKE_BINARY_DIR}/plplotp.mod -+ ${CMAKE_BINARY_DIR}/plplot_flt.mod -+ DESTINATION ${F95_MOD_DIR} -+ ) -+else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) -+ # For the current cvs version of CMake, the module files are created by -+ # default during the library build in the more logical bindings/f95 -+ # directory. -+ install( -+ FILES -+ ${CMAKE_BINARY_DIR}/bindings/f95/plplot.mod -+ ${CMAKE_BINARY_DIR}/bindings/f95/plplotp.mod -+ ${CMAKE_BINARY_DIR}/bindings/f95/plplot_flt.mod -+ DESTINATION ${F95_MOD_DIR} -+ ) -+endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) - - # Configure pkg-config *.pc file corresponding to libplplotf95${LIB_TAG} - if(PKG_CONFIG_EXECUTABLE) -diff -ur plplot-5.9.0-orig/cmake/modules/cairo.cmake plplot-5.9.0/cmake/modules/cairo.cmake ---- plplot-5.9.0-orig/cmake/modules/cairo.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/cairo.cmake 2008-07-15 16:25:46.000000000 +0100 -@@ -97,13 +97,7 @@ - string(REGEX REPLACE ";" " " - cairo_COMPILE_FLAGS "${cflags} ${X11_COMPILE_FLAGS}" - ) -- # Convert X linker information to preferred CMake form before appending -- # it to already converted ${linkflags} -- cmake_link_flags( -- cairo_X_LINK_FLAGS -- "-L${X11_LIBRARY_DIR};${X11_LIBRARIES}" -- ) -- set(cairo_LINK_FLAGS ${linkflags} ${cairo_X_LINK_FLAGS}) -+ set(cairo_LINK_FLAGS ${linkflags} ${X11_LIBRARIES}) - else(PLD_xcairo AND X11_COMPILE_FLAGS) - message(STATUS - "WARNING: X windows not found. Setting xcairo driver to OFF." -diff -ur plplot-5.9.0-orig/cmake/modules/CMakeAdaCompiler.cmake.in plplot-5.9.0/cmake/modules/CMakeAdaCompiler.cmake.in ---- plplot-5.9.0-orig/cmake/modules/CMakeAdaCompiler.cmake.in 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/CMakeAdaCompiler.cmake.in 2008-07-15 15:47:30.000000000 +0100 -@@ -14,3 +14,4 @@ - ELSE(UNIX OR MINGW) - SET(CMAKE_Ada_OUTPUT_EXTENSION .obj) - ENDIF(UNIX OR MINGW) -+SET(CMAKE_Ada_OUTPUT_EXTENSION_REPLACE 1) -diff -ur plplot-5.9.0-orig/cmake/modules/CMakeAdaInformation.cmake plplot-5.9.0/cmake/modules/CMakeAdaInformation.cmake ---- plplot-5.9.0-orig/cmake/modules/CMakeAdaInformation.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/CMakeAdaInformation.cmake 2008-07-15 15:47:54.000000000 +0100 -@@ -41,9 +41,9 @@ - SET(CMAKE_SHARED_LIBRARY_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS}) - ENDIF(NOT CMAKE_SHARED_LIBRARY_Ada_FLAGS) - --IF(NOT CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) -+IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) - SET(CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}) --ENDIF(NOT CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) -+ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) - - IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG) - SET(CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG}) -@@ -53,6 +53,10 @@ - SET(CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP}) - ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP) - -+IF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG) -+ SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG}) -+ENDIF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG) -+ - # repeat for modules - IF(NOT CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS) - SET(CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS}) -@@ -70,6 +74,22 @@ - SET(CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP}) - ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP) - -+IF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG) -+ SET(CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG}) -+ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG) -+ -+IF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP) -+ SET(CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP}) -+ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP) -+ -+IF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG) -+ SET(CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG}) -+ENDIF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG) -+ -+IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH) -+ SET(CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH ${CMAKE_SHARED_LIBRARY_LINK_C_WITH_RUNTIME_PATH}) -+ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH) -+ - IF(NOT CMAKE_INCLUDE_FLAG_Ada) - SET(CMAKE_INCLUDE_FLAG_Ada ${CMAKE_INCLUDE_FLAG_C}) - ENDIF(NOT CMAKE_INCLUDE_FLAG_Ada) -@@ -85,7 +105,12 @@ - - SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.") - --SET (CMAKE_Ada_FLAGS "$ENV{FFLAGS} ${CMAKE_Ada_FLAGS_INIT}" CACHE STRING -+SET(CMAKE_Ada_FLAGS_INIT "$ENV{FFLAGS} ${CMAKE_Ada_FLAGS_INIT}") -+# avoid just having a space as the initial value for the cache -+IF(CMAKE_Ada_FLAGS_INIT STREQUAL " ") -+ SET(CMAKE_Ada_FLAGS_INIT) -+ENDIF(CMAKE_Ada_FLAGS_INIT STREQUAL " ") -+SET (CMAKE_Ada_FLAGS "${CMAKE_Ada_FLAGS_INIT}" CACHE STRING - "Flags for Ada compiler.") - - INCLUDE(CMakeCommonLanguageInclude) -diff -ur plplot-5.9.0-orig/cmake/modules/CMakeTestAdaCompiler.cmake plplot-5.9.0/cmake/modules/CMakeTestAdaCompiler.cmake ---- plplot-5.9.0-orig/cmake/modules/CMakeTestAdaCompiler.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/CMakeTestAdaCompiler.cmake 2008-07-15 15:48:05.000000000 +0100 -@@ -17,6 +17,8 @@ - - FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CMakeLists.txt - " -+# FIXME: This specific location currently needs to be changed whenever the -+# location of the experimental Ada support files is changed. - set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) - set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL \"\" FORCE) - project(test Ada) -diff -ur plplot-5.9.0-orig/cmake/modules/pkg-config.cmake plplot-5.9.0/cmake/modules/pkg-config.cmake ---- plplot-5.9.0-orig/cmake/modules/pkg-config.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/pkg-config.cmake 2008-07-15 16:27:07.000000000 +0100 -@@ -20,10 +20,10 @@ - # Module for determining pkg-config configuration variables related to the - # install-tree build of the examples. - # Also create useful macros called pkg_check_pkgconfig to emulate the --# pkgconfig macro using the pkg_check_modules macro, --# cmake_to_pkg_config_link_flags to process CMake link flags into -+# pkgconfig macro using the pkg_check_modules macro; -+# pkg_config_link_flags to process CMake link flags into - # pkg-config standard form for the configured output *.pc files, and --# pkg_config_to_cmake_link_flags to process input link flags delivered -+# cmake_link_flags to process input link flags delivered - # by pkg-config into CMake standard form. - - # The following variables are set: -@@ -155,8 +155,10 @@ - set(${_link_flags_out}) - else("${_link_flags_in}" STREQUAL ""}) - #message("(original link flags) = ${_link_flags_in}") -- # Convert link flags to a list. -- string(REGEX REPLACE " " ";" _link_flags_list "${_link_flags_in}") -+ # Convert link flags to a list. Note some link flags are blank-delimited -+ # (such as "-framework whatever") so preserve those by splitting into -+ # separate list elements only if the next element starts with a hyphen. -+ string(REGEX REPLACE " -" ";-" _link_flags_list "${_link_flags_in}") - # Extract list of directories from -L options. - list(LENGTH _link_flags_list _link_flags_length) - math(EXPR _link_flags_length "${_link_flags_length} - 1") -@@ -164,7 +166,7 @@ - set(_link_directory_list) - foreach(_list_index RANGE ${_link_flags_length}) - list(GET _link_flags_list ${_list_index} _list_element) -- string(REGEX REPLACE "^-L" "" _list_element1 ${_list_element}) -+ string(REGEX REPLACE "^-L" "" _list_element1 "${_list_element}") - if(_list_element STREQUAL "-L${_list_element1}") - list(APPEND _index_list ${_list_index}) - list(APPEND _link_directory_list ${_list_element1}) -@@ -186,7 +188,7 @@ - set(${_link_flags_out}) - foreach(_list_index RANGE ${_link_flags_length}) - list(GET _link_flags_list ${_list_index} _list_element) -- string(REGEX REPLACE "^-l" "" _list_element1 ${_list_element}) -+ string(REGEX REPLACE "^-l" "" _list_element1 "${_list_element}") - if(_list_element STREQUAL "-l${_list_element1}") - set(_library_pathname "_library_pathname-NOTFOUND") - find_library( -diff -ur plplot-5.9.0-orig/cmake/modules/tcl-related.cmake plplot-5.9.0/cmake/modules/tcl-related.cmake ---- plplot-5.9.0-orig/cmake/modules/tcl-related.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/tcl-related.cmake 2008-07-15 16:55:58.000000000 +0100 -@@ -135,12 +135,7 @@ - endif(ENABLE_tk AND NOT X11_FOUND) - if(ENABLE_tk) - set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR}) -- set( -- TK_LIBRARY -- ${TK_LIBRARY} -- -L${X11_LIBRARY_DIR} -- ${X11_LIBRARIES} -- ) -+ set(TK_LIBRARY ${TK_LIBRARY} ${X11_LIBRARIES}) - message(STATUS "TK_INCLUDE_PATH = ${TK_INCLUDE_PATH}") - message(STATUS "TK_LIBRARY = ${TK_LIBRARY}") - else(ENABLE_tk) -@@ -157,7 +152,7 @@ - message(STATUS "Looking for itk library") - set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0) - foreach(version ${itk_library_versions}) -- find_library(ITK_LIBRARY itk${version} ${TK_LIBRARY} -+ find_library(ITK_LIBRARY itk${version} - PATH_SUFFIXES itk${version}) - endforeach(version ${itk_library_versions}) - if(ITK_LIBRARY) -diff -ur plplot-5.9.0-orig/cmake/modules/wxwidgets.cmake plplot-5.9.0/cmake/modules/wxwidgets.cmake ---- plplot-5.9.0-orig/cmake/modules/wxwidgets.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/wxwidgets.cmake 2008-07-15 16:31:27.000000000 +0100 -@@ -23,8 +23,10 @@ - # PLD_wxwidgets - ON means the wxwidgets device is enabled. - # wxwidgets_COMPILE_FLAGS - individual COMPILE_FLAGS required to compile wxwidgets - # device. --# wxwidgets_LINK_FLAGS - individual LINK_FLAGS for dynamic wxwidgets device. --# DRIVERS_LINK_FLAGS - list of LINK_FLAGS for all static devices. -+# wxwidgets_LINK_FLAGS - list of full path names of libraries and -+# linker flags for dynamic wxwidgets device driver. -+# DRIVERS_LINK_FLAGS - list of device LINK_FLAGS for case -+# when ENABLE_DYNDRIVERS OFF. - - # Find wxWidgets needed for driver and bindings - if(PLD_wxwidgets) -@@ -39,11 +41,21 @@ - endif(PLD_wxwidgets) - - if(PLD_wxwidgets) -+ #message("wxWidgets_INCLUDE_DIRS = ${wxWidgets_INCLUDE_DIRS}") -+ #message("wxWidgets_DEFINITIONS = ${wxWidgets_DEFINITIONS}") - string(REGEX REPLACE ";" " -I" - wxwidgets_COMPILE_FLAGS -- "-I${wxWidgets_INCLUDE_DIRS} ${wxWidgets_DEFINITIONS}" -+ "-I${wxWidgets_INCLUDE_DIRS}" - ) -- set(wxwidgets_LINK_FLAGS ${wxWidgets_LIBRARIES}) -+ # For case (cvs version of CMake as of 2008-03-23, but not cmake-2.4.8) -+ # when wxWidgets_DEFINITIONS is a list. -+ string(REGEX REPLACE ";" " " -+ wxwidgets_COMPILE_FLAGS -+ ${wxwidgets_COMPILE_FLAGS} -+ " ${wxWidgets_DEFINITIONS}" -+ ) -+ # Convert wxWidgets_LIBRARIES to full pathname form. -+ cmake_link_flags(wxwidgets_LINK_FLAGS "${wxWidgets_LIBRARIES}") - if(WITH_FREETYPE) - set( - wxwidgets_COMPILE_FLAGS -diff -ur plplot-5.9.0-orig/cmake/modules/xwin.cmake plplot-5.9.0/cmake/modules/xwin.cmake ---- plplot-5.9.0-orig/cmake/modules/xwin.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/xwin.cmake 2008-07-15 16:31:23.000000000 +0100 -@@ -30,12 +30,7 @@ - if(PLD_xwin) - if(X11_FOUND) - set(xwin_COMPILE_FLAGS "${X11_COMPILE_FLAGS}") -- # N.B. X11_LIBRARY_DIR is used internally by FindX11.cmake but not -- # documented for external use so we may have to replace this -- # some day by the appropriate -- # "GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ??? PATH)" logic. -- # But this works for now.... -- set(xwin_LINK_FLAGS "-L${X11_LIBRARY_DIR} ${X11_LIBRARIES}") -+ set(xwin_LINK_FLAGS "${X11_LIBRARIES}") - option(HAVE_PTHREAD "Use pthreads with the xwin driver" OFF) - if(HAVE_PTHREAD) - find_package(Threads) -diff -ur plplot-5.9.0-orig/CMakeLists.txt plplot-5.9.0/CMakeLists.txt ---- plplot-5.9.0-orig/CMakeLists.txt 2008-02-10 15:54:06.000000000 +0000 -+++ plplot-5.9.0/CMakeLists.txt 2008-07-15 16:06:05.000000000 +0100 -@@ -21,6 +21,12 @@ - - # Version 2.4.5 or above of cmake is required! - CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR) -+# set CMake 2.6.x policy if the cmake_policy command exists, (i.e., if -+# the user is using CMake 2.6.0 or newer). -+if(COMMAND cmake_policy) -+ # empty elements are not ignored in lists. -+ cmake_policy(SET CMP0007 NEW) -+endif(COMMAND cmake_policy) - - # Recommended way to do user overrides of C-related variables, is given at - # http://public.kitware.com/pipermail/cmake/2006-July/010334.html. -diff -ur plplot-5.9.0-orig/examples/f95/CMakeLists.txt plplot-5.9.0/examples/f95/CMakeLists.txt ---- plplot-5.9.0-orig/examples/f95/CMakeLists.txt 2008-02-10 15:54:08.000000000 +0000 -+++ plplot-5.9.0/examples/f95/CMakeLists.txt 2008-07-15 16:04:44.000000000 +0100 -@@ -50,32 +50,43 @@ - - if(BUILD_TEST) - remove_definitions("-DHAVE_CONFIG_H") -- # N.B. This is required because it's the location of plplot.mod -- # generated as a by-product of building libplplotf95${LIB_TAG}. -- include_directories(${CMAKE_BINARY_DIR}) - -- # Temporary workaround for module handling bug in CMake 2.4.3. Create a -- # file with arbitrary contents called plplot.mod.proxy in top-level -- # build tree. As a temporary measure we use cmake_workaround.f as the -- # generator of this file. (cmake_workaround.f was previously compiled, -- # but that is no longer the case.) Note, once CMake is fixed this comment -- # the following configure_file command and cmake_workaround.f should all -- # just disappear. -- configure_file( -- ${CMAKE_CURRENT_SOURCE_DIR}/cmake_workaround.f -- ${CMAKE_BINARY_DIR}/plplot.mod.proxy -- COPYONLY -- ) -+ if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) -+ # Temporary workaround for module handling bug in CMake 2.4.3. Create a -+ # file with arbitrary contents called plplot.mod.proxy in top-level -+ # build tree. As a temporary measure we use cmake_workaround.f as the -+ # generator of this file. (cmake_workaround.f was previously compiled, -+ # but that is no longer the case.) Note, once CMake is fixed this comment -+ # the following configure_file command and cmake_workaround.f should all -+ # just disappear. -+ configure_file( -+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake_workaround.f -+ ${CMAKE_BINARY_DIR}/plplot.mod.proxy -+ COPYONLY -+ ) -+ # The generated module location for 2.4.x CMake is the top-level build -+ # tree. -+ include_directories(${CMAKE_BINARY_DIR}) -+ else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) -+ # The generated module location for cvs CMake is the build-tree -+ # location where the corresponding library is generated. -+ include_directories(${CMAKE_BINARY_DIR}/bindings/f95) -+ endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) - endif(BUILD_TEST) - foreach(STRING_INDEX ${f95_STRING_INDICES}) - set(f95_SRCS ${f95_SRCS} x${STRING_INDEX}f.f90) - if(BUILD_TEST) -- add_executable(x${STRING_INDEX}f x${STRING_INDEX}f.f90) -- target_link_libraries(x${STRING_INDEX}f plplotf95${LIB_TAG}) -+ # Need unique target name -+ add_executable(x${STRING_INDEX}f95 x${STRING_INDEX}f.f90) -+ set_target_properties( -+ x${STRING_INDEX}f95 PROPERTIES -+ OUTPUT_NAME x${STRING_INDEX}f -+ ) -+ target_link_libraries(x${STRING_INDEX}f95 plplotf95${LIB_TAG}) - endif(BUILD_TEST) - endforeach(STRING_INDEX ${f95_STRING_INDICES}) - --install(FILES ${f95_SRCS} -+install(FILES ${f95_SRCS} - DESTINATION ${DATA_DIR}/examples/f95 - ) - Deleted: trunk/debian/patches/12_cmake-2.6-fixes.dpatch =================================================================== --- trunk/debian/patches/12_cmake-2.6-fixes.dpatch 2010-05-19 10:11:33 UTC (rev 11011) +++ trunk/debian/patches/12_cmake-2.6-fixes.dpatch 2010-05-19 10:21:36 UTC (rev 11012) @@ -1,364 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 12_cmake-2.6-fixes.dpatch by <and...@us...> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix the build system to work with cmake 2.6. -## DP: This patch is extracted from the upstream SVN version of plplot. - -@DPATCH@ - -diff -ur plplot-5.9.0-orig/bindings/f95/CMakeLists.txt plplot-5.9.0/bindings/f95/CMakeLists.txt ---- plplot-5.9.0-orig/bindings/f95/CMakeLists.txt 2008-02-10 15:54:01.000000000 +0000 -+++ plplot-5.9.0/bindings/f95/CMakeLists.txt 2008-07-16 10:53:26.000000000 +0100 -@@ -141,14 +141,30 @@ - RUNTIME DESTINATION ${BIN_DIR} - ) - --# Yuk! All Makefiles are run from the top level build directory and --# so the f90 .mod files end up there rather than in the bindings/f95 --# directory. Ifort and pgf90 both have a -module command line option to --# override this location, but I'm not sure how portable that? --install( --FILES ${CMAKE_BINARY_DIR}/plplot.mod ${CMAKE_BINARY_DIR}/plplotp.mod ${CMAKE_BINARY_DIR}/plplot_flt.mod --DESTINATION ${F95_MOD_DIR} --) -+if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) -+ # Yuk! All Makefiles are run from the top level build directory and -+ # so the f90 .mod files end up there rather than in the bindings/f95 -+ # directory. Ifort and pgf90 both have a -module command line option to -+ # override this location, but I'm not sure how portable that? -+ install( -+ FILES -+ ${CMAKE_BINARY_DIR}/plplot.mod -+ ${CMAKE_BINARY_DIR}/plplotp.mod -+ ${CMAKE_BINARY_DIR}/plplot_flt.mod -+ DESTINATION ${F95_MOD_DIR} -+ ) -+else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) -+ # For the current cvs version of CMake, the module files are created by -+ # default during the library build in the more logical bindings/f95 -+ # directory. -+ install( -+ FILES -+ ${CMAKE_BINARY_DIR}/bindings/f95/plplot.mod -+ ${CMAKE_BINARY_DIR}/bindings/f95/plplotp.mod -+ ${CMAKE_BINARY_DIR}/bindings/f95/plplot_flt.mod -+ DESTINATION ${F95_MOD_DIR} -+ ) -+endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) - - # Configure pkg-config *.pc file corresponding to libplplotf95${LIB_TAG} - if(PKG_CONFIG_EXECUTABLE) -diff -ur plplot-5.9.0-orig/cmake/modules/cairo.cmake plplot-5.9.0/cmake/modules/cairo.cmake ---- plplot-5.9.0-orig/cmake/modules/cairo.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/cairo.cmake 2008-07-15 16:25:46.000000000 +0100 -@@ -97,13 +97,7 @@ - string(REGEX REPLACE ";" " " - cairo_COMPILE_FLAGS "${cflags} ${X11_COMPILE_FLAGS}" - ) -- # Convert X linker information to preferred CMake form before appending -- # it to already converted ${linkflags} -- cmake_link_flags( -- cairo_X_LINK_FLAGS -- "-L${X11_LIBRARY_DIR};${X11_LIBRARIES}" -- ) -- set(cairo_LINK_FLAGS ${linkflags} ${cairo_X_LINK_FLAGS}) -+ set(cairo_LINK_F... [truncated message content] |
From: <and...@us...> - 2010-05-19 10:42:28
|
Revision: 11013 http://plplot.svn.sourceforge.net/plplot/?rev=11013&view=rev Author: andrewross Date: 2010-05-19 10:42:22 +0000 (Wed, 19 May 2010) Log Message: ----------- Comment out patch disable octave example p7 to see if it now works ok on alpha again. Update other patches to apply cleanly to 5.9.6 source. Modified Paths: -------------- trunk/debian/changelog trunk/debian/patches/02_unset-python-path.diff trunk/debian/patches/04_use-mkoctfile.diff trunk/debian/patches/series Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2010-05-19 10:21:36 UTC (rev 11012) +++ trunk/debian/changelog 2010-05-19 10:42:22 UTC (rev 11013) @@ -1,11 +1,15 @@ plplot (5.9.6-1) unstable; urgency=low * New upstream release (closes: #564216). - * debian/patches/series: Remove the following patches which are included upstream - 11_minus-sign-manpage.diff - 16_wxwidget-with-cmake-2.8.diff - 17_fix_cmap_support.diff - and delete the patches from the patches directory. + * debian/patches/series: + + Remove the following patches which are included upstream + 11_minus-sign-manpage.diff + 16_wxwidget-with-cmake-2.8.diff + 17_fix_cmap_support.diff + and delete the patches from the patches directory. + + Comment out 07_octave_prune_examples.diff from the list of applied patches, + but leave patch for now to see if octave example p7 is ok on alpha. + + Update remaining patches for 5.9.6. -- Andrew Ross <and...@us...> Wed, 19 May 2010 11:14:30 +0100 Modified: trunk/debian/patches/02_unset-python-path.diff =================================================================== --- trunk/debian/patches/02_unset-python-path.diff 2010-05-19 10:21:36 UTC (rev 11012) +++ trunk/debian/patches/02_unset-python-path.diff 2010-05-19 10:42:22 UTC (rev 11013) @@ -9,12 +9,12 @@ --- plplot/examples/python/CMakeLists.txt.old +++ plplot/examples/python/CMakeLists.txt -@@ -195,7 +195,7 @@ - @ONLY - ) +@@ -214,7 +214,7 @@ + @ONLY + ) --set(python_location1 ${PYTHON_INSTDIR}) -+set(python_location1) - set(python_location2) - set(python_location3) - configure_file( +- set(python_location1 ${PYTHON_INSTDIR}) ++ set(python_location1) + set(python_location2) + set(python_location3) + set(python_location4) Modified: trunk/debian/patches/04_use-mkoctfile.diff =================================================================== --- trunk/debian/patches/04_use-mkoctfile.diff 2010-05-19 10:21:36 UTC (rev 11012) +++ trunk/debian/patches/04_use-mkoctfile.diff 2010-05-19 10:42:22 UTC (rev 11013) @@ -7,9 +7,9 @@ --- plplot-5.9.5.orig/bindings/octave/CMakeLists.txt +++ plplot-5.9.5/bindings/octave/CMakeLists.txt -@@ -134,49 +134,6 @@ - ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h - ) +@@ -136,49 +136,6 @@ + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc + PROPERTIES GENERATED ON) - # Build octave interface. - set(octave_interface_INCLUDE_PATHS @@ -57,7 +57,7 @@ # Have to be specific about permissions for some reason (probably oct suffix). set(PERM_MODULES OWNER_READ -@@ -188,9 +145,22 @@ +@@ -190,9 +147,22 @@ WORLD_EXECUTE ) Modified: trunk/debian/patches/series =================================================================== --- trunk/debian/patches/series 2010-05-19 10:21:36 UTC (rev 11012) +++ trunk/debian/patches/series 2010-05-19 10:42:22 UTC (rev 11013) @@ -1,3 +1,3 @@ 02_unset-python-path.diff 04_use-mkoctfile.diff -07_octave_prune_examples.diff +#07_octave_prune_examples.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |