[Pkg-ocaml-maint-commits] [SCM] cduce packaging branch, master, updated. debian/0.5.0-2-26-gd6170e1

[Pietro Abate]

The following commit has been merged in the master branch:
commit d6170e134f09cfb5d2e4c3b44b541f295839fcd5
Author: Pietro Abate <pietro.abate at pps.jussieu.fr>
Date:   Mon Mar 23 17:42:48 2009 +0100

    - update package

diff --git a/debian/cduce.doc-base b/debian/cduce.doc-base
index 54401fb..d971e84 100644
--- a/debian/cduce.doc-base
+++ b/debian/cduce.doc-base
@@ -2,7 +2,7 @@ Document: cduce
 Title: CDuce documentation
 Author: The CDuce Team (http://www.cduce.org/team.html)
 Abstract: Local copy of the CDuce website including tutorial, users' manual and examples
-Section: interpreters
+Section: Programming
 
 Format: HTML
 Index: /usr/share/doc/cduce/html/index.html
diff --git a/debian/changelog b/debian/changelog
index 3b404c0..ceb2c7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,5 @@
 cduce (0.5.3-1) UNRELEASED; urgency=low
 
-  [ Pietro Abate ]
-  * new upstream release (0.5.3)
-  * recompiled for ocaml 3.11
-  * bump Standards-Version to 3.8.1 (no changes)
-  * add a build-dependency on dh-ocaml
-  * use @OCamlStdlibDir@ in cduce.dirs.in
-
   [ Stefano Zacchiroli ]
   * add Homepage field to debian/control
   * fix vcs-svn field to point just above the debian/ dir
@@ -15,9 +8,18 @@ cduce (0.5.3-1) UNRELEASED; urgency=low
   * debian/watch: use info from download.html web pages (closes: Bug#450060)
 
   [ Pietro Abate ]
-  * Switch packaging to git
+  * switch packaging to git
+  * new upstream release (0.5.3)
+  * recompile with ocaml 3.11
+  * bump Standards-Version to 3.8.1 (no changes)
+  * add a build-dependency on dh-ocaml
+  * use @OCamlStdlibDir@ in cduce.dirs.in
+  * remove dpatch dependency
+  * bump debhelper compatibility to 7
+  * set Maintainer to d-o-m
+  * add myself to Uploaders
 
- -- Pietro Abate <pietro.abate at anu.edu.au>  Fri, 20 Mar 2009 12:05:05 +0100
+ -- Pietro Abate <pietro.abate at pps.jussieu.fr>  Mon, 23 Mar 2009 17:47:53 +0100
 
 cduce (0.5.0-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 2147770..b04f30c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,18 @@ Section: interpreters
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org> 
 Uploaders: Pietro Abate <pietro.abate at pps.jussieu.fr>, Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 5.0.0), ocaml-nox (>= 3.11.0), camlp4-extra, ocaml-source (>= 3.11.0), libpcre-ocaml-dev, libocamlnet-ocaml-dev, libexpat-ocaml-dev, libcurl-ocaml-dev, ocaml-ulex, dpatch, chrpath, bzip2
+Build-Depends: debhelper (>= 7),
+ dh-ocaml,
+ ocaml-nox (>= 3.11.0),
+ camlp4-extra,
+ ocaml-source (>= 3.11.0),
+ libpcre-ocaml-dev,
+ libocamlnet-ocaml-dev,
+ libexpat-ocaml-dev,
+ libcurl-ocaml-dev,
+ ocaml-ulex,
+ chrpath,
+ bzip2
 Standards-Version: 3.8.1
 Homepage: http://www.cduce.org
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cduce.git
diff --git a/debian/rules b/debian/rules
index 7cf3e98..ded3ce0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,64 +1,47 @@
 #!/usr/bin/make -f
 PACKAGE = cduce
-OCAMLABI := $(shell ocamlc -version)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-#export DH_VERBOSE=1
+include /usr/share/ocaml/ocamlinit.mk
+MAKE_OPTS := "NATIVE=$(if $(OCAML_OPT_ARCH),true,false)"
 
-# Workaround for ia64, where ocamlopt has a code generation bug.
-# There we use ocamlc instead.
-ifeq ($(DEB_HOST_ARCH), ia64)
-MAKE_OPTS := "NATIVE=false"
-else
-MAKE_OPTS := $(shell if [ -x /usr/bin/ocamlopt ]; then echo "NATIVE=true"; else echo "NATIVE=false"; fi)
-endif
-
-OCAMLLIBDIR=`ocamlc -where`
-LIBDIR=$(CURDIR)/debian/cduce/$(OCAMLLIBDIR)
+LIBDIR=$(CURDIR)/debian/cduce/$(OCAML_STDLIB_DIR)
 DOCDIR=$(CURDIR)/debian/cduce/usr/share/doc/cduce/html
 BINDIR=$(CURDIR)/debian/cduce/usr/bin
 MANDIR=$(CURDIR)/debian/cduce/usr/share/doc/man
 
-# We use dpatch
-include /usr/share/dpatch/dpatch.make
-PACKAGE = cduce
+CONFIGURE_OPTS := --prefix=/usr \
+  --mliface=debian/ocaml-$(OCAML_ABI) \
+  --with-curl \
+  --without-netclient \
+  --with-expat \
+  --without-pxp
 
-configure-stamp: configure
-	for t in `find debian/ -name \*.in | grep -v debian/control.in`; do \
-		sed -e 's%@OCamlABI@%$(OCAMLABI)%g' $$t >$${t%.in}; \
-	done
+configure: configure-stamp
+configure-stamp: ocamlinit-stamp
 	dh_testdir
-	cd debian && tar xjf /usr/src/ocaml-source-$(OCAMLABI).tar.bz2 && cd ..
-	./configure --prefix=/usr					\
-                    --mliface=debian/ocaml-$(OCAMLABI)			\
-                    --with-curl						\
-		    --without-netclient					\
-                    --with-expat					\
-                    --without-pxp
+	tar -C debian -xjf /usr/src/ocaml-source-$(OCAML_ABI).tar.bz2
+	./configure  $(CONFIGURE_OPTS)
 	touch configure-stamp
 
 build: build-stamp
-build-stamp: patch-stamp configure-stamp
+build-stamp: configure-stamp
 	$(MAKE) $(MAKE_OPTS) all doc
 	touch build-stamp
 
-clean: patch clean1 unpatch
-clean1:
+clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
 
 	touch Makefile.conf
 	[ ! -f Makefile ] || $(MAKE) $(MAKE_OPTS) clean
 	-$(RM) Makefile.conf
-	-$(RM) -f configure-stamp
-	-$(RM) -rf debian/ocaml-$(OCAMLABI)/
-	dh_clean 
+	-$(RM) -rf debian/ocaml-$(OCAML_ABI)/
+	dh_clean
 
 install:
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	# Add here commands to install the indep part of the package into
@@ -87,8 +70,8 @@ binary-arch: build install
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -s -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -s -- -VF:OCamlABI="$(OCAML_ABI)"
 	dh_md5sums
 	dh_builddeb
 
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch 
+.PHONY: configure build clean binary-indep binary-arch binary install

-- 
cduce packaging