From: Stephane Glondu <steph@glondu.net>
Date: Wed, 13 Jun 2012 08:40:26 +0000 (+0200)
Subject: Misc updates
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~245
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cd125d86ca02bb3e83fb702588af7e17c144f648;p=ocaml.git

Misc updates
---

diff --git a/debian/clean b/debian/clean
index 14fe0e4d..e479f0b1 100644
--- 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
index e6cdb767..00000000
--- 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 86af948c..234885b6 100755
--- 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))