[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. upstream/0.20081011-229-ge5b9b45

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 2296ef7d7fd741ddef99c532a9913a396b7216e4
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Tue Nov 11 13:14:22 2008 +0100

    port debian/rules to upstream ./configure
    
    - use CDBS' autotools.mk
    - pass Debian-specific flags to ./configure
    - update wrt new upstream Makefile targets

diff --git a/debian/changelog b/debian/changelog
index e4afbc0..3fc3f8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ocaml-batteries (0.20081111-1) UNRELEASED; urgency=low
     - remote patch features/flexi-build (integrated upstream)
   * debian/control: correct spelling of "metapackage"
   * debian/control: fix sections: -dev in libdevel, -doc in doc
+  * debian/rules: port to new upstream, which is now using autotools
 
  -- Stefano Zacchiroli <zack at debian.org>  Mon, 13 Oct 2008 22:11:31 +0200
 
diff --git a/debian/rules b/debian/rules
index 201c13f..c13e58b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/ocaml.mk
 
@@ -9,7 +9,10 @@ DEV_PKG_NAME = lib$(LIB_NAME)-ocaml-dev
 DOC_PKG_NAME = lib$(LIB_NAME)-ocaml-doc
 DEST_DIR = $(CURDIR)/debian/$(DEV_PKG_NAME)$(OCAML_STDLIB_DIR)
 
-DEB_MAKE_BUILD_TARGET = byte
+DEB_CONFIGURE_EXTRA_FLAGS = --with-browser="x-www-browser %s"
+DEB_CONFIGURE_EXTRA_FLAGS += --with-docroot="/usr/share/doc/$(DEV_PKG_NAME)"
+
+DEB_MAKE_BUILD_TARGET = all
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_BUILD_TARGET += opt
 endif

-- 
ocaml-batteries packaging