[Pkg-ocaml-maint-commits] [SCM] ocaml-ssl packaging branch, master, updated. debian/0.4.3-1-1-ge0a6c9b

[Samuel Mimram]

The following commit has been merged in the master branch:
commit e0a6c9b456e772dbcb07c44afbea254b629e8f21
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Wed Feb 25 18:01:41 2009 +0100

    Patch makefile to correct linking problems.

diff --git a/debian/changelog b/debian/changelog
index 5dc8024..105d04a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-ssl (0.4.3-2) unstable; urgency=low
+
+  * Added makefile.dpatch in order not to link with unix and not to use
+    deprecated -custom.
+
+ -- Samuel Mimram <smimram at debian.org>  Wed, 25 Feb 2009 18:00:33 +0100
+
 ocaml-ssl (0.4.3-1) unstable; urgency=low
 
   * New Upstream Version.
diff --git a/debian/control b/debian/control
index 2e7756b..2efddf5 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Build-Depends:
  ocaml-nox (>= 3.11),
  ocaml-findlib (>= 1.2.4),
  cdbs,
- dh-ocaml
+ dh-ocaml,
+ dpatch
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-ssl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-ssl.git
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..f0be4dd
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+makefile
diff --git a/debian/patches/makefile.dpatch b/debian/patches/makefile.dpatch
new file mode 100755
index 0000000..e87bf4f
--- /dev/null
+++ b/debian/patches/makefile.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## makefile.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't link with unix and don't use deprecated -custom.
+
+ at DPATCH@
+diff -urNad ocaml-ssl~/src/Makefile.in ocaml-ssl/src/Makefile.in
+--- ocaml-ssl~/src/Makefile.in	2009-02-25 10:41:41.000000000 +0100
++++ ocaml-ssl/src/Makefile.in	2009-02-25 17:59:50.000000000 +0100
+@@ -15,7 +15,6 @@
+ export PS2PDF = @PS2PDF@
+ export BEST = @BEST@
+ export OCAMLLIBPATH = @CAMLLIBPATH@
+-export LIBS = unix
+ 
+ #SOURCES = ssl_stubs.c ssl.mli ssl.ml ssl_threads.ml
+ export RES_CLIB_SUF = _stubs
+@@ -27,6 +26,7 @@
+ export CC = @CC@
+ export CFLAGS = @CFLAGS@ -ansi -DCAML_NAME_SPACE -Wall
+ export CPPFLAGS = @CPPFLAGS@
++export NO_CUSTOM = yes
+ 
+ define PROJ_ssl
+   SOURCES = ssl_stubs.c ssl.mli ssl.ml
diff --git a/debian/rules b/debian/rules
index 2d64480..fd7408c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,11 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+
 DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 DEB_MAKE_INSTALL_TARGET = install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
+
 build/libssl-ocaml::
 	$(MAKE) doc
 	mkdir -p $(DESTDIR)

-- 
ocaml-ssl packaging