[Pkg-ocaml-maint-commits] [SCM] OCaml bindings for the PAM library branch, master, updated. upstream/1.1-18-gf344617

[Stephane Glondu]

The following commit has been merged in the master branch:
commit f344617ce29ad3bda02104721785904621c5009a
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Jun 16 18:07:34 2008 +0200

    Use cdbs

diff --git a/debian/control b/debian/control
index ac53a5c..3128fcf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stephane Glondu <steph at glondu.net>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5),
+Build-Depends: cdbs, debhelper (>= 5),
  libpam-dev,
  ocaml-nox
 Standards-Version: 3.8.0
diff --git a/debian/libpam-ocaml-dev.docs b/debian/libpam-ocaml-dev.docs
deleted file mode 100644
index 26dc6bd..0000000
--- a/debian/libpam-ocaml-dev.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-CHANGES
diff --git a/debian/rules b/debian/rules
index afee876..b333204 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,64 +1,17 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+PKGNAME = libpam-ocaml-dev
+DESTDIR := $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
+DOCDIR = $(CURDIR)/debian/doc/html
+OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
 
-OCAMLABI := $(shell ocamlc -version)
-BYTECODE := $(shell [ -x /usr/bin/ocamlopt ] || echo yes)
-OPTTARGET := $(if $(BYTECODE),,opt)
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
+DEB_MAKE_BUILD_TARGET = META byte
 
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
-
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-
-configure: configure-stamp
-configure-stamp: ocamlinit
-	dh_testdir
-	touch configure-stamp
-
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE) META byte $(OPTTARGET)
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp $(OFILES)
-	$(MAKE) clean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp/usr/lib/ocaml/$(OCAMLABI) install
-
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_install --sourcedir=debian/tmp
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	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 configure ocamlinit
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+	DEB_MAKE_BUILD_TARGET += opt
+endif

-- 
OCaml bindings for the PAM library