Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[11012] trunk/debian
|
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] |
