[Pkg-mono-svn-commits] [mono] 25/40: Merge branch 'master-dhx' into merge/3.2.1+dfsg
Jo Shields
directhex at alioth.debian.org
Sun Aug 18 21:55:36 UTC 2013
This is an automated email from the git hooks/post-receive script.
directhex pushed a commit to branch merge/3.2.1+dfsg
in repository mono.
commit 7722d6d4ae1c765a39492588dab199707dc74379
Merge: 69cbb0a 93dc83d
Author: Jo Shields <directhex at apebox.org>
Date: Mon Aug 5 17:14:26 2013 +0100
Merge branch 'master-dhx' into merge/3.2.1+dfsg
.gitignore | 22 +
debian/.gitignore | 8 +
debian/FirebirdSql.Data.Firebird.dll.config | 3 +
debian/Mono.Cairo.dll.config | 3 +
debian/Mono.Data.Sqlite.dll.config | 4 +
debian/Mono.Data.SqliteClient.dll.config | 4 +
debian/Mono.WebBrowser.dll.config | 3 +
debian/MonoGetAssemblyName.cs | 14 +
debian/README.Debian | 107 +
debian/README.source | 164 ++
debian/System.Data.dll.config | 4 +
debian/System.Drawing.dll.config | 5 +
debian/System.Windows.Forms.dll.config | 11 +
debian/autogen.sh | 142 +
debian/changelog | 544 ++++
debian/changelog.1 | 2638 +++++++++++++++++
debian/cli.binfmt | 4 +
debian/compat | 1 +
debian/control | 3010 ++++++++++++++++++++
debian/copyright | 762 +++++
debian/detector/.gitignore | 1 +
debian/detector/Makefile | 6 +
debian/detector/README | 45 +
debian/detector/binfmt-detector-cli.c | 99 +
debian/detector/cil-coff.h | 190 ++
debian/dh_clideps | 631 ++++
debian/dh_clifixperms | 70 +
debian/dh_clistrip | 105 +
debian/dh_makeclilibs | 318 +++
debian/dh_monoaot | 87 +
debian/find-icalls.sh | 2 +
debian/gbp.conf | 10 +
debian/git-merge-debian-patches | 8 +
debian/git-pull-debian-patches | 9 +
debian/git-test-debian-patches | 42 +
debian/icu-test.cs | 11 +
debian/libmono-2.0-1.install | 1 +
debian/libmono-2.0-1.symbols | 905 ++++++
debian/libmono-2.0-1.symbols.alpha | 2 +
debian/libmono-2.0-1.symbols.amd64 | 3 +
debian/libmono-2.0-1.symbols.armel | 13 +
debian/libmono-2.0-1.symbols.armhf | 11 +
debian/libmono-2.0-1.symbols.i386 | 3 +
debian/libmono-2.0-1.symbols.ia64 | 5 +
debian/libmono-2.0-1.symbols.kfreebsd-amd64 | 3 +
debian/libmono-2.0-1.symbols.kfreebsd-i386 | 3 +
debian/libmono-2.0-1.symbols.powerpc | 2 +
debian/libmono-2.0-1.symbols.ppc64 | 2 +
debian/libmono-2.0-1.symbols.s390x | 2 +
debian/libmono-2.0-1.symbols.sparc | 10 +
debian/libmono-2.0-dev.install | 5 +
debian/libmono-accessibility2.0-cil.install | 2 +
debian/libmono-accessibility4.0-cil.install | 3 +
debian/libmono-c5-1.1-cil.install | 3 +
debian/libmono-cairo2.0-cil.install | 2 +
debian/libmono-cairo4.0-cil.install | 3 +
debian/libmono-cecil-private-cil.install | 2 +
debian/libmono-cil-dev.install | 14 +
debian/libmono-cil-dev.links | 1 +
debian/libmono-codecontracts4.0-cil.install | 2 +
...no-compilerservices-symbolwriter4.0-cil.install | 3 +
debian/libmono-corlib2.0-cil.install | 1 +
debian/libmono-corlib4.0-cil.install | 1 +
debian/libmono-corlib4.5-cil.install | 1 +
debian/libmono-cscompmgd8.0-cil.install | 2 +
debian/libmono-csharp4.0-cil.install | 3 +
debian/libmono-custommarshalers4.0-cil.install | 3 +
debian/libmono-data-tds2.0-cil.install | 2 +
debian/libmono-data-tds4.0-cil.install | 3 +
debian/libmono-db2-1.0-cil.install | 3 +
debian/libmono-debugger-soft2.0-cil.install | 2 +
debian/libmono-debugger-soft4.0-cil.install | 3 +
...ibmono-entityframework-sqlserver6.0-cil.install | 2 +
debian/libmono-entityframework6.0-cil.install | 2 +
debian/libmono-http4.0-cil.install | 3 +
debian/libmono-i18n-cjk4.0-cil.install | 3 +
debian/libmono-i18n-mideast4.0-cil.install | 3 +
debian/libmono-i18n-other4.0-cil.install | 3 +
debian/libmono-i18n-rare4.0-cil.install | 3 +
debian/libmono-i18n-west2.0-cil.install | 4 +
debian/libmono-i18n-west4.0-cil.install | 3 +
debian/libmono-i18n2.0-cil.install | 8 +
debian/libmono-i18n4.0-cil.install | 3 +
debian/libmono-ldap2.0-cil.install | 2 +
debian/libmono-ldap4.0-cil.install | 3 +
debian/libmono-management2.0-cil.install | 2 +
debian/libmono-management4.0-cil.install | 3 +
debian/libmono-messaging-rabbitmq2.0-cil.install | 2 +
debian/libmono-messaging-rabbitmq4.0-cil.install | 3 +
debian/libmono-messaging2.0-cil.install | 2 +
debian/libmono-messaging4.0-cil.install | 3 +
.../libmono-microsoft-build-engine4.0-cil.install | 3 +
...ibmono-microsoft-build-framework4.0-cil.install | 3 +
...mono-microsoft-build-tasks-v4.0-4.0-cil.install | 3 +
...-microsoft-build-utilities-v4.0-4.0-cil.install | 3 +
debian/libmono-microsoft-build2.0-cil.install | 4 +
debian/libmono-microsoft-build4.0-cil.install | 3 +
debian/libmono-microsoft-csharp4.0-cil.install | 3 +
debian/libmono-microsoft-visualc10.0-cil.install | 3 +
...ono-microsoft-web-infrastructure1.0-cil.install | 3 +
debian/libmono-microsoft8.0-cil.install | 2 +
debian/libmono-npgsql2.0-cil.install | 2 +
debian/libmono-npgsql4.0-cil.install | 3 +
debian/libmono-opensystem-c4.0-cil.install | 3 +
debian/libmono-oracle2.0-cil.install | 2 +
debian/libmono-oracle4.0-cil.install | 3 +
debian/libmono-parallel4.0-cil.install | 3 +
debian/libmono-peapi2.0-cil.install | 2 +
debian/libmono-peapi4.0-cil.install | 3 +
debian/libmono-posix2.0-cil.install | 2 +
debian/libmono-posix4.0-cil.install | 3 +
debian/libmono-profiler.install | 1 +
debian/libmono-profiler.postist | 7 +
debian/libmono-profiler.postrm | 7 +
debian/libmono-rabbitmq2.0-cil.copyright | 477 ++++
debian/libmono-rabbitmq2.0-cil.install | 2 +
debian/libmono-rabbitmq4.0-cil.copyright | 477 ++++
debian/libmono-rabbitmq4.0-cil.install | 3 +
debian/libmono-relaxng2.0-cil.install | 2 +
debian/libmono-relaxng4.0-cil.install | 3 +
debian/libmono-security2.0-cil.install | 2 +
debian/libmono-security4.0-cil.install | 3 +
debian/libmono-sharpzip2.6-cil.install | 2 +
debian/libmono-sharpzip2.84-cil.install | 2 +
debian/libmono-sharpzip4.84-cil.install | 3 +
debian/libmono-simd2.0-cil.install | 2 +
debian/libmono-simd4.0-cil.install | 3 +
debian/libmono-sqlite2.0-cil.install | 2 +
debian/libmono-sqlite4.0-cil.install | 3 +
...ystem-componentmodel-composition4.0-cil.install | 3 +
...m-componentmodel-dataannotations4.0-cil.install | 3 +
...ono-system-configuration-install4.0-cil.install | 3 +
debian/libmono-system-configuration4.0-cil.install | 3 +
debian/libmono-system-core4.0-cil.install | 3 +
...no-system-data-datasetextensions4.0-cil.install | 3 +
debian/libmono-system-data-linq2.0-cil.install | 2 +
debian/libmono-system-data-linq4.0-cil.install | 3 +
...mono-system-data-services-client4.0-cil.install | 3 +
debian/libmono-system-data-services4.0-cil.install | 3 +
debian/libmono-system-data2.0-cil.clideps-override | 2 +
debian/libmono-system-data2.0-cil.install | 4 +
debian/libmono-system-data4.0-cil.clideps-override | 2 +
debian/libmono-system-data4.0-cil.install | 3 +
debian/libmono-system-design4.0-cil.install | 3 +
.../libmono-system-drawing-design4.0-cil.install | 3 +
.../libmono-system-drawing4.0-cil.clideps-override | 1 +
debian/libmono-system-drawing4.0-cil.install | 3 +
debian/libmono-system-dynamic4.0-cil.install | 3 +
...ibmono-system-enterpriseservices4.0-cil.install | 3 +
...o-system-identitymodel-selectors4.0-cil.install | 3 +
debian/libmono-system-identitymodel4.0-cil.install | 3 +
debian/libmono-system-json4.0-cil.install | 3 +
debian/libmono-system-ldap2.0-cil.install | 2 +
debian/libmono-system-ldap4.0-cil.install | 3 +
debian/libmono-system-management4.0-cil.install | 3 +
...ibmono-system-messaging2.0-cil.clideps-override | 1 +
debian/libmono-system-messaging2.0-cil.install | 2 +
debian/libmono-system-messaging4.0-cil.install | 3 +
...bmono-system-net-http-formatting4.0-cil.install | 2 +
debian/libmono-system-net-http4.0-cil.install | 2 +
debian/libmono-system-net4.0-cil.install | 3 +
debian/libmono-system-numerics4.0-cil.install | 3 +
debian/libmono-system-reactive-core2.1-cil.install | 2 +
...libmono-system-reactive-debugger2.1-cil.install | 2 +
...ono-system-reactive-experimental2.1-cil.install | 2 +
...bmono-system-reactive-interfaces2.1-cil.install | 2 +
debian/libmono-system-reactive-linq2.1-cil.install | 2 +
...system-reactive-platformservices2.1-cil.install | 2 +
...ibmono-system-reactive-providers2.1-cil.install | 2 +
...system-reactive-runtime-remoting2.1-cil.install | 2 +
...no-system-reactive-windows-forms2.1-cil.install | 2 +
...ystem-reactive-windows-threading2.1-cil.install | 2 +
.../libmono-system-runtime-caching4.0-cil.install | 3 +
...system-runtime-durableinstancing4.0-cil.install | 3 +
...me-serialization-formatters-soap4.0-cil.install | 3 +
...ono-system-runtime-serialization4.0-cil.install | 3 +
debian/libmono-system-runtime2.0-cil.install | 4 +
debian/libmono-system-runtime4.0-cil.install | 3 +
debian/libmono-system-security4.0-cil.install | 3 +
...no-system-servicemodel-discovery4.0-cil.install | 3 +
...mono-system-servicemodel-routing4.0-cil.install | 3 +
.../libmono-system-servicemodel-web4.0-cil.install | 3 +
debian/libmono-system-servicemodel4.0-cil.install | 3 +
.../libmono-system-serviceprocess4.0-cil.install | 3 +
...-system-threading-tasks-dataflow4.0-cil.install | 2 +
debian/libmono-system-transactions4.0-cil.install | 3 +
.../libmono-system-web-abstractions4.0-cil.install | 3 +
...o-system-web-applicationservices4.0-cil.install | 3 +
.../libmono-system-web-dynamicdata4.0-cil.install | 3 +
...ono-system-web-extensions-design4.0-cil.install | 3 +
.../libmono-system-web-extensions4.0-cil.install | 3 +
...libmono-system-web-http-selfhost4.0-cil.install | 2 +
debian/libmono-system-web-http4.0-cil.install | 2 +
debian/libmono-system-web-mvc1.0-cil.install | 2 +
debian/libmono-system-web-mvc2.0-cil.install | 2 +
debian/libmono-system-web-mvc3.0-cil.install | 2 +
debian/libmono-system-web-razor2.0-cil.install | 2 +
debian/libmono-system-web-routing4.0-cil.install | 3 +
debian/libmono-system-web-services4.0-cil.install | 3 +
...o-system-web-webpages-deployment2.0-cil.install | 2 +
...ibmono-system-web-webpages-razor2.0-cil.install | 2 +
debian/libmono-system-web-webpages2.0-cil.install | 2 +
debian/libmono-system-web2.0-cil.clideps-override | 1 +
debian/libmono-system-web2.0-cil.install | 20 +
debian/libmono-system-web4.0-cil.install | 3 +
...-windows-forms-datavisualization4.0-cil.install | 3 +
...no-system-windows-forms4.0-cil.clideps-override | 5 +
debian/libmono-system-windows-forms4.0-cil.install | 3 +
debian/libmono-system-xaml4.0-cil.install | 3 +
debian/libmono-system-xml-linq4.0-cil.install | 3 +
debian/libmono-system-xml4.0-cil.install | 3 +
debian/libmono-system2.0-cil.clideps-override | 7 +
debian/libmono-system2.0-cil.install | 26 +
debian/libmono-system4.0-cil.clideps-override | 3 +
debian/libmono-system4.0-cil.install | 3 +
debian/libmono-tasklets2.0-cil.install | 2 +
debian/libmono-tasklets4.0-cil.install | 3 +
debian/libmono-wcf3.0-cil.install | 11 +
debian/libmono-web4.0-cil.install | 3 +
debian/libmono-webbrowser2.0-cil.clideps-override | 1 +
debian/libmono-webbrowser2.0-cil.install | 2 +
debian/libmono-webbrowser4.0-cil.clideps-override | 1 +
debian/libmono-webbrowser4.0-cil.install | 3 +
debian/libmono-webmatrix-data4.0-cil.install | 3 +
debian/libmono-windowsbase3.0-cil.install | 2 +
debian/libmono-windowsbase4.0-cil.install | 3 +
debian/libmono-winforms2.0-cil.clideps-override | 5 +
debian/libmono-winforms2.0-cil.install | 6 +
debian/libmono2.0-cil.install | 8 +
debian/man/caspol.1 | 11 +
debian/man/cli-wrapper.1 | 11 +
debian/man/mjs.1 | 11 +
debian/man/mono-find-provides.1 | 11 +
debian/man/mono-find-requires.1 | 11 +
debian/man/monograph.1 | 11 +
debian/man/pedump.1 | 11 +
debian/mono-1.0-service.manpages | 1 +
debian/mono-2.0-gac.install | 2 +
debian/mono-2.0-gac.manpages | 1 +
debian/mono-2.0-service.install | 3 +
debian/mono-2.0-service.manpages | 1 +
debian/mono-4.0-gac.install | 1 +
debian/mono-4.0-service.install | 3 +
debian/mono-aot-bootstrap | 5 +
debian/mono-aot-wrapper | 66 +
debian/mono-api-check | 181 ++
debian/mono-api-diff.cs | 1857 ++++++++++++
debian/mono-api-source-check | 4 +
debian/mono-archs.make | 8 +
debian/mono-csharp-shell.install | 2 +
debian/mono-csharp-shell.manpages | 1 +
debian/mono-dbg.install | 1 +
debian/mono-devel.install | 112 +
debian/mono-devel.links | 1 +
debian/mono-devel.manpages | 40 +
debian/mono-devel.postinst | 20 +
debian/mono-devel.prerm | 10 +
debian/mono-gac.dirs | 1 +
debian/mono-gac.install | 2 +
debian/mono-gac.manpages | 1 +
debian/mono-gac.postinst | 13 +
debian/mono-gac.prerm | 12 +
debian/mono-jay.docs | 5 +
debian/mono-jay.install | 1 +
debian/mono-jay.manpages | 1 +
debian/mono-mcs.install | 4 +
debian/mono-mcs.manpages | 3 +
debian/mono-runtime-sgen.install | 1 +
debian/mono-runtime-terminal.desktop | 8 +
debian/mono-runtime.NEWS | 161 ++
debian/mono-runtime.desktop | 8 +
debian/mono-runtime.dirs | 3 +
debian/mono-runtime.docs | 4 +
debian/mono-runtime.install | 12 +
debian/mono-runtime.manpages | 3 +
debian/mono-runtime.png | Bin 0 -> 20335 bytes
debian/mono-runtime.postinst | 20 +
debian/mono-runtime.postrm | 7 +
debian/mono-runtime.prerm | 11 +
debian/mono-smcs.install | 3 +
debian/mono-smcs.manpages | 1 +
debian/mono-utils.install | 7 +
debian/mono-utils.manpages | 5 +
debian/mono-utils.postinst | 7 +
debian/mono-utils.prerm | 7 +
debian/mono-xbuild.install | 21 +
debian/mono-xbuild.manpages | 1 +
debian/mono.runtime-script | 144 +
debian/monodoc-base.dirs | 1 +
debian/monodoc-base.install | 17 +
debian/monodoc-base.manpages | 11 +
debian/monodoc-manual.install | 4 +
debian/postinst-monoaot | 4 +
debian/prerm-monoaot | 1 +
debian/rules | 422 +++
debian/shlibs.local | 14 +
debian/source/format | 1 +
debian/source/include-binaries | 1 +
debian/source/options | 1 +
debian/update-monodoc | 12 +
debian/update-shlibs.local.sh | 48 +
debian/watch | 3 +
mono/mini/Makefile.am | 11 +-
303 files changed, 14971 insertions(+), 10 deletions(-)
diff --cc mono/mini/Makefile.am
index 39ee2c1,05318cc..efbc6f6
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@@ -757,24 -729,16 +757,15 @@@ EXTRA_DIST = TestDriver.cs ldscript lds
$(arm_sources) cpu-arm.md \
$(mips_sources) cpu-mips.md \
$(sparc_sources) cpu-sparc.md \
- $(s390_sources) cpu-s390.md \
$(s390x_sources) cpu-s390x.md \
$(ia64_sources) cpu-ia64.md \
- $(alpha_sources) cpu-alpha.md \
$(windows_sources) \
$(darwin_sources) Info.plist \
- $(posix_sources)
+ $(posix_sources) \
+ Makefile.am.in
version.h: Makefile
- if test -d $(top_srcdir)/.git; then \
- (cd $(top_srcdir); \
- LANG=C; export LANG; \
- branch=`git branch | grep '^\*' | cut -d ' ' -f 2`; \
- version=`git log --no-color --first-parent -n1 --pretty=format:%h`; \
- echo "#define FULL_VERSION \"$$branch/$$version\""; \
- ); \
- else \
- echo "#define FULL_VERSION \"Debian $$(dpkg-parsechangelog -l$(top_srcdir)/debian/changelog | grep ^Vers | cut -d\ -f2)\""; \
- fi > version.h
+ echo "#define FULL_VERSION \"Debian $$(dpkg-parsechangelog -l$(top_srcdir)/debian/changelog | grep ^Vers | cut -d\ -f2)\"" > version.h
# Utility target for patching libtool to speed up linking
patch-libtool:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mono/packages/mono.git
More information about the Pkg-mono-svn-commits
mailing list