[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, experimental/master, updated. debian/4.00.0__dev15+12379-1-19-g8329789
Stephane Glondu
steph at glondu.net
Thu Jun 14 06:47:36 UTC 2012
The following commit has been merged in the experimental/master branch:
commit cd125d86ca02bb3e83fb702588af7e17c144f648
Author: Stephane Glondu <steph at glondu.net>
Date: Wed Jun 13 10:40:26 2012 +0200
Misc updates
diff --git a/debian/clean b/debian/clean
index 14fe0e4..e479f0b 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 e6cdb76..0000000
--- a/debian/ocaml-compiler-libs.dirs.in
+++ /dev/null
@@ -1,3 +0,0 @@
- at OCamlStdlibDir@/compiler-libs/parsing
- at OCamlStdlibDir@/compiler-libs/typing
- at OCamlStdlibDir@/compiler-libs/utils
diff --git a/debian/rules b/debian/rules
index 86af948..234885b 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))
--
OCaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list