[Pkg-ocaml-maint-commits] [SCM] ocaml-getopt packaging branch, master, updated. debian/0.0.20040811-9-2-gcaef726

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit caef7261116b32fc3995d868fafcb6b96a94b3c9
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Oct 6 21:56:49 2009 +0200

    Various changes

diff --git a/debian/changelog b/debian/changelog
index 9f0fa71..e57c3fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
 ocaml-getopt (0.0.20040811-10) UNRELEASED; urgency=low
 
+  [ Stéphane Glondu ]
   * Switch packaging to git
 
- -- Stéphane Glondu <glondu at debian.org>  Tue, 06 Oct 2009 18:59:07 +0200
+  [ Mehdi Dogguy ]
+  * Refresh packaging:
+    - Use debhelper (>= 7.0.50~)
+    - Updated standards version to 3.8.3
+    - Use new features of dh-ocaml (>= 0.9~)
+  * Install debian/libgetopt-ocaml-dev.doc-base by hand instead of
+    using ocamldoc-api-ref-config (Closes: #549796)
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 06 Oct 2009 21:40:28 +0200
 
 ocaml-getopt (0.0.20040811-9) unstable; urgency=low
 
@@ -77,4 +86,3 @@ ocaml-getopt (0.0.20040811-1) unstable; urgency=low
   * Initial Release (Closes: 303971).
 
  -- Mike Furr <mfurr at debian.org>  Sat,  9 Apr 2005 18:00:56 -0400
-
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index b8fa624..958786d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,27 @@ Source: ocaml-getopt
 Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Mike Furr <mfurr at debian.org>, Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Build-Depends: debhelper (>= 5.0.0), ocaml-nox (>= 3.11.1), ocaml-findlib (>> 1.2.4-2), dh-ocaml (>= 0.4.1)
-Standards-Version: 3.8.2
+Uploaders:
+ Mike Furr <mfurr at debian.org>,
+ Mehdi Dogguy <mehdi at debian.org>
+Build-Depends:
+ debhelper (>= 7.0.50~),
+ ocaml-nox (>= 3.11.1-3~),
+ ocaml-findlib (>> 1.2.4-2),
+ dh-ocaml (>= 0.9~)
+Standards-Version: 3.8.3
 Homepage: http://alain.frisch.fr/soft.html#Getopt
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-getopt.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-getopt.git
 
 Package: libgetopt-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}
+Depends:
+ ${ocaml:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
+Provides:
+ ${ocaml:Provides}
 Description: command line parsing library for OCaml
  This package provides the Getopt module that is an alternative to the
  Arg module in the standard distribution.  Getopt supports the general
diff --git a/debian/libgetopt-ocaml-dev.doc-base b/debian/libgetopt-ocaml-dev.doc-base
new file mode 100644
index 0000000..53d3ef3
--- /dev/null
+++ b/debian/libgetopt-ocaml-dev.doc-base
@@ -0,0 +1,9 @@
+Document: ocaml-getopt
+Title: OCaml-Getopt API documentation
+Author: Alain Frisch
+Abstract: ocaml-getopt ocamldoc-generated API documentation
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libgetopt-ocaml-dev/html/index.html
+Files: /usr/share/doc/libgetopt-ocaml-dev/html/*
diff --git a/debian/rules b/debian/rules
index 1da6168..12107ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,77 +1,22 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-OCAMLABI = $(shell ocamlc -version)
 include /usr/share/ocaml/ocamlvars.mk
-ABI_FILES = $(wildcard debian/*.in)
-
-.PHONY: transition
-
-transition: $(ABI_FILES)
-	for t in $^; do \
-	    sed -e 's%#OCamlABI#%$(OCAMLABI)%' $$t >$${t%.in}; \
-	done
-
-build: build-stamp
-
-build-stamp:
-	dh_testdir
-
-	if [ -e /usr/bin/ocamlopt ]; then \
-	  $(MAKE) allopt; \
-	else \
-	  $(MAKE) all; \
-	fi
 
-	touch build-stamp
+override_dh_auto_build:
+ifneq ($(OCAML_OPT_ARCH),)
+	$(MAKE) allopt
+else
+	$(MAKE) all
+endif
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
+override_dh_auto_clean:
+	$(MAKE) clean
 
-	-$(MAKE) clean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	
+override_dh_auto_install:
 	dh_install doc/* usr/share/doc/libgetopt-ocaml-dev/html/
-
 	mkdir -p $(CURDIR)/debian/libgetopt-ocaml-dev$(OCAML_STDLIB_DIR)
 	$(MAKE) install OCAMLFIND_DESTDIR=$(CURDIR)/debian/libgetopt-ocaml-dev$(OCAML_STDLIB_DIR)
 	cp getopt.mli $(CURDIR)/debian/libgetopt-ocaml-dev$(OCAML_STDLIB_DIR)/getopt
 
-	/usr/share/ocaml/ocamldoc-api-ref-config --doc-base-generate libgetopt-ocaml-dev
-	sed -i 's/api\///' debian/libgetopt-ocaml-dev.doc-base.ocamldoc-apiref
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs Changes
-	dh_installdocs
-	dh_installexamples sample.ml
-	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
+%:
+	dh --with ocaml $@

-- 
ocaml-getopt packaging