[Pkg-ocaml-maint-commits] r5887 - in /trunk/packages/mlpcap/trunk/debian: changelog libmlpcap-ocaml.dirs.in patches/00list patches/07_dll_with_camlidl.dpatch

[gildor at users.alioth.debian.org]

Author: gildor
Date: Mon Jul 28 21:40:43 2008
New Revision: 5887

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5887
Log:
Add libcamlidl.a when compiling (Closes: #450790)

Added:
    trunk/packages/mlpcap/trunk/debian/patches/07_dll_with_camlidl.dpatch   (with props)
Modified:
    trunk/packages/mlpcap/trunk/debian/changelog
    trunk/packages/mlpcap/trunk/debian/libmlpcap-ocaml.dirs.in
    trunk/packages/mlpcap/trunk/debian/patches/00list

Modified: trunk/packages/mlpcap/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mlpcap/trunk/debian/changelog?rev=5887&op=diff
==============================================================================
--- trunk/packages/mlpcap/trunk/debian/changelog (original)
+++ trunk/packages/mlpcap/trunk/debian/changelog Mon Jul 28 21:40:43 2008
@@ -1,8 +1,8 @@
-mlpcap (0.9-13) UNRELEASED; urgency=low
+mlpcap (0.9-13) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Add libcamlidl.a when compiling (Closes: #450790)
 
- -- Sylvain Le Gall <gildor at debian.org>  Fri, 18 Apr 2008 10:32:32 +0200
+ -- Sylvain Le Gall <gildor at debian.org>  Mon, 28 Jul 2008 23:39:55 +0200
 
 mlpcap (0.9-12) unstable; urgency=low
 

Modified: trunk/packages/mlpcap/trunk/debian/libmlpcap-ocaml.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mlpcap/trunk/debian/libmlpcap-ocaml.dirs.in?rev=5887&op=diff
==============================================================================
--- trunk/packages/mlpcap/trunk/debian/libmlpcap-ocaml.dirs.in (original)
+++ trunk/packages/mlpcap/trunk/debian/libmlpcap-ocaml.dirs.in Mon Jul 28 21:40:43 2008
@@ -1,1 +1,1 @@
- at OCamlStdlibDir@/stublibs
+ at OCamlDllDir@

Modified: trunk/packages/mlpcap/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mlpcap/trunk/debian/patches/00list?rev=5887&op=diff
==============================================================================
--- trunk/packages/mlpcap/trunk/debian/patches/00list (original)
+++ trunk/packages/mlpcap/trunk/debian/patches/00list Mon Jul 28 21:40:43 2008
@@ -3,3 +3,4 @@
 06_configure
 02_ocamlfind_for_example
 03_correct_META
+07_dll_with_camlidl

Added: trunk/packages/mlpcap/trunk/debian/patches/07_dll_with_camlidl.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mlpcap/trunk/debian/patches/07_dll_with_camlidl.dpatch?rev=5887&op=file
==============================================================================
--- trunk/packages/mlpcap/trunk/debian/patches/07_dll_with_camlidl.dpatch (added)
+++ trunk/packages/mlpcap/trunk/debian/patches/07_dll_with_camlidl.dpatch Mon Jul 28 21:40:43 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_dll_with_camlidl.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mlpcap-0.9~/OCamlMakefile mlpcap-0.9/OCamlMakefile
+--- mlpcap-0.9~/OCamlMakefile	2004-05-21 23:57:58.000000000 +0200
++++ mlpcap-0.9/OCamlMakefile	2008-07-28 23:33:57.000000000 +0200
+@@ -774,7 +774,7 @@
+ ifndef MSVC
+ $(DLLSONAME):		$(OBJ_LINK)
+ 			$(CC) -shared $(CINCFLAGS) $(CLIBFLAGS) \
+-				-o $@ $(OBJ_LINK) $(CLIBS:%=-l%)
++				-o $@ $(OBJ_LINK) $(shell ocamlc -where)/libcamlidl.a $(CLIBS:%=-l%)
+ endif
+ 
+ $(RESULT).cma:		$(REAL_IMPL_INTF) $(MAKEDLL) $(EXTRADEPS) $(RESULTDEPS)

Propchange: trunk/packages/mlpcap/trunk/debian/patches/07_dll_with_camlidl.dpatch
------------------------------------------------------------------------------
    svn:executable = *