[Pkg-ocaml-maint-commits] [SCM] ocaml-curses packaging branch, master, updated. debian/1.0.2-2-4-ga5b62b0

[Samuel Mimram]

The following commit has been merged in the master branch:
commit a5b62b0dd9af4c3192f35c35287ab54c19747b9f
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Sun Mar 1 21:13:52 2009 +0100

    Update package.

diff --git a/debian/changelog b/debian/changelog
index eb783ed..39900d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
-ocaml-curses (1.0.2-3) UNRELEASED; urgency=low
-
-  [ Stefano Zacchiroli ]
-  * fix vcs-svn field to point just above the debian/ dir
+ocaml-curses (1.0.2-3) unstable; urgency=low
 
   [ Stephane Glondu ]
-  * Switch packaging to git
+  * Switch packaging to git.
+
+  [ Samuel Mimram ]
+  * Rebuild with OCaml 3.11.
+  * Use dh-ocaml.
+  * Update compat to 7.
+  * Update standards version to 3.8.0.
+  * Add Homepage field.
 
- -- Stephane Glondu <steph at glondu.net>  Fri, 13 Feb 2009 15:51:26 +0100
+ -- Samuel Mimram <smimram at debian.org>  Sun, 01 Mar 2009 21:10:25 +0100
 
 ocaml-curses (1.0.2-2) unstable; urgency=low
 
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 39d62c0..2b4da54 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: ocaml-curses
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>> 4.0.0), dpkg-dev (>= 1.13.19), libncurses5-dev, ocaml-nox (>= 3.10), ocaml-findlib, dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), libncurses5-dev, ocaml-nox (>= 3.11), dh-ocaml, ocaml-findlib (>= 1.2.4), dpatch
+Standards-Version: 3.8.0
+Homepage: http://www.nongnu.org/ocaml-tmk/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-curses.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-curses.git
 
diff --git a/debian/libcurses-ocaml-dev.install.in b/debian/libcurses-ocaml-dev.install.in
index 6c3aca1..dfdfb1d 100644
--- a/debian/libcurses-ocaml-dev.install.in
+++ b/debian/libcurses-ocaml-dev.install.in
@@ -1,4 +1,4 @@
-usr/lib/ocaml/@OCamlABI@/curses/META
-usr/lib/ocaml/@OCamlABI@/curses/*.a
-usr/lib/ocaml/@OCamlABI@/curses/*.cm*
-usr/lib/ocaml/@OCamlABI@/curses/*.ml*
+ at OCamlStdlibDir@/curses/META
+ at OCamlStdlibDir@/curses/*.a
+ at OCamlStdlibDir@/curses/*.cm*
+ at OCamlStdlibDir@/curses/*.ml*
diff --git a/debian/libcurses-ocaml.install.in b/debian/libcurses-ocaml.install.in
index f9bebc0..bc97f07 100644
--- a/debian/libcurses-ocaml.install.in
+++ b/debian/libcurses-ocaml.install.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/curses/dllcurses_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/
+ at OCamlStdlibDir@/curses/dllcurses_stubs.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index cb1738f..6feee95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,31 +5,27 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
 include /usr/share/dpatch/dpatch.make
 
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
-
-DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where)
+DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 
 CFLAGS = "-O2 -g -fPIC"
 
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-
 build: patch ocamlinit build-stamp
 build-stamp:
 	dh_testdir
 
 	$(MAKE) CFLAGS=$(CFLAGS) byte
-	if [ -e /usr/bin/ocamlopt ]; then \
-		$(MAKE) CFLAGS=$(CFLAGS) opt; \
-	fi
+ifneq ($(OCAML_OPT_ARCH),)
+	$(MAKE) CFLAGS=$(CFLAGS) opt
+endif
 	$(MAKE) htdoc
 
 	touch build-stamp
 
-clean: unpatch
+clean: unpatch ocamlinit-clean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -41,7 +37,7 @@ clean: unpatch
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	mkdir -p $(DESTDIR)
@@ -53,7 +49,7 @@ binary-arch: build install
 	dh_installchangelogs CHANGES
 	dh_installdocs
 	dh_installexamples
-	dh_install --sourcedir=debian/tmp --list-missing
+	dh_install --list-missing
 	dh_link
 	dh_strip
 	dh_compress
@@ -61,7 +57,7 @@ binary-arch: build install
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
 	dh_md5sums
 	dh_builddeb
 

-- 
ocaml-curses packaging