[Pkg-ocaml-maint-commits] [SCM] spamoracle packaging branch, master, updated. debian/1.4-12-3-g2465221

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 2465221a717ea66246419cc94afccc0c8638ed7b
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Wed Feb 25 22:03:48 2009 +0100

    Update package.

diff --git a/debian/changelog b/debian/changelog
index ab086d5..4084572 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
-spamoracle (1.4-13) UNRELEASED; urgency=low
-
-  [ Sylvain Le Gall ]
-  * NOT RELEASED YET
+spamoracle (1.4-13) unstable; urgency=low
 
   [ Samuel Mimram ]
-  * Switch packaging to git
+  * Switch packaging to git.
+  * Use dh-ocaml.
+  * Update compat to 7.
+  * Update standards version to 3.8.0.
 
- -- Samuel Mimram <smimram at debian.org>  Wed, 25 Feb 2009 21:57:11 +0100
+ -- Samuel Mimram <smimram at debian.org>  Wed, 25 Feb 2009 21:58:31 +0100
 
 spamoracle (1.4-12) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index 7542c67..89f5e91 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: net
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>> 6.0.0), ocaml-nox (>= 3.10), dpatch
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7), dh-ocaml, ocaml-nox (>= 3.11), dpatch
+Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/spamoracle.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/spamoracle.git
 
 Package: spamoracle
-Architecture: amd64 hurd-i386 i386 kfreebsd-i386 powerpc sparc
+Architecture: amd64 hurd-i386 i386 kfreebsd-i386 lpia powerpc sparc
 Depends: ${shlibs:Depends}
 Conflicts: spamoracle-byte
 Replaces: spamoracle-byte
diff --git a/debian/control.in b/debian/control.in
index f6677af..eb04ad7 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,10 +3,10 @@ Section: net
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>> 6.0.0), ocaml-nox (>= 3.10), dpatch
-Standards-Version: 3.7.3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/spamoracle/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/spamoracle/trunk/
+Build-Depends: debhelper (>= 7), dh-ocaml, ocaml-nox (>= 3.11), dpatch
+Standards-Version: 3.8.0
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/spamoracle.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/spamoracle.git
 
 Package: spamoracle
 Architecture: @OCamlNativeArchs@
diff --git a/debian/copyright b/debian/copyright
index 43ec4f2..65131a2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ Upstream Author: Xavier Leroy <xavier.leroy at inria.fr>
 
 Copyright:
 
-Copyright 2002 Institut National de Recherche en Informatique et   
-en Automatique.  This file is distributed under the terms of the   
+Copyright 2002 Institut National de Recherche en Informatique et
+en Automatique.  This file is distributed under the terms of the
 GNU Public License version 2, which you may find in
-/usr/share/common-licenses/GPL on debian systems
+/usr/share/common-licenses/GPL-2 on debian systems
diff --git a/debian/patches/build.dpatch b/debian/patches/build.dpatch
old mode 100644
new mode 100755
diff --git a/debian/rules b/debian/rules
index 302cf44..38b9759 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,17 +2,12 @@
 # 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/dpatch/dpatch.make
-PACKAGE = spamoracle
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-OCAMLABI := $(shell ocamlc -version)
-OCAML_STDLIB_DIR := $(shell /usr/bin/ocamlc -where)
-OCAML_NATIVE_ARCHS := $(shell cat $(OCAML_STDLIB_DIR)/native-archs)
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -40,9 +35,9 @@ build-stamp: patch-stamp configure-stamp
 	dh_testdir
 
 	$(MAKE) spamoracle.byte
-	if [ -x /usr/bin/ocamlopt ]; then \
-		$(MAKE) spamoracle; \
-	fi
+ifneq ($(OCAML_OPT_ARCH),)
+	$(MAKE) spamoracle
+endif
 
 	touch build-stamp
 
@@ -58,13 +53,12 @@ clean: unpatch
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
-	# Add here commands to install the package into debian/advi.
-	if [ -x /usr/bin/ocamlopt ]; then \
-		$(MAKE) install DESTDIR=$(CURDIR)/debian/spamoracle; \
-	fi
+ifneq ($(OCAML_OPT_ARCH),)
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/spamoracle
+endif
 	$(MAKE) install.byte DESTDIR=$(CURDIR)/debian/spamoracle-byte
 	install -m 644 debian/spamoracle-byte.override \
 		$(CURDIR)/debian/spamoracle-byte/usr/share/lintian/overrides/spamoracle-byte
@@ -91,7 +85,7 @@ binary-indep: build install
 		$(CURDIR)/debian/spamoracle-byte/usr/share/doc/spamoracle-byte
 	dh_installdeb -i
 	dh_shlibdeps -i
-	dh_gencontrol -i -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -i -- -VF:OCamlABI="$(OCAML_ABI)"
 	dh_md5sums -i
 	dh_builddeb -i
 
@@ -116,10 +110,9 @@ binary-arch: build install
 #	dh_makeshlibs -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
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
-

-- 
spamoracle packaging