From befdac16d73f5eb84ed07758fcf81d5d0cc4a50a Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 11 Apr 2017 13:12:12 +0100 Subject: [PATCH] Revert "Don't try to include master-only API dirs" This reverts commit eba2f53c18db5c12cb11ae2d7372f1e53e9229ac [formerly 2d9585e0960633d2f3b7a1d838978c0893dbd6eb]. Former-commit-id: 2d5f5647bce426f088db8cc2100b721ffd003c5d --- debian/mono-devel.install | 5 +++++ debian/rules | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/mono-devel.install b/debian/mono-devel.install index bc1a82c955..e5980eb2fa 100644 --- a/debian/mono-devel.install +++ b/debian/mono-devel.install @@ -164,6 +164,11 @@ debian/tmp/usr/bin/sgen debian/tmp/usr/bin/wsdl2 debian/tmp/usr/lib/mono/4.5/Facades/ debian/tmp/usr/lib/mono/4.0 +debian/tmp/usr/lib/mono/4.6.2-api +debian/tmp/usr/lib/mono/4.6.1-api +debian/tmp/usr/lib/mono/4.6-api +debian/tmp/usr/lib/mono/4.5.2-api +debian/tmp/usr/lib/mono/4.5.1-api debian/tmp/usr/lib/mono/4.5-api debian/tmp/usr/lib/mono/4.0-api debian/tmp/usr/lib/mono/3.5-api diff --git a/debian/rules b/debian/rules index eb9edb264e..45ee417968 100755 --- a/debian/rules +++ b/debian/rules @@ -291,7 +291,7 @@ binary-indep: build-stamp install-stamp debian/dh_makeclilibs -p libmono-windowsbase4.0-cil -m 3.0.6 $(DH_INTERNAL_MONO_PARAM) debian/dh_makeclilibs -p monodoc-base -m 3.2.1 $(DH_INTERNAL_MONO_PARAM) debian/dh_makeclilibs -p libmono-cecil-private-cil -m $(UPVERSION) -l $(NEXT_UPVERSION) $(DH_INTERNAL_MONO_PARAM) - debian/dh_clideps -i -X/usr/lib/mono/4.0/ -X/usr/lib/mono/2.0-api/ -X/usr/lib/mono/3.5-api/ -X/usr/lib/mono/4.0-api/ -X/usr/lib/mono/4.5-api/ -X/usr/lib/mono/4.5/Facades/ -l debian/tmp $(DH_INTERNAL_MONO_PARAM) + debian/dh_clideps -i -X/usr/lib/mono/4.0/ -X/usr/lib/mono/2.0-api/ -X/usr/lib/mono/3.5-api/ -X/usr/lib/mono/4.0-api/ -X/usr/lib/mono/4.5-api/ -X/usr/lib/mono/4.5.1-api/ -X/usr/lib/mono/4.5.2-api/ -X/usr/lib/mono/4.6-api/ -X/usr/lib/mono/4.6.1-api/ -X/usr/lib/mono/4.6.2-api/ -X/usr/lib/mono/4.5/Facades/ -l debian/tmp $(DH_INTERNAL_MONO_PARAM) #DH_VERBOSE=1 debian/dh_clideps -i -l debian/tmp $(DH_INTERNAL_MONO_PARAM) # mono-1.0/2.0-gac needs special runtime dep, to prevent circular dep (mono-runtime <-> mono-1.0/2.0-gac) debian/dh_clideps -p mono-4.0-gac -r $(DH_INTERNAL_MONO_PARAM)