[Pkg-ocaml-maint-commits] [SCM] approx upstream and debian packaging branch, master, updated. upstream/3.5-103-g447143e

[Eric Cooper]

The following commit has been merged in the master branch:
commit db24293042051d139fce5b31d61e1c774154dc5f
Author: Eric Cooper <ecc at cmu.edu>
Date:   Fri Mar 6 16:56:40 2009 -0500

    update packaging for OCaml 3.11
    
    on bytecode-only architectures:
        eliminate custom mode
        ship dllapprox.so
        depend on the runtime versions of libraries in build-deps

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 cb8a0f8..bae097b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Eric Cooper <ecc at cmu.edu>
 Uploaders: Sylvain Le Gall <gildor at debian.org>, Ralf Treinen <treinen at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 6.0), cdbs, ocaml-nox (>= 3.10), ocaml-best-compilers, libnethttpd-ocaml-dev (>= 2.2.8), libpcre-ocaml-dev (>= 5.11), libsha-ocaml-dev (>= 1.3), libsyslog-ocaml-dev (>= 1.3), libwrap0-dev
+Build-Depends: debhelper (>= 7.0), cdbs, dh-ocaml, ocaml-nox (>= 3.11), ocaml-best-compilers, libnethttpd-ocaml-dev (>= 2.2.9), libpcre-ocaml-dev (>= 5.15), libsha-ocaml-dev (>= 1.5), libsyslog-ocaml-dev (>= 1.4), libwrap0-dev
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/approx.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/approx.git
@@ -12,7 +12,7 @@ Homepage: http://git.debian.org/?p=pkg-ocaml-maint/packages/approx.git
 
 Package: approx
 Architecture: any
-Depends: ${shlibs:Depends}, ${F:OCamlRun}, lsb-base (>= 3.1), adduser, bzip2, curl
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlDeps}, lsb-base (>= 3.2), adduser, bzip2, curl
 Description: caching proxy server for Debian archive files
  Approx is an HTTP-based Debian archive server.
  It fetches packages from remote repositories on demand,
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff --git a/debian/rules b/debian/rules
index 41a077d..42ef1d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,15 +2,15 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
 
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-    DEB_MAKE_BUILD_TARGET = TARGET=native
-    DEB_DH_GENCONTROL_ARGS += -VF:OCamlRun=""
-else
+ifeq ($(OCAML_HAVE_OCAMLOPT),no)
     DEB_MAKE_BUILD_TARGET = TARGET=byte
-    DEB_DH_GENCONTROL_ARGS += -VF:OCamlRun="ocaml-base-nox-$(OCAML_ABI)"
-    DEB_STRIP_EXCLUDE += usr/sbin
+    DEB_DH_INSTALL_ARGS += _build/dllapprox.so $(OCAML_STDLIB_DIR)/stublibs
+    libs_with_stubs := ocamlnet pcre sha syslog
+    comma := ,
+    libdeps := $(patsubst %,lib%-ocaml$(comma),$(libs_with_stubs))
+    DEB_DH_GENCONTROL_ARGS += -VF:OCamlDeps="ocaml-base-nox-$(OCAML_ABI), $(libdeps)"
 endif
 
 configure/approx::

-- 
approx upstream and debian packaging