[Pkg-ocaml-maint-commits] [SCM] camlzip packaging branch, master, updated. debian/1.04-1-9-g5344f69

Tue Feb 24 16:54:49 UTC 2009

The following commit has been merged in the master branch:
commit 3abd2c0ba44ebefdd82cf5d8e88eefe63d977434
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Tue Feb 24 17:49:16 2009 +0100

    Use dh-ocaml's predefined variables.

diff --git a/debian/changelog b/debian/changelog
index d2d9e33..27e380b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
 camlzip (1.04-2) UNRELEASED; urgency=low
 
-  [ Samuel Mimram ]
-  * NOT RELEASED YET
-
   [ Stephane Glondu ]
   * Switch packaging to git
 
- -- Stephane Glondu <steph at glondu.net>  Tue, 10 Feb 2009 17:01:31 +0100
+  [ Samuel Mimram ]
+  * Use dh-ocaml's predefined variables.
+
+ -- Samuel Mimram <smimram at debian.org>  Tue, 24 Feb 2009 17:48:49 +0100
 
 camlzip (1.04-1) experimental; urgency=low
 
diff --git a/debian/libzip-ocaml-dev.install b/debian/libzip-ocaml-dev.install
deleted file mode 100644
index 0f21d67..0000000
--- a/debian/libzip-ocaml-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/ocaml/3.10.2/zip/META
-usr/lib/ocaml/3.10.2/zip/*.a
-usr/lib/ocaml/3.10.2/zip/*.cm*
-usr/lib/ocaml/3.10.2/zip/*.ml*
diff --git a/debian/libzip-ocaml-dev.install.in b/debian/libzip-ocaml-dev.install.in
index e23448e..ac88841 100644
--- a/debian/libzip-ocaml-dev.install.in
+++ b/debian/libzip-ocaml-dev.install.in
@@ -1,4 +1,4 @@
-usr/lib/ocaml/@OCamlABI@/zip/META
-usr/lib/ocaml/@OCamlABI@/zip/*.a
-usr/lib/ocaml/@OCamlABI@/zip/*.cm*
-usr/lib/ocaml/@OCamlABI@/zip/*.ml*
+ at OCamlStdlibDir@/zip/META
+ at OCamlStdlibDir@/zip/*.a
+ at OCamlStdlibDir@/zip/*.cm*
+ at OCamlStdlibDir@/zip/*.ml*
diff --git a/debian/libzip-ocaml.install b/debian/libzip-ocaml.install
deleted file mode 100644
index 7b7a78f..0000000
--- a/debian/libzip-ocaml.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/ocaml/3.10.2/stublibs/dllcamlzip.so
diff --git a/debian/libzip-ocaml.install.in b/debian/libzip-ocaml.install.in
index 0e233e0..7d0dce8 100644
--- a/debian/libzip-ocaml.install.in
+++ b/debian/libzip-ocaml.install.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/stublibs/dllcamlzip.so
+ at OCamlDllDir@/dllcamlzip.so
diff --git a/debian/patches/build.dpatch b/debian/patches/build.dpatch
old mode 100644
new mode 100755
diff --git a/debian/patches/uncompress.dpatch b/debian/patches/uncompress.dpatch
old mode 100644
new mode 100755
diff --git a/debian/rules b/debian/rules
index 09675e4..42f2358 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,20 +2,15 @@
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
-# We want to use dpatch.
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
 include /usr/share/dpatch/dpatch.make
-PACKAGE := camlzip
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
-INSTALLDIR := $(CURDIR)/debian/tmp/$(shell ocamlc -where)/zip
-OCAML_LIBDIR=$(shell ocamlc -where)
+
+INSTALLDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)/zip
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-	
 configure: configure-stamp
 configure-stamp: ocamlinit
 	dh_testdir
@@ -26,16 +21,16 @@ build-stamp: patch-stamp
 	dh_testdir
 
 	$(MAKE)
-	if [ -x /usr/bin/ocamlopt ]; then \
-		$(MAKE) allopt; \
-	fi
+ifneq ($(OCAML_OPT_ARCH),)
+	$(MAKE) allopt
+endif
 
 	touch build-stamp
 
-clean: unpatch
+clean: unpatch ocamlinit-clean
 	dh_testdir
 	dh_testroot
-	-$(RM) build-stamp 
+	-$(RM) build-stamp
 	-$(RM) configure-stamp
 	-$(RM) *.so
 	$(MAKE) clean
@@ -48,9 +43,9 @@ install: build
 	dh_installdirs
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	if [ -x /usr/bin/ocamlopt ]; then \
-		$(MAKE) installopt DESTDIR=$(CURDIR)/debian/tmp ; \
-	fi
+ifneq ($(OCAML_OPT_ARCH),)
+	$(MAKE) installopt DESTDIR=$(CURDIR)/debian/tmp
+endif
 	cp debian/META $(INSTALLDIR)
 
 # Build architecture-independent files here.
@@ -60,20 +55,20 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir -s
 	dh_testroot -s
-	dh_install -s --sourcedir=debian/tmp --list-missing
+	dh_install -s --list-missing
 	# Doc generation (TODO: use CDBS)
 	OCAMLDOC_PKG="libzip-ocaml-dev"; \
-	OCAMLDOC_INCLUDE=`for i in $$OCAMLDOC_PKG; do find debian/$$i/$(OCAML_LIBDIR)/ -type d -exec echo -I \{} \; ; done`; \
+	OCAMLDOC_INCLUDE=`for i in $$OCAMLDOC_PKG; do find debian/$$i/$(OCAML_STDLIB_DIR)/ -type d -exec echo -I \{} \; ; done`; \
 	for i in $$OCAMLDOC_PKG; do \
 	  mkdir -p debian/$$i/usr/share/doc/$$i/html/api; \
-	  find debian/$$i/$(OCAML_LIBDIR)/ \
+	  find debian/$$i/$(OCAML_STDLIB_DIR)/ \
   	    -type f -name '*.mli' \
-	    | xargs ocamldoc \
+	    | xargs $(OCAML_OCAMLDOC) \
 	     -stars -m A -no-custom-tags $$OCAMLDOC_INCLUDE -html \
 	     -d debian/$$i/usr/share/doc/$$i/html/api \
             || true; \
 	    sed -e "s/@PACKAGE@/$$i/g" \
-	     /usr/share/cdbs/1/class/ocaml-docbase-template.txt \
+	     /usr/share/ocaml/ocaml-docbase-template.txt \
 	     > debian/$$i.doc-base.ocamldoc-apiref ; \
 	done
 	dh_installdocs -s
@@ -86,11 +81,10 @@ binary-arch: build install
 	dh_link -s
 	dh_strip -s
 	dh_compress -s
-#	dh_ocamlld -plibzip-ocaml /usr/lib/ocaml/zip
 	dh_fixperms -s
 	dh_installdeb -s
 	dh_shlibdeps -s
-	dh_gencontrol -s -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -s -- -VF:OCamlABI="$(OCAML_ABI)"
 	dh_md5sums -s
 	dh_builddeb -s
 

-- 
camlzip packaging

