[Pkg-ocaml-maint-commits] [SCM] ocaml-ssl packaging branch, master, updated. debian/0.4.3-3-5-g608cd95

[Samuel Mimram]

The following commit has been merged in the master branch:
commit cea80948e748412992ff7a7c736608754fbd67b3
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Sun Jan 17 19:32:30 2010 +0100

    New upstream release.

diff --git a/debian/changelog b/debian/changelog
index df436a3..4e79188 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ocaml-ssl (0.4.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed makefile patch, integrated upstream.
+  * Switch to dh.
+  * Remove dpatch support.
+
+ -- Samuel Mimram <smimram at debian.org>  Sun, 17 Jan 2010 19:26:06 +0100
+
 ocaml-ssl (0.4.3-3) unstable; urgency=low
 
   [ Sylvain Le Gall ]
diff --git a/debian/control b/debian/control
index 5175d90..178da19 100644
--- a/debian/control
+++ b/debian/control
@@ -7,13 +7,11 @@ Uploaders:
  Stéphane Glondu <glondu at debian.org>,
  Stefano Zacchiroli <zack at debian.org>
 Build-Depends:
- debhelper (>= 7.0.0),
+ debhelper (>= 7.0.50~),
  libssl-dev (>= 0.9.6),
  ocaml-nox (>= 3.11.1-3~),
  ocaml-findlib (>= 1.2.5),
- cdbs,
- dh-ocaml (>= 0.9),
- dpatch
+ dh-ocaml (>= 0.9)
 Standards-Version: 3.8.3
 Homepage: http://sourceforge.net/projects/savonet/files/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-ssl.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f0be4dd..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-makefile
diff --git a/debian/patches/makefile.dpatch b/debian/patches/makefile.dpatch
deleted file mode 100755
index e87bf4f..0000000
--- a/debian/patches/makefile.dpatch
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /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 c0a64f0..2979cda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,22 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
-include /usr/share/cdbs/1/class/autotools.mk
+# -*- makefile -*-
 
-DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
-DEB_MAKE_INSTALL_TARGET = install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
-
-my-pre-clean:
-	if ! test -d doc.save; then \
-	 cp -r doc doc.save; \
-	fi
+include /usr/share/ocaml/ocamlvars.mk
 
-.PHONY: my-pre-clean
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-$(patsubst %,cleanbuilddir/%,$(DEB_ALL_PACKAGES)) :: my-pre-clean
+DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 
-clean:: 
-	-if ! test -d doc; then \
-	  mv doc.save doc; \
-	else \
-	  rm -rf doc.save; \
-	fi
+%:
+	dh --with ocaml $@
 
-build/libssl-ocaml::
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+	$(MAKE)
 	$(MAKE) doc
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
 	mkdir -p $(DESTDIR)
+	$(MAKE) install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore

-- 
ocaml-ssl packaging