[Plplot-cvs] SF.net SVN: plplot:[11890] branches/v5_9_8_debian/debian

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

Revision: 11890
          http://plplot.svn.sourceforge.net/plplot/?rev=11890&view=rev
Author:   andrewross
Date:     2011-08-22 18:27:09 +0000 (Mon, 22 Aug 2011)

Log Message:
-----------
Change ocaml install location to /usr/lib/ocaml rather than /usr/lib/ocaml/3.11.2 as per current Debian practice. 

Modified Paths:
--------------
    branches/v5_9_8_debian/debian/changelog
    branches/v5_9_8_debian/debian/libplplot-ocaml.files.in
    branches/v5_9_8_debian/debian/patches/series
    branches/v5_9_8_debian/debian/rules

Added Paths:
-----------
    branches/v5_9_8_debian/debian/patches/11_ocaml_install_location.diff

Modified: branches/v5_9_8_debian/debian/changelog
===================================================================
--- branches/v5_9_8_debian/debian/changelog	2011-08-22 18:09:33 UTC (rev 11889)
+++ branches/v5_9_8_debian/debian/changelog	2011-08-22 18:27:09 UTC (rev 11890)
@@ -26,15 +26,19 @@
   * debian/NEWS: update NEWS file for 5.9.8.
   * debian/patches/series, debian/patches/08_oct_perms.diff, 
     debian/patches/09_qt_nodisplay.diff, 
-    debian/patches/10_fix_test_scripts.diff:
+    debian/patches/10_fix_test_scripts.diff,
+    debian/patches/11_ocaml_library_location.diff:
     + Add new patch to turn off execute permissions for plplot_octave.oct 
-      (fixes lintian error). Add patch from upstream to enable 
-      non-interactive qt devices to work even if DISPLAY is not set 
-      (prevents error when running tests on a buildd / using pbuilder). Add new
-      upstream patch to remove spurious chmod commands from test scripts. This
-      ensures the installed examples will work as expected.
+      (fixes lintian error). 
+    + Add patch from upstream to enable non-interactive qt devices to work
+      even if DISPLAY is not set (prevents error when running tests on a 
+      buildd / using pbuilder). 
+    + Add new upstream patch to remove spurious chmod commands from test 
+      scripts. This ensures the installed examples will work as expected.
+    + Add new upstream patch to change the install location for ocaml
+      libraries to remove the ocaml version (as per Debian ocaml practice).
 
- -- Andrew Ross <and...@us...>  Fri, 12 Aug 2011 10:23:38 +0100
+ -- Andrew Ross <and...@us...>  Mon, 22 Aug 2011 19:20:38 +0100
 
 plplot (5.9.7-1) UNRELEASED; urgency=low
 

