Start updating packaging (not finished!)

diff --git a/debian/ocamlinit.mk b/debian/ocamlinit.mk
index e751aa937a47751459736a2e9c344c5855ab14ad..13f03fd8e72a507b6dc53b55b7aaddd3f280f98d 100644 (file)
--- a/debian/ocamlinit.mk
+++ b/debian/ocamlinit.mk
@@ -26,7 +26,7 @@ _ocaml_share_ocamlinit = 1
 
 include $(CURDIR)/debian/ocamlvars.mk
 include $(_ocaml_share_path)/ocamlvars.mk
--include $(CURDIR)/config/Makefile
+-include $(CURDIR)/Makefile.config
 
 # list of .in files contained (non-recursively) in debian/ that requires
 # pre-build filling.
@@ -71,7 +71,7 @@ OCAMLINIT_SED += $(if $(filter $(1),$(OTHERLIBRARIES)),\
 $(eval $(call otherlib,raw_spacetime_lib))
 
 ocamlinit: ocamlinit-stamp
-ocamlinit-stamp: config/Makefile
+ocamlinit-stamp: Makefile.config
        for t in $(OCAML_IN_FILES); do \
          sed $(OCAMLINIT_SED) $$t.in > $$t; \
        done

diff --git a/debian/ocamlvars.mk b/debian/ocamlvars.mk
index 3a3093efe30b532e27a24447febda5fcf1555e22..0dec6371d6d9d90b5d4a4c7718299223365a1fd8 100644 (file)
--- a/debian/ocamlvars.mk
+++ b/debian/ocamlvars.mk
@@ -1,6 +1,6 @@
 include /usr/share/dpkg/architecture.mk
 
-OCAMLMAJOR := 4.05
+OCAMLMAJOR := 4.08
 OCAMLMINOR := 0
 
 OCAML_ABI := $(OCAMLMAJOR).$(OCAMLMINOR)

diff --git a/debian/rules b/debian/rules
index 96fef6525775073fcd934fa77c69f7e4eb3ec556..ff5997b82edbda2ff63976c56e3634026cd89c9d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -55,20 +55,14 @@ export CCLINKFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 
 CONFIGURE_OPTS := \
   --host $(DEB_BUILD_GNU_TYPE)\
-  --with-pthread -prefix $(DEB_TEST_BUILD_PREFIX)/usr \
+  -prefix $(DEB_TEST_BUILD_PREFIX)/usr \
   -libdir $(DEB_TEST_BUILD_PREFIX)$(OCAML_STDLIB_DIR) \
-  -x11lib "$(shell pkg-config --variable=libdir x11)" \
+  --with-x \
   -mandir $(DEB_TEST_BUILD_PREFIX)/usr/share/man \
 
-CONFIGURE_SED := \
-  -e "/LIBBFD_LINK/s%-lbfd%-Wl,-Bstatic -lbfd -Wl,-Bdynamic%" \
-  -e "s%MANDIR=.*$$%MANDIR=\$$(PREFIX)/share/man%g" \
-  -e "s%LIBDIR=.*$$%LIBDIR=\$$(PREFIX)/lib/ocaml%g" \
-  -e "s%STUBLIBDIR=.*$$%STUBLIBDIR=\$$(PREFIX)/lib/ocaml/stublibs%g"
-
-# Upstream recommends dropping support, see https://caml.inria.fr/mantis/view.php?id=7642
+# Upstream recommends dropping support, see https://github.com/ocaml/ocaml/issues/7642
 ifneq (,$(filter $(DEB_HOST_ARCH),armel))
-CONFIGURE_OPTS += --no-native-compiler
+CONFIGURE_OPTS += --disable-native-compiler
 endif
 
 %:
@@ -100,8 +94,6 @@ pre-config-stamp: $(TARBALL_TARGET)
 ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
        sed -i -e '/HAS_DUP3/d' -e '/HAS_PIPE2/d' ./configure
 endif
-# Create empty directory present in upstream tarball
-       mkdir -p compilerlibs
        touch $@
 
 ifneq (,$(TARBALL_TARGET))
@@ -128,7 +120,6 @@ override_dh_auto_configure: config-stamp ocamlinit-stamp
 
 config-stamp: pre-config-stamp
        ./configure $(CONFIGURE_OPTS)
-       sed -i $(CONFIGURE_SED) config/Makefile
        touch $@
 
 ocamlinit-stamp: $(TARBALL_TARGET) config-stamp
@@ -164,7 +155,7 @@ endif
 
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
-ifneq ($(wildcard $(CURDIR)/config/Makefile),)
+ifneq ($(wildcard $(CURDIR)/Makefile.config),)
        $(MAKE) clean
        $(MAKE) -C emacs clean
 endif
@@ -204,7 +195,7 @@ endif
 
 install-stamp-arch:
 # Install OCaml
-       $(MAKE) install PREFIX=$(INSTDIR)
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 ifeq (,$(DEB_TEST_BUILD_PREFIX))
 # Remove uninstalled files
        rm -f \