[Pkg-ocaml-maint-commits] [SCM] camlzip packaging branch, master, updated. debian/1.04-5-5-g591cfcb

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 7bf85024847d3319dbdd8db672241d61db0aed60
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Sep 29 09:38:49 2009 +0200

    Switch to dh / dh-ocaml 0.9

diff --git a/debian/control b/debian/control
index b6c2984..83ba1bf 100644
--- a/debian/control
+++ b/debian/control
@@ -10,12 +10,12 @@ Uploaders:
  Ralf Treinen <treinen at debian.org>,
  Stéphane Glondu <glondu at debian.org>
 Build-Depends:
- debhelper (>= 7.0.0),
- quilt,
+ debhelper (>= 7.0.50~),
+ quilt (>= 0.46-7~),
  zlib1g-dev (>> 1.1.4),
- ocaml-nox (>= 3.11),
+ ocaml-nox (>= 3.11.1-3~),
  dpkg-dev (>= 1.13.19),
- dh-ocaml
+ dh-ocaml (>= 0.9)
 Homepage: http://pauillac.inria.fr/~xleroy/software.html#camlzip
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlzip.git
@@ -24,9 +24,10 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlzip.git
 Package: libzip-ocaml
 Architecture: any
 Depends:
- ocaml-base-nox-${F:OCamlABI},
+ ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
+Provides: ${ocaml:Provides}
 Conflicts: libzip-ocaml-dev (<< 1.04-4)
 Replaces: libzip-ocaml-dev (<< 1.04-4)
 Description: OCaml compression libraries (runtime libraries)
@@ -39,14 +40,13 @@ Description: OCaml compression libraries (runtime libraries)
 Package: libzip-ocaml-dev
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
  zlib1g-dev (>> 1.1.4),
- libzip-ocaml (= ${binary:Version}),
+ ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
 Conflicts: camlzip
 Replaces: camlzip
-Provides: camlzip
+Provides: camlzip, ${ocaml:Provides}
 Description: OCaml compression libraries (development files)
  This Objective Caml library provides easy access to compressed files in ZIP
  and GZIP format, as well as to Java JAR files.  It provides functions
diff --git a/debian/libcamlzip-ocaml-dev.ocamldoc b/debian/libcamlzip-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..e69de29
diff --git a/debian/libzip-ocaml-dev.ocamldoc b/debian/libzip-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..e69de29
diff --git a/debian/rules b/debian/rules
index e926285..7bc0fc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,6 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
 include /usr/share/ocaml/ocamlvars.mk
-include /usr/share/ocaml/ocamlinit.mk
-include /usr/share/quilt/quilt.make
 
 INSTALLDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)/zip
 VERSION := $(shell head -n1 debian/changelog | awk -F'[ ()-]+' '{print $$2}')
@@ -12,83 +8,21 @@ VERSION := $(shell head -n1 debian/changelog | awk -F'[ ()-]+' '{print $$2}')
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-configure: configure-stamp
-configure-stamp: ocamlinit
-	dh_testdir
-	touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp: $(QUILT_STAMPFN)
-	dh_testdir
+%:
+	dh --with ocaml --with quilt $@
 
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
 	$(MAKE)
 ifneq ($(OCAML_OPT_ARCH),)
 	$(MAKE) allopt
 	ocamlopt -I . -shared -linkall -o zip.cmxs zip.cmxa
 endif
 
-	touch build-stamp
-
-clean: unpatch ocamlinit-clean
-	dh_testdir
-	dh_testroot
-	-$(RM) build-stamp
-	-$(RM) configure-stamp
-	-$(RM) *.so
-	$(MAKE) clean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 ifneq ($(OCAML_OPT_ARCH),)
 	$(MAKE) installopt DESTDIR=$(CURDIR)/debian/tmp
 endif
 	sed 's/@VERSION@/$(VERSION)/' debian/META.in > $(INSTALLDIR)/META
-
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -s
-	dh_testroot -s
-	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_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_STDLIB_DIR)/ \
-  	    -type f -name '*.mli' \
-	    | 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/ocaml/ocaml-docbase-template.txt \
-	     > debian/$$i.doc-base.ocamldoc-apiref ; \
-	done
-	dh_installdocs -s
-	dh_installexamples -s
-	dh_installmenu -s
-	dh_installcron -s
-	dh_installman -s
-	dh_installinfo -s
-	dh_installchangelogs -s
-	dh_link -s
-	dh_strip -s
-	dh_compress -s
-	dh_fixperms -s
-	dh_installdeb -s
-	dh_shlibdeps -s
-	dh_gencontrol -s -- -VF:OCamlABI="$(OCAML_ABI)"
-	dh_md5sums -s
-	dh_builddeb -s
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure

-- 
camlzip packaging