Modified: branches/v5_9_8_debian/debian/libplplot-ocaml.files.in
===================================================================
--- branches/v5_9_8_debian/debian/libplplot-ocaml.files.in	2011-08-22 18:09:33 UTC (rev 11889)
+++ branches/v5_9_8_debian/debian/libplplot-ocaml.files.in	2011-08-22 18:27:09 UTC (rev 11890)
@@ -1,10 +1,10 @@
-usr/lib/ocaml/@OCamlABI@/stublibs/*.so
-usr/lib/ocaml/@OCamlABI@/plplot/META
-usr/lib/ocaml/@OCamlABI@/plplot/*.a
-usr/lib/ocaml/@OCamlABI@/plplot/*.cm*
-usr/lib/ocaml/@OCamlABI@/plplot/*.ml*
-usr/lib/ocaml/@OCamlABI@/plcairo/META
-usr/lib/ocaml/@OCamlABI@/plcairo/*.a
-usr/lib/ocaml/@OCamlABI@/plcairo/*.cm*
-usr/lib/ocaml/@OCamlABI@/plcairo/*.ml*
+usr/lib/ocaml/stublibs/*.so
+usr/lib/ocaml/plplot/META
+usr/lib/ocaml/plplot/*.a
+usr/lib/ocaml/plplot/*.cm*
+usr/lib/ocaml/plplot/*.ml*
+usr/lib/ocaml/plcairo/META
+usr/lib/ocaml/plcairo/*.a
+usr/lib/ocaml/plcairo/*.cm*
+usr/lib/ocaml/plcairo/*.ml*
 usr/share/doc/libplplot-ocaml

Added: branches/v5_9_8_debian/debian/patches/11_ocaml_install_location.diff
===================================================================
--- branches/v5_9_8_debian/debian/patches/11_ocaml_install_location.diff	                        (rev 0)
+++ branches/v5_9_8_debian/debian/patches/11_ocaml_install_location.diff	2011-08-22 18:27:09 UTC (rev 11890)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_ocaml_install_location.diff by Andrew Ross <and...@us...>
+##
+## DP: Patch from upstream to remove ocaml version from ocaml library install path as per ocaml policy.
+
+@DPATCH@
+
+--- plplot-5.9.8.orig/cmake/modules/ocaml.cmake   2011-08-02 15:26:05.000000000 +0100
++++ plplot-5.9.8/cmake/modules/ocaml.cmake   2011-08-22 19:02:34.000000000 +0100
+@@ -122,7 +122,7 @@
+ 
+   # Installation follows the Debian ocaml policy for want of a better
+   # standard.
+-  set(OCAML_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/ocaml/${OCAML_VERSION}
++  set(OCAML_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/ocaml
+     CACHE PATH "install location for ocaml files"
+     )
+ 
+--- plplot-5.9.8.orig/doc/docbook/src/ocaml.xml   2011-08-02 15:26:17.000000000 +0100
++++ plplot-5.9.8/doc/docbook/src/ocaml.xml   2011-08-22 19:07:54.000000000
+@@ -209,8 +209,8 @@
+         look for PLplot:
+       </para>
+       <programlisting>
+-        export OCAMLPATH=$PLPLOT_INSTALL_PREFIX/lib/ocaml/$OCAML_VERSION:$OCAMLPATH
+-        export LD_LIBRARY_PATH=$PLPLOT_INSTALL_PREFIX/lib/ocaml/$OCAML_VERSION/stublibs:$LD_LIBRARY_PATH
++        export OCAMLPATH=$PLPLOT_INSTALL_PREFIX/lib/ocaml:$OCAMLPATH
++        export LD_LIBRARY_PATH=$PLPLOT_INSTALL_PREFIX/lib/ocaml/stublibs:$LD_LIBRARY_PATH
+       </programlisting>
+     </sect2>
+     <sect2 id="ocaml_command_line_sample_project_core">


Property changes on: branches/v5_9_8_debian/debian/patches/11_ocaml_install_location.diff
___________________________________________________________________
Added: svn:executable
   + *

Modified: branches/v5_9_8_debian/debian/patches/series
===================================================================
--- branches/v5_9_8_debian/debian/patches/series	2011-08-22 18:09:33 UTC (rev 11889)
+++ branches/v5_9_8_debian/debian/patches/series	2011-08-22 18:27:09 UTC (rev 11890)
@@ -4,3 +4,4 @@
 08_oct_perms.diff
 09_qt_nodisplay.diff
 10_fix_test_scripts.diff
+11_ocaml_install_location.diff

Modified: branches/v5_9_8_debian/debian/rules
===================================================================
--- branches/v5_9_8_debian/debian/rules	2011-08-22 18:09:33 UTC (rev 11889)
+++ branches/v5_9_8_debian/debian/rules	2011-08-22 18:27:09 UTC (rev 11890)
@@ -67,9 +67,6 @@
 BUILD_DIR = $(debbase)/build_tmp
 SRC_DIR = $(shell pwd)
 
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-
 control:
 ifeq ($(BUILD_ADA),no)
 	slice -o UNDEF+ADA:debian/control debian/control.in


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