[Pkg-ocaml-maint-commits] [SCM] libfuse-ocaml packaging branch, debian, updated. debian/0.2-1-5-gdc50ca1

[Goswin von Brederlow]

The following commit has been merged in the debian branch:
commit dc50ca1f602822508425164e0969e7525d251b00
Author: Goswin von Brederlow <goswin-v-b at web.de>
Date:   Sat Feb 27 22:37:20 2010 +0100

    * Update to new libaio API (Bigarray for buffers).
    * New ocaml directory layout (no @OCamlABI@ anymore).
    * New packaging, drop cdbs.
    * Start 0.4-1.

diff --git a/debian/changelog b/debian/changelog
index 02923ee..92c51e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libfuse-ocaml (0.4-1) UNRELEASED; urgency=low
+
+  * Update to new libaio API (Bigarray for buffers).
+  * New ocaml directory layout (no @OCamlABI@ anymore).
+
+ -- Goswin von Brederlow <goswin-v-b at web.de>  Tue, 23 Feb 2010 18:07:17 +0100
+
 libfuse-ocaml (0.3-1) UNRELEASED; urgency=low
 
   * lib/fuse.ml: Add s_IFREG and EISDIR and EPERM.
diff --git a/debian/control b/debian/control
index 2b4075d..7d827b3 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Format: 3.0 (quilt)
 Package: libfuse-ocaml
 Architecture: any
 Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml bindings for libfuse (filesystem in userspace library)
  This OCaml-library interfaces the libfuse (filesystem in userspace
  library) C library. It can be used to implement filesystems in userspace.
@@ -23,7 +24,8 @@ Description: OCaml bindings for libfuse (filesystem in userspace library)
 Package: libfuse-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libfuse-dev (>= 0.3), libfuse-ocaml (= ${binary:Version}), ocaml-findlib (>= 1.1), ${misc:Depends}
+Depends: ${ocaml:Depends}, libfuse-dev (>= 0.3), libfuse-ocaml (= ${binary:Version}), ocaml-findlib (>= 1.1), ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml bindings for libfuse (filesystem in userspace library)
  This OCaml-library interfaces the libfuse (filesystem in userspace
  library) C library. It can be used to implement filesystems in userspace.
diff --git a/debian/libfuse-ocaml-dev.install b/debian/libfuse-ocaml-dev.install
index 9dfe453..78b2ed2 100644
--- a/debian/libfuse-ocaml-dev.install
+++ b/debian/libfuse-ocaml-dev.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/ocaml/*/fuse/META
-debian/tmp/usr/lib/ocaml/*/fuse/*.a
-debian/tmp/usr/lib/ocaml/*/fuse/*.cm*
-debian/tmp/usr/lib/ocaml/*/fuse/*.ml*
+debian/tmp/usr/lib/ocaml/fuse/META
+debian/tmp/usr/lib/ocaml/fuse/*.a
+debian/tmp/usr/lib/ocaml/fuse/*.cm*
+debian/tmp/usr/lib/ocaml/fuse/*.ml*
 doc/fuse/html/* /usr/share/doc/libfuse-ocaml-dev/html/api
diff --git a/debian/libfuse-ocaml.install.in b/debian/libfuse-ocaml.install.in
deleted file mode 100644
index 58722ba..0000000
--- a/debian/libfuse-ocaml.install.in
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/ocaml/*/fuse/*.so	usr/lib/ocaml/@OCamlABI@/stublibs/
diff --git a/debian/rules b/debian/rules
index 94b3a6e..af0aaf7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,46 +1,36 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-export DH_VERBOSE=1
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
 include /usr/share/ocaml/ocamlvars.mk
-include /usr/share/ocaml/ocamlinit.mk
-
-DESTDIR := $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
-STRIPOPT := $(if $(OCAML_OPT_ARCH),-e "",-e "/native/d")
-
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-NATIVE = yes
-export NATIVE
-endif
-
-build: build-stamp
-build-stamp: ocamlinit-stamp
-	dh_testdir
-	$(MAKE) TARGET=$(OCAML_BEST) PREFIX=/usr all doc
-	#sed $(STRIPOPT) META.in > META
-	dh build --after auto_build
-	touch $@
-
-clean: ocamlinit-clean
-	dh clean
-	rm -f build-stamp install-stamp ocamlinit-stamp
-	$(MAKE) clean
-
-install: install-stamp
-install-stamp: build-stamp
-	dh install --before auto_install
-	$(MAKE) TARGET=$(OCAML_BEST) DESTDIR=$(DESTDIR) install
-	dh install --after auto_install
-	touch $@
-
-binary-indep: install-stamp
-
-binary-arch: install-stamp
-	echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/libfuse-ocaml.substvars
-	echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/libfuse-ocaml-dev.substvars
-	dh $@
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
+
+OCAMLFIND_DESTDIR := $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
+export OCAMLFIND_DESTDIR
+
+OCAML_RUN := $(if $(OCAML_OPT_ARCH),ocaml-base-nox-$(OCAML_ABI))
+OPTTARGET := $(if $(OCAML_OPT_ARCH),opt)
+NATIVEARG := $(if $(OCAML_OPT_ARCH),NATIVE=1)
+
+DB2MAN := /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
+XP := xsltproc -''-nonet
+
+%:
+	dh --with ocaml $@
+
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+#	$(MAKE) depend
+	$(MAKE) OCAMLCINCS="" OCAMLCLIBS="-linkpkg" OCAMLOPTLIBS="-linkpkg" byte $(OPTTARGET) doc
+#	$(MAKE) OCAMLCINCS="-package extlib" OCAMLCLIBS="-linkpkg" OCAMLOPTLIBS="-linkpkg" test
+
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -Rf html
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+	mkdir -p $(OCAMLFIND_DESTDIR)
+	DESTDIR="$(OCAMLFIND_DESTDIR)" $(MAKE) $(NATIVEARG) install

-- 
libfuse-ocaml packaging