[Pkg-ocaml-maint-commits] [SCM] mlgmp packaging branch, master, updated. debian/20021123-15-1-gb167893

Sylvain Le Gall gildor at debian.org
Sun Jul 26 10:59:36 UTC 2009


The following commit has been merged in the master branch:
commit b1678939ca2d953553143e5587d6cdf9731388da
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sun Jul 26 10:59:28 2009 +0000

    Switch to dh-ocaml 0.9
    
    * Use ocaml:Depends/Provides in debian/control
    * Use debian/libgmp-ocaml-dev.ocamldoc to generate documentation
    * Move .../gmp/META to .../METAS/META.gmp since this is a debian
      specific META

diff --git a/debian/META b/debian/META.gmp
similarity index 100%
rename from debian/META
rename to debian/META.gmp
diff --git a/debian/changelog b/debian/changelog
index 6617bef..b4139f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mlgmp (20021123-16) UNRELEASED; urgency=low
+
+  * Switch to dh-ocaml 0.9
+    * Use ocaml:Depends/Provides in debian/control
+    * Use debian/libgmp-ocaml-dev.ocamldoc to generate documentation
+  * Move .../gmp/META to .../METAS/META.gmp since this is a debian
+    specific META
+
+ -- Sylvain Le Gall <gildor at debian.org>  Sun, 26 Jul 2009 10:57:17 +0000
+
 mlgmp (20021123-15) unstable; urgency=low
 
   * Use new Ocaml's stdlib location
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..44b4308
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+depend
diff --git a/debian/control b/debian/control
index 23cda83..ae0cdd3 100644
--- a/debian/control
+++ b/debian/control
@@ -15,20 +15,20 @@ Build-Depends:
   dpatch, 
   libgmp3-dev, 
   libmpfr-dev, 
-  dh-ocaml
+  dh-ocaml (>= 0.9)
 Homepage: http://www-verimag.imag.fr/~monniaux/programmes.html.en
 Standards-Version: 3.8.2
-Section: libs
+Section: ocaml
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mlgmp.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/perl4caml.git
 
 Package: libgmp-ocaml
 Architecture: any
-Section: ocaml
 Depends: 
   ${shlibs:Depends}, 
   ${misc:Depends}, 
-  ocaml-nox-${F:OCamlAbi}
+  ${ocaml:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml bindings for the GNU multiprecision arithmetic library
  This package provides bindings for the GNU multiprecision library 
  (GNU MP) for the language OCaml (caml.inria.fr).  It is mostly a 1-1 mapping
@@ -40,12 +40,11 @@ Description: OCaml bindings for the GNU multiprecision arithmetic library
 
 Package: libgmp-ocaml-dev
 Architecture: any
-Section: ocaml
 Depends: 
-  libgmp-ocaml (= ${binary:Version}), 
-  ocaml-nox-${F:OCamlAbi}, 
+  ${ocaml:Depends},
   libgmp3-dev, 
   ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml bindings for the GNU multiprecision arithmetic library
  This package provides bindings for the GNU multiprecision library 
  (GNU MP) for the language OCaml(caml.inria.fr).  It is mostly a 1-1 mapping
diff --git a/debian/libgmp-ocaml-dev.install.in b/debian/libgmp-ocaml-dev.install.in
new file mode 100644
index 0000000..3d9b795
--- /dev/null
+++ b/debian/libgmp-ocaml-dev.install.in
@@ -0,0 +1 @@
+debian/META.gmp @OCamlStdlibDir@/METAS
diff --git a/debian/libgmp-ocaml-dev.ocamldoc b/debian/libgmp-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..e69de29
diff --git a/debian/rules b/debian/rules
index fb807c0..20dd667 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,61 +2,39 @@
 
 PACKAGE=libgmp-ocaml
 
-include /usr/share/ocaml/ocamlinit.mk
+include /usr/share/ocaml/ocamlvars.mk
 include /usr/share/dpatch/dpatch.make
 
-INST_STUB = $(CURDIR)/debian/$(PACKAGE)/$(OCAML_DLL_DIR)
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+HAS_OPT="HAS_OPT=1"
+else
+HAS_OPT=
+endif
 
-build: ocamlinit build-stamp
+build: build-stamp
 build-stamp: patch
-	dh build
-
+	dh build --with ocaml
 	$(MAKE) depend
-	if [ -e /usr/bin/ocamlopt ]; then \
-	  $(MAKE) HAS_OPT=1; \
-        else \
-          $(MAKE); \
-	fi
+	$(MAKE) $(HAS_OPT)
 	touch build-stamp
 
-clean: clean1 unpatch ocamlinit-clean
+clean: clean1 unpatch 
 clean1:
-	dh_clean
 	$(MAKE) clean
-	rm -f debian/libgmp-ocaml-dev.doc-base.ocamldoc-apiref
-	rm -f depend
+	dh clean --with ocaml
 
 install: build install-stamp
 install-stamp:
-	dh install --before auto_install
-
-	if [ -e /usr/bin/ocamlopt ]; then \
-	  $(MAKE) HAS_OPT=1 install \
-		DESTDIR=$(CURDIR)/debian/$(PACKAGE)-dev \
-		STUBDIR=$(INST_STUB); \
-	else \
-	  $(MAKE) install \
-		DESTDIR=$(CURDIR)/debian/$(PACKAGE)-dev\
-		STUBDIR=$(INST_STUB); \
-	fi
-	cp debian/META debian/$(PACKAGE)-dev$(OCAML_STDLIB_DIR)/gmp
-
-	mkdir -p debian/$(PACKAGE)-dev/usr/share/doc/$(PACKAGE)-dev/html/api
-	find debian/$(PACKAGE)-dev$(OCAML_STDLIB_DIR) -type f -name '*.mli' -or -name '*.ml' | \
-	xargs ocamldoc -html -d debian/$(PACKAGE)-dev/usr/share/doc/$(PACKAGE)-dev/html/api
-	/usr/share/ocaml/ocamldoc-api-ref-config --doc-base-generate $(PACKAGE)-dev
-
-	dh install --after auto_install
+	dh install --before auto_install --with ocaml
+	$(MAKE) $(HAS_OPT) install \
+	      DESTDIR=$(CURDIR)/debian/$(PACKAGE)-dev \
+	      STUBDIR=$(CURDIR)/debian/$(PACKAGE)/$(OCAML_DLL_DIR)
+	dh install --after auto_install --with ocaml
 	touch $@
 
-binary-indep: install-stamp
-	dh $@
-
-binary-arch: install-stamp
-	echo 'F:OCamlAbi=$(OCAML_ABI)' >> debian/$(PACKAGE).substvars
-	echo 'F:OCamlAbi=$(OCAML_ABI)' >> debian/$(PACKAGE)-dev.substvars
-	dh $@
+binary-arch binary-indep: install-stamp
+	dh $@ --with ocaml
 
-binary: binary-indep binary-arch
+binary: binary-arch binary-indep
 
 .PHONY: build clean clean1 binary-indep binary-arch binary install

-- 
mlgmp packaging



More information about the Pkg-ocaml-maint-commits mailing list