Misc updates

diff --git a/debian/clean b/debian/clean
index 14fe0e4dfe2ec1bcb72029ef9ad9cc5d643ed231..e479f0b1b17d461c314484ec208a33c370e978ce 100644 (file)
--- a/debian/clean
+++ b/debian/clean
@@ -6,3 +6,5 @@ config/m.h
 config/s.h
 myocamlbuild_config.ml
 tools/myocamlbuild_config.ml
+ocamlc
+ocamlcomp.sh

diff --git a/debian/ocaml-compiler-libs.dirs.in b/debian/ocaml-compiler-libs.dirs.in
deleted file mode 100644 (file)
index e6cdb76..0000000
--- a/debian/ocaml-compiler-libs.dirs.in
+++ /dev/null
@@ -1,3 +0,0 @@
-@OCamlStdlibDir@/compiler-libs/parsing
-@OCamlStdlibDir@/compiler-libs/typing
-@OCamlStdlibDir@/compiler-libs/utils

diff --git a/debian/rules b/debian/rules
index 86af948cf649544924c7104d41e6e2c7a6511497..234885b6c276c8b1070457a4cb86689b38cea67d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ MD5SUMSDIR = /var/lib/ocaml/md5sums
 INSTDIR = $(CURDIR)/debian/tmp/usr
 DISTDIR = $(PACKAGE)-$(OCAML_ABI)
 UPSTREAM_VERSION = $(shell dpkg-parsechangelog | awk '/^Version:/{print $$2}' | { read u; echo $${u%-*}; })
-UPSTREAM_TARBALL = ../$(PACKAGE)_$(UPSTREAM_VERSION).orig.tar.gz
+UPSTREAM_TARBALL = ../$(PACKAGE)_$(UPSTREAM_VERSION).orig.tar.bz2
 SRCTARBALL = $(PACKAGE)-source-$(OCAML_ABI).tar.bz2
 
 TESTDIR := debian/test-build
@@ -98,6 +98,8 @@ pre-config-stamp: $(TARBALL_TARGET)
            cp -f /usr/share/misc/config.$$ext config/gnu/config.$$ext; \
          fi; \
        done
+# Create empty directory present in upstream tarball
+       mkdir -p compilerlibs
        touch $@
 
 ifneq (,$(TARBALL_TARGET))