From 558230137a2e5284d266d8ab429cacba556b2cbf Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 26 May 2015 15:46:57 +0100 Subject: [PATCH] Add new files from master branch (cherry picked from commit a0f9571d96c8d6dbee547c157b33c08acd961497) Former-commit-id: 546862e7bc8c408aea1ee6fcd1bfd29f6529505b --- debian/control.REMOVED.git-id | 2 +- debian/libmono-profiler.install | 1 + debian/libmono-smdiagnostics0.0-cil.install | 2 ++ debian/libmono-system-servicemodel-internals0.0-cil.install | 2 ++ debian/mono-devel.manpages | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 debian/libmono-smdiagnostics0.0-cil.install create mode 100644 debian/libmono-system-servicemodel-internals0.0-cil.install diff --git a/debian/control.REMOVED.git-id b/debian/control.REMOVED.git-id index 762c6f60d4..c1de828f83 100644 --- a/debian/control.REMOVED.git-id +++ b/debian/control.REMOVED.git-id @@ -1 +1 @@ -024148092d693b6217f5f8c75aef974ef4dde227 \ No newline at end of file +72ca89c04cc4c33b4a5f56639b39343da8ce2f23 \ No newline at end of file diff --git a/debian/libmono-profiler.install b/debian/libmono-profiler.install index 2669e70b78..7935678448 100644 --- a/debian/libmono-profiler.install +++ b/debian/libmono-profiler.install @@ -1 +1,2 @@ /usr/lib/libmono-profiler-*.so* +/usr/share/mono-2.0/mono/profiler/mono-profiler-log.suppression diff --git a/debian/libmono-smdiagnostics0.0-cil.install b/debian/libmono-smdiagnostics0.0-cil.install new file mode 100644 index 0000000000..c9886a6e2a --- /dev/null +++ b/debian/libmono-smdiagnostics0.0-cil.install @@ -0,0 +1,2 @@ +/usr/lib/mono/4.5/SMDiagnostics.dll* +/usr/lib/mono/gac/SMDiagnostics/0.0.0.0__*/ diff --git a/debian/libmono-system-servicemodel-internals0.0-cil.install b/debian/libmono-system-servicemodel-internals0.0-cil.install new file mode 100644 index 0000000000..9293ed9a4f --- /dev/null +++ b/debian/libmono-system-servicemodel-internals0.0-cil.install @@ -0,0 +1,2 @@ +/usr/lib/mono/4.5/System.ServiceModel.Internals.dll* +/usr/lib/mono/gac/System.ServiceModel.Internals/0.0.0.0__*/ diff --git a/debian/mono-devel.manpages b/debian/mono-devel.manpages index 78f5134b41..af9be9179a 100644 --- a/debian/mono-devel.manpages +++ b/debian/mono-devel.manpages @@ -16,6 +16,7 @@ debian/tmp/usr/share/man/man1/makecert.1 debian/tmp/usr/share/man/man1/mkbundle.1 debian/tmp/usr/share/man/man1/mono-cil-strip.1 debian/tmp/usr/share/man/man1/mono-shlib-cop.1 +debian/tmp/usr/share/man/man1/mono-symbolicate.1 debian/tmp/usr/share/man/man1/mono-xmltool.1 debian/tmp/usr/share/man/man1/monolinker.1 debian/tmp/usr/share/man/man1/monop.1