[Pkg-ocaml-maint-commits] r2839 - in /trunk/packages/findlib/trunk/debian: changelog patches/17_stddirs.dpatch patches/17_stddirs.dpatch.in rules

[zack at users.alioth.debian.org]

Author: zack
Date: Fri Jun 16 12:11:18 2006
New Revision: 2839

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2839
Log:
fixed wrong versioned paths in /etc/ocamlfind.conf

Added:
    trunk/packages/findlib/trunk/debian/patches/17_stddirs.dpatch.in
      - copied, changed from r2838, trunk/packages/findlib/trunk/debian/patches/17_stddirs.dpatch
Modified:
    trunk/packages/findlib/trunk/debian/changelog
    trunk/packages/findlib/trunk/debian/patches/17_stddirs.dpatch
    trunk/packages/findlib/trunk/debian/rules

Modified: trunk/packages/findlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/findlib/trunk/debian/changelog?rev=2839&op=diff
==============================================================================
--- trunk/packages/findlib/trunk/debian/changelog (original)
+++ trunk/packages/findlib/trunk/debian/changelog Fri Jun 16 12:11:18 2006
@@ -1,3 +1,12 @@
+findlib (1.1.1-5) unstable; urgency=low
+
+  * debian/patches/17_stddirs.dpatch:
+    - switched to .in form so that on 'ocamlinit' the patch is
+      instantiated to the current version of the OCaml ABI
+      (fixes wrong paths in /etc/ocamlfind.conf)
+
+ -- Stefano Zacchiroli <zack at debian.org>  Fri, 16 Jun 2006 14:04:22 +0200
+
 findlib (1.1.1-4) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/packages/findlib/trunk/debian/patches/17_stddirs.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/findlib/trunk/debian/patches/17_stddirs.dpatch?rev=2839&op=diff
==============================================================================
--- trunk/packages/findlib/trunk/debian/patches/17_stddirs.dpatch (original)
+++ trunk/packages/findlib/trunk/debian/patches/17_stddirs.dpatch Fri Jun 16 12:11:18 2006
@@ -30,5 +30,5 @@
 @@ -1,2 +1,2 @@
 -destdir="@SITELIB@"
 -path="@SITELIB@"
-+destdir="/usr/local/lib/ocaml/3.09.1"
-+path="/usr/local/lib/ocaml/3.09.1:@SITELIB@:@SITELIB@/METAS"
++destdir="/usr/local/lib/ocaml/3.09.2"
++path="/usr/local/lib/ocaml/3.09.2:@SITELIB@:@SITELIB@/METAS"

Copied: trunk/packages/findlib/trunk/debian/patches/17_stddirs.dpatch.in (from r2838, trunk/packages/findlib/trunk/debian/patches/17_stddirs.dpatch)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/findlib/trunk/debian/patches/17_stddirs.dpatch.in?rev=2839&op=diff
==============================================================================
--- trunk/packages/findlib/trunk/debian/patches/17_stddirs.dpatch (original)
+++ trunk/packages/findlib/trunk/debian/patches/17_stddirs.dpatch.in Fri Jun 16 12:11:18 2006
@@ -30,5 +30,5 @@
 @@ -1,2 +1,2 @@
 -destdir="@SITELIB@"
 -path="@SITELIB@"
-+destdir="/usr/local/lib/ocaml/3.09.1"
-+path="/usr/local/lib/ocaml/3.09.1:@SITELIB@:@SITELIB@/METAS"
++destdir="/usr/local/lib/ocaml/@OCamlABI@"
++path="/usr/local/lib/ocaml/@OCamlABI@:@SITELIB@:@SITELIB@/METAS"

Modified: trunk/packages/findlib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/findlib/trunk/debian/rules?rev=2839&op=diff
==============================================================================
--- trunk/packages/findlib/trunk/debian/rules (original)
+++ trunk/packages/findlib/trunk/debian/rules Fri Jun 16 12:11:18 2006
@@ -7,7 +7,7 @@
 
 OCAMLABI := $(shell ocamlc -version)
 OCAMLLIBDIR := $(shell ocamlc -where)
-OFILES = $(patsubst %.in,%,$(shell ls debian/*.in))
+OFILES = $(patsubst %.in,%,$(shell ls debian/*.in debian/patches/*.in))
 HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
 DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
 DEB_MAKE_INSTALL_TARGET = install prefix=$(CURDIR)/debian/tmp