[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. debian/1.1.0-2-15-g950a692

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 8805e0fdb97e931590b02dc749ced86b8eb7a470
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Jul 14 20:31:51 2010 +0200

    Adapt debian/rules to new upstream's build system.

diff --git a/debian/changelog b/debian/changelog
index 6b7b24e..7ee3460 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ ocaml-batteries (1.2.2-1) UNRELEASED; urgency=low
 
   [ Mehdi Dogguy ]
   * New upstream release
+  * Adapt debian/rules to new upstream's build system.
 
- -- Mehdi Dogguy <mehdi at debian.org>  Wed, 14 Jul 2010 20:31:02 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 14 Jul 2010 20:31:33 +0200
 
 ocaml-batteries (1.1.0-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index ba7ae8f..afaf2b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,6 @@ BATTERIES_DEB_DOCROOT = $(CURDIR)/debian/tmp/doc
 export BATTERIES_DOCROOT = /usr/share/doc/libbatteries-ocaml-doc/html/api/
 export DESTDIR = $(OCAML_STDLIB_DIR)
 DOC_PKG = libbatteries-ocaml-doc
-OFLAGS = --verbose
 
 %:
 	dh --with quilt,ocaml $@
@@ -15,24 +14,28 @@ ifneq ($(OCAML_HAVE_OCAMLOPT),yes)
 export BATTERIES_NATIVE = false
 endif
 
+ifneq ($(OCAML_NATDYNLINK),yes)
+export BATTERIES_NATIVE_SHLIB=false
+endif
+
 override_dh_auto_build:
-	omake $(OFLAGS) all
+	make all
 ifneq (,$(findstring $(DOC_PKG),$(shell dh_listpackages)))
-	omake $(OFLAGS) doc
+	make doc
 endif
 
 override_dh_auto_test:
-	omake $(OFLAGS) test
+	make test
 
 override_dh_auto_install:
 	mkdir -p $(DEB_DESTDIR) $(BATTERIES_DEB_DOCROOT)
-	DESTDIR=$(DEB_DESTDIR) omake $(OFLAGS) install
+	DESTDIR=$(DEB_DESTDIR) make install
 ifneq (,$(findstring $(DOC_PKG),$(shell dh_listpackages)))
-	DESTDIR=$(DEB_DESTDIR) BATTERIES_DOCROOT=$(BATTERIES_DEB_DOCROOT) omake $(OFLAGS) install-doc
+	make DOCROOT=$(BATTERIES_DEB_DOCROOT) install-doc
 endif
 
 override_dh_auto_clean:
-	omake $(OFLAGS) clean
+	make clean
 	rm -rf man/ .omakedb .omakedb.lock
 	-find . -name '*.omc' -exec rm {} \;
 

-- 
ocaml-batteries packaging