[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, sid/master, updated. debian/1.6.0-14-5-gf819a08

[Stephane Glondu]

The following commit has been merged in the sid/master branch:
commit d4d4d8e3fa1a18f610df9f24c5b27ef7f20bd053
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Nov 3 16:16:44 2009 +0100

    Switch to dh-ocaml 0.9

diff --git a/debian/control b/debian/control
index 3ef0e0d..16bcb16 100644
--- a/debian/control
+++ b/debian/control
@@ -10,16 +10,16 @@ Uploaders:
  Samuel Mimram <smimram at debian.org>,
  Stéphane Glondu <glondu at debian.org>
 Build-Depends:
- debhelper (>= 7.0.52),
- quilt (>= 0.46-7),
- dh-ocaml,
+ debhelper (>= 7.2.11~),
+ quilt (>= 0.46-7~),
+ dh-ocaml (>= 0.9),
  tex-common (>= 1.15),
  texlive,
  texlive-pictures,
  texlive-pstricks,
  texlive-latex-extra,
- ocaml,
- libcamlimages-ocaml-dev,
+ ocaml (>= 3.11.1-3~),
+ libcamlimages-ocaml-dev (>= 1:3.0.1-4~),
  zlib1g-dev,
  ocaml-best-compilers,
  hevea,
@@ -33,7 +33,12 @@ Homepage: http://pauillac.inria.fr/advi/
 
 Package: advi
 Architecture: any
-Depends: ${shlibs:Depends}, texlive-base-bin, texlive-base
+Depends:
+ texlive-base,
+ texlive-base-bin,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
 Suggests: ttf-kochi-gothic, ttf-kochi-mincho, bzip2
 Replaces: mldvi, activedvi
 Description: an active DVI previewer and presenter
@@ -51,7 +56,7 @@ Description: an active DVI previewer and presenter
 
 Package: advi-examples
 Architecture: all
-Depends: texlive-latex-base, advi, imagemagick
+Depends: texlive-latex-base, advi, imagemagick, ${misc:Depends}
 Conflicts: advi (<< 1.6.0-4)
 Suggests: ttf-kochi-gothic, ttf-kochi-mincho, ocaml-base-nox, mpg321, tk8.4, xterm
 Description: example presentations for Active-DVI (advi)
diff --git a/debian/rules b/debian/rules
index 9f03f15..87532ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,14 +6,13 @@
 
 include /usr/share/ocaml/ocamlvars.mk
 OCAML_HAVE_OPTOPT ?= $(if $(wildcard /usr/bin/ocamlopt.opt),yes,no)
-DH := dh --with quilt --with tex
 
 PACKAGE := advi
 VERSION := 1.6.0
 DIRS_TO_BACKUP := doc test
 
 %:
-	$(DH) $@
+	dh --with quilt,tex,ocaml $@
 
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
@@ -28,7 +27,7 @@ endif
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
 ifeq ($(wildcard backup),)
-	mkdir backup	
+	mkdir backup
 	for u in $(DIRS_TO_BACKUP); do cp -a $$u backup; done
 endif
 	dh_auto_configure

-- 
advi packaging