Update packaging

diff --git a/debian/dispatch.ml b/debian/dispatch.ml
index eb83a53b85eb3f53e7a9714d41de5e60413cc2d5..f821b88043a029f780a2adb6ddf8aed90092e755 100644 (file)
--- a/debian/dispatch.ml
+++ b/debian/dispatch.ml
@@ -104,6 +104,9 @@ let () =
       "usr/bin/ocamlprof", ocaml_nox;
       "usr/bin/ocamlmktop", ocaml_nox;
       "usr/lib/ocaml/camlheader", ocaml_nox;
+      "usr/lib/ocaml/camlheaderd", ocaml_nox;
+      "usr/lib/ocaml/camlheaderi", ocaml_nox;
+      "usr/lib/ocaml/eventlog_metadata", ocaml_nox;
       "usr/lib/ocaml/Makefile.config", ocaml_nox;
       "usr/lib/ocaml/extract_crc", ocaml_nox;
       "usr/lib/ocaml/camlheader_ur", ocaml_nox;

diff --git a/debian/ocamlvars.mk b/debian/ocamlvars.mk
index a95cd47bcbb6043a0c85a60580dd5571a478ef9c..7cc96e079da2d416a8481e8cc79517e681cf5377 100644 (file)
--- a/debian/ocamlvars.mk
+++ b/debian/ocamlvars.mk
@@ -1,6 +1,6 @@
 include /usr/share/dpkg/architecture.mk
 
-OCAMLMAJOR := 4.08
+OCAMLMAJOR := 4.11
 OCAMLMINOR := 1
 
 OCAML_ABI := $(OCAMLMAJOR).$(OCAMLMINOR)

diff --git a/debian/rules b/debian/rules
index ba4d5efd0dbf20ae2fe95b922190f82d21556f9e..624ec5e358136fffcad596d3a605eb4f3fffa410 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -92,8 +92,8 @@ pre-config-stamp: $(TARBALL_TARGET)
        set -e; for ext in sub guess; do \
          if [ -f /usr/share/misc/config.$$ext ] && \
            ! [ -f debian/config.orig.$$ext ]; then \
-           mv config/gnu/config.$$ext debian/config.orig.$$ext; \
-           cp -f /usr/share/misc/config.$$ext config/gnu/config.$$ext; \
+           mv build-aux/config.$$ext debian/config.orig.$$ext; \
+           cp -f /usr/share/misc/config.$$ext build-aux/config.$$ext; \
          fi; \
        done
 # Debian kfreebsd has non-working shims for dup3/pipe2, see #827935. Upstream
@@ -173,7 +173,7 @@ endif
        fi
        set -e; for ext in sub guess; do \
          if [ -f debian/config.orig.$$ext ] ; then \
-           mv -f debian/config.orig.$$ext config/gnu/config.$$ext; \
+           mv -f debian/config.orig.$$ext build-aux/config.$$ext; \
          fi; \
        done
 # Remaining stuff
@@ -269,28 +269,24 @@ SLOW_ARCHITECTURES := armel armhf ia64 mips mipsel powerpc powerpcspe sparc
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
        : # tries to connect the net
-       sed -i /sockets.ml/d testsuite/tests/lib-threads/ocamltests
        rm -f testsuite/tests/lib-threads/sockets.*
        : # FIXME: the following tests fail, we temporarily disable them
        rm -rf testsuite/tests/tool-debugger/basic/
        rm -rf testsuite/tests/tool-debugger/find-artifacts/
        rm -rf testsuite/tests/tool-debugger/no_debug_event/
 ifneq (,$(filter $(DEB_BUILD_ARCH),$(SLOW_ARCHITECTURES)))
-       sed -i /almabench.ml/d testsuite/tests/misc-unsafe/ocamltests
        rm -f testsuite/tests/misc-unsafe/almabench.ml
 endif
 # testpreempt test is too unreliable.
 # It failed at least once on kfreebsd and amd64.
-       sed -i /testpreempt.ml/d testsuite/tests/lib-systhreads/ocamltests
        rm -f testsuite/tests/lib-systhreads/testpreempt.ml
 ifneq (,$(findstring hurd,$(DEB_BUILD_ARCH)))
-       sed -i /beat.ml/d testsuite/tests/lib-threads/ocamltests
        rm -f testsuite/tests/lib-threads/beat.ml
-       sed -i /threadsigmask.ml/d testsuite/tests/lib-systhreads/ocamltests
        rm -f testsuite/tests/lib-systhreads/threadsigmask.ml
 endif
 ifeq (,$(DEB_TEST_BUILD_PREFIX))
-       cd testsuite && make all
+       make -C ocamltest
+       make -C testsuite all
 endif
 endif
 
@@ -300,7 +296,7 @@ override_dh_installdocs:
        dh_installdocs --remaining-packages
 
 override_dh_autoreconf:
-       ./autogen
+       ./tools/autogen
 
 # FIXME: figure out why dh_dwz fails
 override_dh_dwz: