[Pkg-ocaml-maint-commits] [SCM] ocaml-ssl packaging branch, master, updated. debian/0.4.2-3-11-g87e3c46

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 8a15b5a3bf7a501d5853aae41b27a68bff674fac
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sun Feb 1 21:38:24 2009 +0100

    switch debian/rules to CDBS
    
    Rationale: the former debian/rules was a tad too ad-hoc. It was
    reimplementing several of the logic currently in the CDBS class, with
    a different "API". Also, it was relying on assumptions such as
    STDLIB_DIR being versioned, which might be not true anymore in the
    future.
    
    If CDBS is really not desired, we can get rid of it from this package,
    but it should be done implementing the current API of the CDBS class,
    as it is a sane one (in spite of CDBS).

diff --git a/debian/changelog b/debian/changelog
index 77870f1..9f6e3ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ocaml-ssl (0.4.2-5) experimental; urgency=low
     - bump Standards-Version to 3.8.0 (no changes needed)
     - bumpd ocaml build-dep to ensure proper rebuild on experimental
     - add build-dep on dh-ocaml
+  * debian/rules: switch packaging to CDBS
   * bump debhelper requirements to 7 (change build-dep and compat
     accordingly)
   * add myself as an Uploader
diff --git a/debian/libssl-ocaml-dev.install.in b/debian/libssl-ocaml-dev.install.in
index c8480d9..52e6f22 100644
--- a/debian/libssl-ocaml-dev.install.in
+++ b/debian/libssl-ocaml-dev.install.in
@@ -1,4 +1,4 @@
-usr/lib/ocaml/@OCamlABI@/ssl/META
-usr/lib/ocaml/@OCamlABI@/ssl/*.a
-usr/lib/ocaml/@OCamlABI@/ssl/*.cm*
-usr/lib/ocaml/@OCamlABI@/ssl/*.ml*
+ at OCamlStdlibDir@/ssl/META
+ at OCamlStdlibDir@/ssl/*.a
+ at OCamlStdlibDir@/ssl/*.cm*
+ at OCamlStdlibDir@/ssl/*.ml*
diff --git a/debian/libssl-ocaml.install.in b/debian/libssl-ocaml.install.in
index a7507b1..b362d81 100644
--- a/debian/libssl-ocaml.install.in
+++ b/debian/libssl-ocaml.install.in
@@ -1,2 +1,2 @@
-usr/lib/ocaml/@OCamlABI@/ssl/dllssl_stubs.so usr/lib/ocaml/@OCamlABI@/stublibs/
-usr/lib/ocaml/@OCamlABI@/ssl/dllssl_threads_stubs.so usr/lib/ocaml/@OCamlABI@/stublibs/
+ at OCamlStdlibDir@/ssl/dllssl_stubs.so		@OCamlDllDir@
+ at OCamlStdlibDir@/ssl/dllssl_threads_stubs.so	@OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 763988d..9418521 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,84 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
-
-DESTDIR := $(CURDIR)/debian/tmp/$(shell ocamlc -where)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-else
-        CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-        INSTALL_PROGRAM += -s
-endif
-
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-
-config.status: configure
-	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-build: ocamlinit build-stamp
-build-stamp: config.status
-	dh_testdir
-
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.log config.status
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	mkdir -p $(DESTDIR)
-	$(MAKE) install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/ocaml.mk
+DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
+DEB_MAKE_INSTALL_TARGET = install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
+build/libssl-ocaml::
 	$(MAKE) doc
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_installexamples
-	dh_install --sourcedir=debian/tmp --list-missing
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install ocamlinit
+	mkdir -p $(DESTDIR)

-- 
ocaml-ssl packaging