[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. 2.0.1-6-92-g5f57dc0
Mirco Bauer
meebey at meebey.net
Mon May 25 18:12:54 UTC 2009
The following commit has been merged in the master branch:
commit adb6bce58511b9c96013d186d824d5aad1c9542c
Author: Mirco Bauer <meebey at meebey.net>
Date: Sat May 9 02:35:55 2009 +0200
* New upstream release.
+ For release highlights see the NEWS.Debian file
* DFSG edition of Mono 2.4 as the source taball contained a binary that is
not part of the bootstrapping process (docs/AgilityPack.dll) and is CC
Share-alike 2.5 licensed (non-free). Also it contained non-free
specification files needed by the RabbitMQ.Client library.
* debian/rules:
+ Made get-orig-source policy conform (by using . as output path).
+ Dropped --with-oprofile from configure call as debian doesn't ship the
needed header files for it.
+ Dropped--with-moonlight from configure call as the moon source package
will ship the assemblies with the release containing Silverlight 2.0
support.
* debian/README.source:
+ Mention which files we removed and how to create the tarball we use.
+ Document which binaries are required to bootstrap the C# compiler.
* debian/NEWS:
+ Updated for Mono 2.4, Mono 2.2 and Mono 2.0.
* debian/patches/kfreebsd_support.dpatch
debian/patches/build_genxs_2.0.dpatch:
+ Updated to cleanly apply again.
* debian/patches/fix_wsdl2_duplicate_keys_r117243.dpatch
debian/patches/fix_NetworkInterface_exception_r120282.dpatch
debian/patches/fix_TcpClient_IPv6_r122598.dpatch:
+ Dropped, already applied upstream.
* debian/patches/armel_fix_configure_fpu_check.dpatch:
+ Only patch configure.in, autoreconf takes care of configure.
* debian/patches/armel-glibc-2.8.dpatch:
+ Dropped, fixed upstream in a different way.
* debian/patches/fix_NetworkInterface_endless_loop.dpatch:
+ Fix loop by setting next item. (Closes: #519480)
* debian/libmono-system2.1-cil.install:
+ Added Mono.CompilerServices.SymbolWriter.dll,
System.Runtime.Serialization.dll, System.ServiceModel.dll,
System.ServiceModel.Web.dll and System.Xml.Linq.dll.
* debian/libmono-system-web2.0-cil.install:
+ Added system.web.extensions_1.0.pc and
system.web.extensions.design_1.0.pc.
* debian/libmono2.0-cil.install:
+ Added mono.web.pc.
* debian/control:
debian/patches/99_autoreconf.dpatch:
+ Added autoconf to build-deps, as we autoreconf in debian/rules now.
+ Dropped autoreconf dpatch.
diff --git a/debian/NEWS b/debian/NEWS
index 2be0c9c..f50fa6b 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,57 @@
+mono (2.4-1) unstable; urgency=low
+
+ * Mono 2.4 ships a lot of goodies:
+ + SIMD support in Mono.
+ + No expensive polls in the threading implementation any longer.
+ + Speed-up garbarge collection on multi-core systems.
+ + Optimized XPath (using 15% less memory).
+ + Faster DateTime.TryParse implementation (by not using try/catch).
+ + Support for precompiled ASP.NET pages.
+ * Complete Announcement of Mono 2.4 (vs Mono 2.2):
+ http://www.mono-project.com/Release_Notes_Mono_2.4
+
+ * Mono 2.2 also ships with lovely thins:
+ + The tree-based code generation engine in the JIT was replaced with the
+ Linear IL engine, which allows better optimizations.
+ + Generic sharing is now used in all cases (reduces memory usage).
+ + Generic sharing is now supported on ARM.
+ + Support of full Ahead of Time Compilation.
+ + New PerformanceCounters implementation that allows to monitor the runtime
+ internals. Including the GUI tool "mperfmon" to view them.
+ + Interactive shell called "csharp" that allows to execute C#
+ expressions inside a shell. There is also a GUI version available
+ called "gsharp".
+ + Live Inspection. You can attach using the csharp shell to a
+ running process and run code inside to debug things.
+ + The C# compiler will now optimize empty strings ("") away with
+ String.Empty (which reduces memory usage).
+ + The Regular Expressions engine has been rewritten being more efficient.
+ At the same time compiled regex are also supported now.
+ + ASP.NET supports now new routing handlers needed by ASP.NET MVC.
+ + In the WinForms implementation were almost 200 bugs fixed (since Mono 2.0)
+ * Complete Announcement of Mono 2.2 (vs Mono 2.0):
+ http://www.mono-project.com/Release_Notes_Mono_2.2
+
+ * Mono 2.0 shipped with:
+ + A console debugger (mdb) part of the mono-debugger package.
+ + WinForms 2.0 API is complete.
+ + WinForms's WebBrowser was implemented using Mozilla's Gecko HTML
+ rendering engine.
+ + WinForms now supports international keyboard input through XIM.
+ + Performance of locking (used by threading) was significally improved.
+ + New debug parameter "--debug=cast" which print outs the types in for
+ InvalidCastException.
+ + The C# compiler supports now expression trees (for LINQ) which completes
+ the C# 3.0 support.
+ + The C# compiler is now dual-licensed under MIT/X11 and GPLv2 (only).
+ + LINQ and LINQ to XML are now complete.
+ + Big Arrays for 64bit architectures are now support (but have to be
+ compiled using the --enable-big-arrays configure switch)
+ * Complete Announcement of Mono 2.0:
+ http://www.mono-project.com/Release_Notes_Mono_2.0
+
+ -- Mirco Bauer <meebey at debian.org> Fri, 10 Apr 2009 00:58:39 +0200
+
mono (1.2.2.1-1) unstable; urgency=low
* Here we go, Mono 1.2 is now official stable and released!
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..6338aba
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,27 @@
+The upstream tarball for this application has been altered to remove
+(unneeded) binary-only components. The list of files removed is as follows:
+
+ docs/AgilityPack.dll
+
+Also the specification and auto-generated code of the RabbitMQ library found
+in: mcs/class/RabbitMQ.Client/docs/specs/* had to be removed as those are
+licensed under non-DFSG-free terms. Because of the removed files the RabbitMQ
+library can no longer be build and had to be disabled in the build process.
+The resulting binary packages are not containing RabbitMQ.Client.dll nor
+Mono.Messaging.RabbitMQ.dll for that reason.
+
+To create your own copy of this modified tarball, use the "get-orig-source"
+target of the debian/rules makefile.
+
+The compiler needs to bootstrap using the pre-build binary
+mcs/class/lib/monolite/mcs.exe, which requires
+mcs/class/lib/monolite/mscorlib.dll,
+mcs/class/lib/monolite/System.dll and
+mcs/class/lib/monolite/System.Xml.dll in order to operate.
+
+These binaries are used to compile the code in mcs/mcs/*, mcs/class/corlib/*,
+mcs/class/System/* and mcs/class/System.XML/*, which in turn, produce their
+own mcs.exe, mscorlib.dll, System.dll and System.Xml.dll.
+
+Only the resulting binaries are included in packages - not the versions
+used for bootstrapping.
diff --git a/debian/changelog b/debian/changelog
index 7f0a8ca..ce6195b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,52 @@
+mono (2.4+dfsg-1~pre1) unstable; urgency=low
+
+ * New upstream release.
+ + For release highlights see the NEWS.Debian file
+ * DFSG edition of Mono 2.4 as the source taball contained a binary that is
+ not part of the bootstrapping process (docs/AgilityPack.dll) and is CC
+ Share-alike 2.5 licensed (non-free). Also it contained non-free
+ specification files needed by the RabbitMQ.Client library.
+ * debian/rules:
+ + Made get-orig-source policy conform (by using . as output path).
+ + Dropped --with-oprofile from configure call as debian doesn't ship the
+ needed header files for it.
+ + Dropped--with-moonlight from configure call as the moon source package
+ will ship the assemblies with the release containing Silverlight 2.0
+ support.
+ * debian/README.source:
+ + Mention which files we removed and how to create the tarball we use.
+ + Document which binaries are required to bootstrap the C# compiler.
+ * debian/NEWS:
+ + Updated for Mono 2.4, Mono 2.2 and Mono 2.0.
+ * debian/patches/kfreebsd_support.dpatch
+ debian/patches/build_genxs_2.0.dpatch:
+ + Updated to cleanly apply again.
+ * debian/patches/fix_wsdl2_duplicate_keys_r117243.dpatch
+ debian/patches/fix_NetworkInterface_exception_r120282.dpatch
+ debian/patches/fix_TcpClient_IPv6_r122598.dpatch:
+ + Dropped, already applied upstream.
+ * debian/patches/armel_fix_configure_fpu_check.dpatch:
+ + Only patch configure.in, autoreconf takes care of configure.
+ * debian/patches/armel-glibc-2.8.dpatch:
+ + Dropped, fixed upstream in a different way.
+ * debian/patches/fix_NetworkInterface_endless_loop.dpatch:
+ + Fix loop by setting next item. (Closes: #519480)
+ * debian/libmono-system2.1-cil.install:
+ + Added Mono.CompilerServices.SymbolWriter.dll,
+ System.Runtime.Serialization.dll, System.ServiceModel.dll,
+ System.ServiceModel.Web.dll and System.Xml.Linq.dll.
+ * debian/libmono-system-web2.0-cil.install:
+ + Added system.web.extensions_1.0.pc and
+ system.web.extensions.design_1.0.pc.
+ * debian/libmono2.0-cil.install:
+ + Added mono.web.pc.
+ * debian/control:
+ debian/patches/99_autoreconf.dpatch:
+ + Added autoconf to build-deps, as we autoreconf in debian/rules now.
+ + Dropped autoreconf dpatch.
+
+ -- Mirco Bauer <meebey at debian.org> Sat, 11 Apr 2009 02:25:02 +0200
+
mono (2.0.1-6) unstable; urgency=low
[ Jo Shields ]
diff --git a/debian/control b/debian/control
index b6e8dc6..e57b45a 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Build-Depends: debhelper (>= 5),
dc,
libx11-dev,
libxt-dev,
- zlib1g-dev
+ zlib1g-dev,
+ autoconf
Standards-Version: 3.8.0
Homepage: http://www.mono-project.com/
Vcs-Svn: svn://svn.debian.org/svn/pkg-mono/mono/trunk
diff --git a/debian/copyright b/debian/copyright
index 1963330..3050d04 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -204,6 +204,625 @@ Alexei A. Vorontsov, Charlie Poole or Copyright (C) 2000-2004 Philip A. Craig
-------------------------------------------------------------------------------
+mcs/class/RabbitMQ.Client/*
+
+Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial
+
+This source code is dual-licensed under the Apache License, version
+2.0, and the Mozilla Public License, version 1.1.
+
+The APL v2.0:
+
+ Copyright (C) 2007, 2008 LShift Ltd., Cohesive Financial
+ Technologies LLC., and Rabbit Technologies Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+On Debian systems, the complete text of the Apache License Version 2.0,
+can be found in the /usr/share/common-licenses/Apache-2.0 file.
+
+The MPL v1.1:
+
+ The contents of this file are subject to the Mozilla Public License
+ Version 1.1 (the "License"); you may not use this file except in
+ compliance with the License. You may obtain a copy of the License at
+ http://www.rabbitmq.com/mpl.html
+
+ Software distributed under the License is distributed on an "AS IS"
+ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ License for the specific language governing rights and limitations
+ under the License.
+
+ The Original Code is The RabbitMQ .NET Client.
+
+ The Initial Developers of the Original Code are LShift Ltd.,
+ Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
+
+ Portions created by LShift Ltd., Cohesive Financial Technologies
+ LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007, 2008
+ LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit
+ Technologies Ltd.;
+
+ All Rights Reserved.
+
+ Contributor(s): ______________________________________.
+
+
+ MOZILLA PUBLIC LICENSE
+ Version 1.1
+
+ ---------------
+
+1. Definitions.
+
+ 1.0.1. "Commercial Use" means distribution or otherwise making the
+ Covered Code available to a third party.
+
+ 1.1. "Contributor" means each entity that creates or contributes to
+ the creation of Modifications.
+
+ 1.2. "Contributor Version" means the combination of the Original
+ Code, prior Modifications used by a Contributor, and the Modifications
+ made by that particular Contributor.
+
+ 1.3. "Covered Code" means the Original Code or Modifications or the
+ combination of the Original Code and Modifications, in each case
+ including portions thereof.
+
+ 1.4. "Electronic Distribution Mechanism" means a mechanism generally
+ accepted in the software development community for the electronic
+ transfer of data.
+
+ 1.5. "Executable" means Covered Code in any form other than Source
+ Code.
+
+ 1.6. "Initial Developer" means the individual or entity identified
+ as the Initial Developer in the Source Code notice required by Exhibit
+ A.
+
+ 1.7. "Larger Work" means a work which combines Covered Code or
+ portions thereof with code not governed by the terms of this License.
+
+ 1.8. "License" means this document.
+
+ 1.8.1. "Licensable" means having the right to grant, to the maximum
+ extent possible, whether at the time of the initial grant or
+ subsequently acquired, any and all of the rights conveyed herein.
+
+ 1.9. "Modifications" means any addition to or deletion from the
+ substance or structure of either the Original Code or any previous
+ Modifications. When Covered Code is released as a series of files, a
+ Modification is:
+ A. Any addition to or deletion from the contents of a file
+ containing Original Code or previous Modifications.
+
+ B. Any new file that contains any part of the Original Code or
+ previous Modifications.
+
+ 1.10. "Original Code" means Source Code of computer software code
+ which is described in the Source Code notice required by Exhibit A as
+ Original Code, and which, at the time of its release under this
+ License is not already Covered Code governed by this License.
+
+ 1.10.1. "Patent Claims" means any patent claim(s), now owned or
+ hereafter acquired, including without limitation, method, process,
+ and apparatus claims, in any patent Licensable by grantor.
+
+ 1.11. "Source Code" means the preferred form of the Covered Code for
+ making modifications to it, including all modules it contains, plus
+ any associated interface definition files, scripts used to control
+ compilation and installation of an Executable, or source code
+ differential comparisons against either the Original Code or another
+ well known, available Covered Code of the Contributor's choice. The
+ Source Code can be in a compressed or archival form, provided the
+ appropriate decompression or de-archiving software is widely available
+ for no charge.
+
+ 1.12. "You" (or "Your") means an individual or a legal entity
+ exercising rights under, and complying with all of the terms of, this
+ License or a future version of this License issued under Section 6.1.
+ For legal entities, "You" includes any entity which controls, is
+ controlled by, or is under common control with You. For purposes of
+ this definition, "control" means (a) the power, direct or indirect,
+ to cause the direction or management of such entity, whether by
+ contract or otherwise, or (b) ownership of more than fifty percent
+ (50%) of the outstanding shares or beneficial ownership of such
+ entity.
+
+2. Source Code License.
+
+ 2.1. The Initial Developer Grant.
+ The Initial Developer hereby grants You a world-wide, royalty-free,
+ non-exclusive license, subject to third party intellectual property
+ claims:
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Initial Developer to use, reproduce,
+ modify, display, perform, sublicense and distribute the Original
+ Code (or portions thereof) with or without Modifications, and/or
+ as part of a Larger Work; and
+
+ (b) under Patents Claims infringed by the making, using or
+ selling of Original Code, to make, have made, use, practice,
+ sell, and offer for sale, and/or otherwise dispose of the
+ Original Code (or portions thereof).
+
+ (c) the licenses granted in this Section 2.1(a) and (b) are
+ effective on the date Initial Developer first distributes
+ Original Code under the terms of this License.
+
+ (d) Notwithstanding Section 2.1(b) above, no patent license is
+ granted: 1) for code that You delete from the Original Code; 2)
+ separate from the Original Code; or 3) for infringements caused
+ by: i) the modification of the Original Code or ii) the
+ combination of the Original Code with other software or devices.
+
+ 2.2. Contributor Grant.
+ Subject to third party intellectual property claims, each Contributor
+ hereby grants You a world-wide, royalty-free, non-exclusive license
+
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Contributor, to use, reproduce, modify,
+ display, perform, sublicense and distribute the Modifications
+ created by such Contributor (or portions thereof) either on an
+ unmodified basis, with other Modifications, as Covered Code
+ and/or as part of a Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using, or
+ selling of Modifications made by that Contributor either alone
+ and/or in combination with its Contributor Version (or portions
+ of such combination), to make, use, sell, offer for sale, have
+ made, and/or otherwise dispose of: 1) Modifications made by that
+ Contributor (or portions thereof); and 2) the combination of
+ Modifications made by that Contributor with its Contributor
+ Version (or portions of such combination).
+
+ (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+ effective on the date Contributor first makes Commercial Use of
+ the Covered Code.
+
+ (d) Notwithstanding Section 2.2(b) above, no patent license is
+ granted: 1) for any code that Contributor has deleted from the
+ Contributor Version; 2) separate from the Contributor Version;
+ 3) for infringements caused by: i) third party modifications of
+ Contributor Version or ii) the combination of Modifications made
+ by that Contributor with other software (except as part of the
+ Contributor Version) or other devices; or 4) under Patent Claims
+ infringed by Covered Code in the absence of Modifications made by
+ that Contributor.
+
+3. Distribution Obligations.
+
+ 3.1. Application of License.
+ The Modifications which You create or to which You contribute are
+ governed by the terms of this License, including without limitation
+ Section 2.2. The Source Code version of Covered Code may be
+ distributed only under the terms of this License or a future version
+ of this License released under Section 6.1, and You must include a
+ copy of this License with every copy of the Source Code You
+ distribute. You may not offer or impose any terms on any Source Code
+ version that alters or restricts the applicable version of this
+ License or the recipients' rights hereunder. However, You may include
+ an additional document offering the additional rights described in
+ Section 3.5.
+
+ 3.2. Availability of Source Code.
+ Any Modification which You create or to which You contribute must be
+ made available in Source Code form under the terms of this License
+ either on the same media as an Executable version or via an accepted
+ Electronic Distribution Mechanism to anyone to whom you made an
+ Executable version available; and if made available via Electronic
+ Distribution Mechanism, must remain available for at least twelve (12)
+ months after the date it initially became available, or at least six
+ (6) months after a subsequent version of that particular Modification
+ has been made available to such recipients. You are responsible for
+ ensuring that the Source Code version remains available even if the
+ Electronic Distribution Mechanism is maintained by a third party.
+
+ 3.3. Description of Modifications.
+ You must cause all Covered Code to which You contribute to contain a
+ file documenting the changes You made to create that Covered Code and
+ the date of any change. You must include a prominent statement that
+ the Modification is derived, directly or indirectly, from Original
+ Code provided by the Initial Developer and including the name of the
+ Initial Developer in (a) the Source Code, and (b) in any notice in an
+ Executable version or related documentation in which You describe the
+ origin or ownership of the Covered Code.
+
+ 3.4. Intellectual Property Matters
+ (a) Third Party Claims.
+ If Contributor has knowledge that a license under a third party's
+ intellectual property rights is required to exercise the rights
+ granted by such Contributor under Sections 2.1 or 2.2,
+ Contributor must include a text file with the Source Code
+ distribution titled "LEGAL" which describes the claim and the
+ party making the claim in sufficient detail that a recipient will
+ know whom to contact. If Contributor obtains such knowledge after
+ the Modification is made available as described in Section 3.2,
+ Contributor shall promptly modify the LEGAL file in all copies
+ Contributor makes available thereafter and shall take other steps
+ (such as notifying appropriate mailing lists or newsgroups)
+ reasonably calculated to inform those who received the Covered
+ Code that new knowledge has been obtained.
+
+ (b) Contributor APIs.
+ If Contributor's Modifications include an application programming
+ interface and Contributor has knowledge of patent licenses which
+ are reasonably necessary to implement that API, Contributor must
+ also include this information in the LEGAL file.
+
+ (c) Representations.
+ Contributor represents that, except as disclosed pursuant to
+ Section 3.4(a) above, Contributor believes that Contributor's
+ Modifications are Contributor's original creation(s) and/or
+ Contributor has sufficient rights to grant the rights conveyed by
+ this License.
+
+ 3.5. Required Notices.
+ You must duplicate the notice in Exhibit A in each file of the Source
+ Code. If it is not possible to put such notice in a particular Source
+ Code file due to its structure, then You must include such notice in a
+ location (such as a relevant directory) where a user would be likely
+ to look for such a notice. If You created one or more Modification(s)
+ You may add your name as a Contributor to the notice described in
+ Exhibit A. You must also duplicate this License in any documentation
+ for the Source Code where You describe recipients' rights or ownership
+ rights relating to Covered Code. You may choose to offer, and to
+ charge a fee for, warranty, support, indemnity or liability
+ obligations to one or more recipients of Covered Code. However, You
+ may do so only on Your own behalf, and not on behalf of the Initial
+ Developer or any Contributor. You must make it absolutely clear than
+ any such warranty, support, indemnity or liability obligation is
+ offered by You alone, and You hereby agree to indemnify the Initial
+ Developer and every Contributor for any liability incurred by the
+ Initial Developer or such Contributor as a result of warranty,
+ support, indemnity or liability terms You offer.
+
+ 3.6. Distribution of Executable Versions.
+ You may distribute Covered Code in Executable form only if the
+ requirements of Section 3.1-3.5 have been met for that Covered Code,
+ and if You include a notice stating that the Source Code version of
+ the Covered Code is available under the terms of this License,
+ including a description of how and where You have fulfilled the
+ obligations of Section 3.2. The notice must be conspicuously included
+ in any notice in an Executable version, related documentation or
+ collateral in which You describe recipients' rights relating to the
+ Covered Code. You may distribute the Executable version of Covered
+ Code or ownership rights under a license of Your choice, which may
+ contain terms different from this License, provided that You are in
+ compliance with the terms of this License and that the license for the
+ Executable version does not attempt to limit or alter the recipient's
+ rights in the Source Code version from the rights set forth in this
+ License. If You distribute the Executable version under a different
+ license You must make it absolutely clear that any terms which differ
+ from this License are offered by You alone, not by the Initial
+ Developer or any Contributor. You hereby agree to indemnify the
+ Initial Developer and every Contributor for any liability incurred by
+ the Initial Developer or such Contributor as a result of any such
+ terms You offer.
+
+ 3.7. Larger Works.
+ You may create a Larger Work by combining Covered Code with other code
+ not governed by the terms of this License and distribute the Larger
+ Work as a single product. In such a case, You must make sure the
+ requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+ If it is impossible for You to comply with any of the terms of this
+ License with respect to some or all of the Covered Code due to
+ statute, judicial order, or regulation then You must: (a) comply with
+ the terms of this License to the maximum extent possible; and (b)
+ describe the limitations and the code they affect. Such description
+ must be included in the LEGAL file described in Section 3.4 and must
+ be included with all distributions of the Source Code. Except to the
+ extent prohibited by statute or regulation, such description must be
+ sufficiently detailed for a recipient of ordinary skill to be able to
+ understand it.
+
+5. Application of this License.
+
+ This License applies to code to which the Initial Developer has
+ attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+ 6.1. New Versions.
+ Netscape Communications Corporation ("Netscape") may publish revised
+ and/or new versions of the License from time to time. Each version
+ will be given a distinguishing version number.
+
+ 6.2. Effect of New Versions.
+ Once Covered Code has been published under a particular version of the
+ License, You may always continue to use it under the terms of that
+ version. You may also choose to use such Covered Code under the terms
+ of any subsequent version of the License published by Netscape. No one
+ other than Netscape has the right to modify the terms applicable to
+ Covered Code created under this License.
+
+ 6.3. Derivative Works.
+ If You create or use a modified version of this License (which you may
+ only do in order to apply it to code which is not already Covered Code
+ governed by this License), You must (a) rename Your license so that
+ the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+ "MPL", "NPL" or any confusingly similar phrase do not appear in your
+ license (except to note that your license differs from this License)
+ and (b) otherwise make it clear that Your version of the license
+ contains terms which differ from the Mozilla Public License and
+ Netscape Public License. (Filling in the name of the Initial
+ Developer, Original Code or Contributor in the notice described in
+ Exhibit A shall not of themselves be deemed to be modifications of
+ this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+ COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+ DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+ THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+ IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+ YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+ COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+ OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+ ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+ 8.1. This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to cure
+ such breach within 30 days of becoming aware of the breach. All
+ sublicenses to the Covered Code which are properly granted shall
+ survive any termination of this License. Provisions which, by their
+ nature, must remain in effect beyond the termination of this License
+ shall survive.
+
+ 8.2. If You initiate litigation by asserting a patent infringement
+ claim (excluding declatory judgment actions) against Initial Developer
+ or a Contributor (the Initial Developer or Contributor against whom
+ You file such action is referred to as "Participant") alleging that:
+
+ (a) such Participant's Contributor Version directly or indirectly
+ infringes any patent, then any and all rights granted by such
+ Participant to You under Sections 2.1 and/or 2.2 of this License
+ shall, upon 60 days notice from Participant terminate prospectively,
+ unless if within 60 days after receipt of notice You either: (i)
+ agree in writing to pay Participant a mutually agreeable reasonable
+ royalty for Your past and future use of Modifications made by such
+ Participant, or (ii) withdraw Your litigation claim with respect to
+ the Contributor Version against such Participant. If within 60 days
+ of notice, a reasonable royalty and payment arrangement are not
+ mutually agreed upon in writing by the parties or the litigation claim
+ is not withdrawn, the rights granted by Participant to You under
+ Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+ the 60 day notice period specified above.
+
+ (b) any software, hardware, or device, other than such Participant's
+ Contributor Version, directly or indirectly infringes any patent, then
+ any rights granted to You by such Participant under Sections 2.1(b)
+ and 2.2(b) are revoked effective as of the date You first made, used,
+ sold, distributed, or had made, Modifications made by that
+ Participant.
+
+ 8.3. If You assert a patent infringement claim against Participant
+ alleging that such Participant's Contributor Version directly or
+ indirectly infringes any patent where such claim is resolved (such as
+ by license or settlement) prior to the initiation of patent
+ infringement litigation, then the reasonable value of the licenses
+ granted by such Participant under Sections 2.1 or 2.2 shall be taken
+ into account in determining the amount or value of any payment or
+ license.
+
+ 8.4. In the event of termination under Sections 8.1 or 8.2 above,
+ all end user license agreements (excluding distributors and resellers)
+ which have been validly granted by You or any distributor hereunder
+ prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+ (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+ DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+ OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+ ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+ CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+ WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+ COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+ INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+ LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+ RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+ PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+ EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+ THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+ The Covered Code is a "commercial item," as that term is defined in
+ 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+ software" and "commercial computer software documentation," as such
+ terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+ C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+ all U.S. Government End Users acquire Covered Code with only those
+ rights set forth herein.
+
+11. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the extent
+ necessary to make it enforceable. This License shall be governed by
+ California law provisions (except to the extent applicable law, if
+ any, provides otherwise), excluding its conflict-of-law provisions.
+ With respect to disputes in which at least one party is a citizen of,
+ or an entity chartered or registered to do business in the United
+ States of America, any litigation relating to this License shall be
+ subject to the jurisdiction of the Federal Courts of the Northern
+ District of California, with venue lying in Santa Clara County,
+ California, with the losing party responsible for costs, including
+ without limitation, court costs and reasonable attorneys' fees and
+ expenses. The application of the United Nations Convention on
+ Contracts for the International Sale of Goods is expressly excluded.
+ Any law or regulation which provides that the language of a contract
+ shall be construed against the drafter shall not apply to this
+ License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+ As between Initial Developer and the Contributors, each party is
+ responsible for claims and damages arising, directly or indirectly,
+ out of its utilization of rights under this License and You agree to
+ work with Initial Developer and Contributors to distribute such
+ responsibility on an equitable basis. Nothing herein is intended or
+ shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+ Initial Developer may designate portions of the Covered Code as
+ "Multiple-Licensed". "Multiple-Licensed" means that the Initial
+ Developer permits you to utilize portions of the Covered Code under
+ Your choice of the NPL or the alternative licenses, if any, specified
+ by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A - Mozilla Public License.
+
+ ``The contents of this file are subject to the Mozilla Public License
+ Version 1.1 (the "License"); you may not use this file except in
+ compliance with the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS IS"
+ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ License for the specific language governing rights and limitations
+ under the License.
+
+ The Original Code is RabbitMQ.
+
+ The Initial Developers of the Original Code are LShift Ltd.,
+ Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
+
+ Portions created by LShift Ltd., Cohesive Financial
+ Technologies LLC., and Rabbit Technologies Ltd. are Copyright (C)
+ 2007 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit
+ Technologies Ltd.;
+
+ All Rights Reserved.
+
+ Contributor(s): ______________________________________.''
+
+ [NOTE: The text of this Exhibit A may differ slightly from the text of
+ the notices in the Source Code files of the Original Code. You should
+ use the text of this Exhibit A rather than the text found in the
+ Original Code Source Code for Your Modifications.]
+
+-------------------------------------------------------------------------------
+
+mcs/class/RabbitMQ.Client/docs/specs/amqp0-9.xml
+
+WARNING: THIS LICENSE SOUNDS LIKE A NON-FREE SPECIFICATION!!!
+
+ Copyright Notice
+ ================
+ (c) Copyright JPMorgan Chase Bank & Co., Cisco Systems, Inc., Envoy Technologies Inc.,
+ iMatix Corporation, IONA\ufffd Technologies, Red Hat, Inc.,
+ TWIST Process Innovations, and 29West Inc. 2006. All rights reserved.
+
+ License
+ =======
+ JPMorgan Chase Bank & Co., Cisco Systems, Inc., Envoy Technologies Inc., iMatix
+ Corporation, IONA Technologies, Red Hat, Inc., TWIST Process Innovations, and
+ 29West Inc. (collectively, the "Authors") each hereby grants to you a worldwide,
+ perpetual, royalty-free, nontransferable, nonexclusive license to
+ (i) copy, display, distribute and implement the Advanced Messaging Queue Protocol
+ ("AMQP") Specification and (ii) the Licensed Claims that are held by
+ the Authors, all for the purpose of implementing the Advanced Messaging
+ Queue Protocol Specification. Your license and any rights under this
+ Agreement will terminate immediately without notice from
+ any Author if you bring any claim, suit, demand, or action related to
+ the Advanced Messaging Queue Protocol Specification against any Author.
+ Upon termination, you shall destroy all copies of the Advanced Messaging
+ Queue Protocol Specification in your possession or control.
+
+ As used hereunder, "Licensed Claims" means those claims of a patent or
+ patent application, throughout the world, excluding design patents and
+ design registrations, owned or controlled, or that can be sublicensed
+ without fee and in compliance with the requirements of this
+ Agreement, by an Author or its affiliates now or at any
+ future time and which would necessarily be infringed by implementation
+ of the Advanced Messaging Queue Protocol Specification. A claim is
+ necessarily infringed hereunder only when it is not possible to avoid
+ infringing it because there is no plausible non-infringing alternative
+ for implementing the required portions of the Advanced Messaging Queue
+ Protocol Specification. Notwithstanding the foregoing, Licensed Claims
+ shall not include any claims other than as set forth above even if
+ contained in the same patent as Licensed Claims; or that read solely
+ on any implementations of any portion of the Advanced Messaging Queue
+ Protocol Specification that are not required by the Advanced Messaging
+ Queue Protocol Specification, or that, if licensed, would require a
+ payment of royalties by the licensor to unaffiliated third parties.
+ Moreover, Licensed Claims shall not include (i) any enabling technologies
+ that may be necessary to make or use any Licensed Product but are not
+ themselves expressly set forth in the Advanced Messaging Queue Protocol
+ Specification (e.g., semiconductor manufacturing technology, compiler
+ technology, object oriented technology, networking technology, operating
+ system technology, and the like); or (ii) the implementation of other
+ published standards developed elsewhere and merely referred to in the
+ body of the Advanced Messaging Queue Protocol Specification, or
+ (iii) any Licensed Product and any combinations thereof the purpose or
+ function of which is not required for compliance with the Advanced
+ Messaging Queue Protocol Specification. For purposes of this definition,
+ the Advanced Messaging Queue Protocol Specification shall be deemed to
+ include both architectural and interconnection requirements essential
+ for interoperability and may also include supporting source code artifacts
+ where such architectural, interconnection requirements and source code
+ artifacts are expressly identified as being required or documentation to
+ achieve compliance with the Advanced Messaging Queue Protocol Specification.
+
+ As used hereunder, "Licensed Products" means only those specific portions
+ of products (hardware, software or combinations thereof) that implement
+ and are compliant with all relevant portions of the Advanced Messaging
+ Queue Protocol Specification.
+
+ The following disclaimers, which you hereby also acknowledge as to any
+ use you may make of the Advanced Messaging Queue Protocol Specification:
+
+ THE ADVANCED MESSAGING QUEUE PROTOCOL SPECIFICATION IS PROVIDED "AS IS,"
+ AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE
+ CONTENTS OF THE ADVANCED MESSAGING QUEUE PROTOCOL SPECIFICATION ARE
+ SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF THE ADVANCED
+ MESSAGING QUEUE PROTOCOL SPECIFICATION WILL NOT INFRINGE ANY THIRD PARTY
+ PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+ THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
+ INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
+ USE, IMPLEMENTATION OR DISTRIBUTION OF THE ADVANCED MESSAGING QUEUE
+ PROTOCOL SPECIFICATION.
+
+ The name and trademarks of the Authors may NOT be used in any manner,
+ including advertising or publicity pertaining to the Advanced Messaging
+ Queue Protocol Specification or its contents without specific, written
+ prior permission. Title to copyright in the Advanced Messaging Queue
+ Protocol Specification will at all times remain with the Authors.
+
+ No other rights are granted by implication, estoppel or otherwise.
+
+ Upon termination of your license or rights under this Agreement, you
+ shall destroy all copies of the Advanced Messaging Queue Protocol
+ Specification in your possession or control.
+
+-------------------------------------------------------------------------------
+
docs/AgilityPack.dll
Copyright (C) ???? Simon Mourier <simonm at microsoft.com>
diff --git a/debian/libmono-system-runtime2.0-cil.install b/debian/libmono-system-runtime2.0-cil.install
index 2d2df06..65be7a4 100644
--- a/debian/libmono-system-runtime2.0-cil.install
+++ b/debian/libmono-system-runtime2.0-cil.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/mono/gac/System.Runtime.*/2.0.*/
+debian/tmp/usr/lib/mono/gac/System.Runtime.*/2.0.0.0_*/
debian/tmp/usr/lib/mono/2.0/System.Runtime.*.dll
diff --git a/debian/libmono-system-web2.0-cil.install b/debian/libmono-system-web2.0-cil.install
index d46d7b8..eb31c62 100644
--- a/debian/libmono-system-web2.0-cil.install
+++ b/debian/libmono-system-web2.0-cil.install
@@ -10,3 +10,5 @@ debian/tmp/usr/lib/mono/2.0/System.Web.Extensions.Design.dll
debian/tmp/usr/lib/mono/2.0/System.Web.Services.dll
debian/tmp/usr/lib/mono/3.5/System.Web.Extensions.dll
debian/tmp/usr/lib/mono/3.5/System.Web.Extensions.Design.dll
+debian/tmp/usr/lib/pkgconfig/system.web.extensions_1.0.pc
+debian/tmp/usr/lib/pkgconfig/system.web.extensions.design_1.0.pc
diff --git a/debian/libmono-system2.1-cil.install b/debian/libmono-system2.1-cil.install
index 90e3235..4be622d 100644
--- a/debian/libmono-system2.1-cil.install
+++ b/debian/libmono-system2.1-cil.install
@@ -1,8 +1,18 @@
+debian/tmp/usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.5.0__*/
debian/tmp/usr/lib/mono/gac/System/2.0.5.0__*/
debian/tmp/usr/lib/mono/gac/System.Core/2.0.5.0__*/
debian/tmp/usr/lib/mono/gac/System.Net/2.0.5.0__*/
+debian/tmp/usr/lib/mono/gac/System.Runtime.Serialization/2.0.5.0__*/
+debian/tmp/usr/lib/mono/gac/System.ServiceModel/2.0.5.0__*/
+debian/tmp/usr/lib/mono/gac/System.ServiceModel.Web/2.0.5.0__*/
debian/tmp/usr/lib/mono/gac/System.Xml/2.0.5.0__*/
+debian/tmp/usr/lib/mono/gac/System.Xml.Linq/2.0.5.0__*/
+debian/tmp/usr/lib/mono/2.1/Mono.CompilerServices.SymbolWriter.dll
debian/tmp/usr/lib/mono/2.1/System.dll
debian/tmp/usr/lib/mono/2.1/System.Core.dll
debian/tmp/usr/lib/mono/2.1/System.Net.dll
+debian/tmp/usr/lib/mono/2.1/System.Runtime.Serialization.dll
+debian/tmp/usr/lib/mono/2.1/System.ServiceModel.dll
+debian/tmp/usr/lib/mono/2.1/System.ServiceModel.Web.dll
debian/tmp/usr/lib/mono/2.1/System.Xml.dll
+debian/tmp/usr/lib/mono/2.1/System.Xml.Linq.dll
diff --git a/debian/libmono2.0-cil.install b/debian/libmono2.0-cil.install
index 5fa517c..4b9f9b4 100644
--- a/debian/libmono2.0-cil.install
+++ b/debian/libmono2.0-cil.install
@@ -7,3 +7,4 @@ debian/tmp/usr/lib/mono/gac/Mono.Http/2.0.0.0__*/
debian/tmp/usr/lib/mono/gac/Mono.Web/2.0.0.0__*/
debian/tmp/usr/lib/mono/gac/OpenSystem.C/2.0.0.0__*/
debian/tmp/usr/lib/mono/gac/mono-service/2.0.0.0__*/
+debian/tmp/usr/lib/pkgconfig/mono.web.pc
diff --git a/debian/patches/00list b/debian/patches/00list
index 74dc6a2..e7af4ef 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
+debian_version
armel_fix_configure_fpu_check
kfreebsd_support
console-no-utf8-bom
@@ -7,10 +8,8 @@ fix-mono-cairo.pc.in
fix-mono-nunit.pc.in
fix_BigInteger_overflow_CVE-2007-5197
fix_implicit_pointer_conversions
-fix_wsdl2_duplicate_keys_r117243
-fix_NetworkInterface_exception_r120282
-fix_TcpClient_IPv6_r122598
-fix_null_funcptr_marshalling_r127347.dpatch
+fix_null_funcptr_marshalling_r127347
+disable_building_convert.exe
+disable_building_RabbitMQ.Client.dll
armel-glibc-2.8
build_genxs_2.0
-99_autoreconf
diff --git a/debian/patches/99_autoreconf.dpatch b/debian/patches/99_autoreconf.dpatch
deleted file mode 100755
index ae3d3f2..0000000
--- a/debian/patches/99_autoreconf.dpatch
+++ /dev/null
@@ -1,1149 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_autoreconf.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mono-2.0.1~/aclocal.m4 mono-2.0.1/aclocal.m4
---- mono-2.0.1~/aclocal.m4 2008-10-22 19:19:52.000000000 +0200
-+++ mono-2.0.1/aclocal.m4 2008-11-23 16:09:50.000000000 +0100
-@@ -21,7 +21,7 @@
-
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
--# serial 52 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
-
-
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1723,6 +1723,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -2504,7 +2516,7 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- else
-@@ -3511,7 +3523,7 @@
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
-@@ -5203,7 +5215,7 @@
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
-@@ -5580,6 +5592,9 @@
- cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
- ;;
-+ linux* | k*bsd*-gnu)
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+ ;;
- *)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -5788,12 +5803,13 @@
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -6224,7 +6240,7 @@
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -6723,14 +6739,16 @@
- # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
- # ---------------------------------------------
- m4_define([_PKG_CONFIG],
--[if test -n "$$1"; then
-- pkg_cv_[]$1="$$1"
-- elif test -n "$PKG_CONFIG"; then
-- PKG_CHECK_EXISTS([$3],
-- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-- [pkg_failed=yes])
-- else
-- pkg_failed=untried
-+[if test -n "$PKG_CONFIG"; then
-+ if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ else
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+ [pkg_failed=yes])
-+ fi
-+else
-+ pkg_failed=untried
- fi[]dnl
- ])# _PKG_CONFIG
-
-@@ -6774,9 +6792,9 @@
- if test $pkg_failed = yes; then
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
- else
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff -urNad mono-2.0.1~/configure mono-2.0.1/configure
---- mono-2.0.1~/configure 2008-11-23 16:09:39.000000000 +0100
-+++ mono-2.0.1/configure 2008-11-23 16:12:08.000000000 +0100
-@@ -1657,7 +1657,7 @@
- --with-jit=yes,no If you want to build scripts that default to the JIT
- --with-interp=yes,no If you want to build scripts that default to the interpreter
- --with-x use the X Window System
-- --with-fpu=FPA,VFP,NONE Select fpu to use on arm
-+ --with-fpu=FPA,VFP,NONE Select fpu to use on arm
- --with-preview=yes,no If you want to install the 2.0 FX preview
- --with-moonlight=yes,no If you want to build the Moonlight 2.1 assemblies
- --with-oprofile=no,<path> Enable oprofile support (defaults to NO)
-@@ -2928,6 +2928,16 @@
- libgc_threads=pthreads
- with_sigaltstack=no
- ;;
-+ *-*-kfreebsd*-gnu)
-+ platform_win32=no
-+ CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP -DTHREAD_LOCAL_ALLOC -pthread"
-+ libmono_cflags="-D_REENTRANT -DTHREAD_LOCAL_ALLOC -pthread"
-+ libmono_ldflags="-lpthread -pthread"
-+ libdl="-ldl"
-+ libgc_threads=pthreads
-+ need_link_unlink=yes
-+ with_sigaltstack=no
-+ ;;
- # these flags will work for all versions of -STABLE
- #
- *-*-*freebsd4*)
-@@ -6412,7 +6422,7 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- else
-@@ -6532,7 +6542,7 @@
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 6534 "configure"' > conftest.$ac_ext
-+ echo '#line 6545 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -9469,11 +9479,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9471: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9482: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:9475: \$? = $ac_status" >&5
-+ echo "$as_me:9486: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -9759,11 +9769,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9761: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9772: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:9765: \$? = $ac_status" >&5
-+ echo "$as_me:9776: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -9863,11 +9873,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9865: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9876: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:9869: \$? = $ac_status" >&5
-+ echo "$as_me:9880: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -10128,12 +10138,13 @@
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ link_all_deplibs=no
- else
- ld_shlibs=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -10676,7 +10687,7 @@
- link_all_deplibs=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -11387,6 +11398,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -12227,7 +12250,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 12229 "configure"
-+#line 12253 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -12327,7 +12350,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 12329 "configure"
-+#line 12353 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -13915,7 +13938,7 @@
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
-@@ -14619,7 +14642,7 @@
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
-@@ -14728,11 +14751,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14730: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14754: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:14734: \$? = $ac_status" >&5
-+ echo "$as_me:14758: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -14832,11 +14855,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14834: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14858: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:14838: \$? = $ac_status" >&5
-+ echo "$as_me:14862: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -14904,6 +14927,9 @@
- cygwin* | mingw*)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- ;;
-+ linux* | k*bsd*-gnu)
-+ link_all_deplibs_CXX=no
-+ ;;
- *)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -15350,6 +15376,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -16415,11 +16453,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16417: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16456: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:16421: \$? = $ac_status" >&5
-+ echo "$as_me:16460: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -16519,11 +16557,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16521: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16560: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:16525: \$? = $ac_status" >&5
-+ echo "$as_me:16564: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -16784,12 +16822,13 @@
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ link_all_deplibs_F77=no
- else
- ld_shlibs_F77=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -17312,7 +17351,7 @@
- link_all_deplibs_F77=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -17971,6 +18010,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -18726,11 +18777,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18728: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18780: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:18732: \$? = $ac_status" >&5
-+ echo "$as_me:18784: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -19016,11 +19067,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:19018: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19070: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:19022: \$? = $ac_status" >&5
-+ echo "$as_me:19074: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -19120,11 +19171,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:19122: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19174: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:19126: \$? = $ac_status" >&5
-+ echo "$as_me:19178: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -19385,12 +19436,13 @@
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ link_all_deplibs_GCJ=no
- else
- ld_shlibs_GCJ=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -19933,7 +19985,7 @@
- link_all_deplibs_GCJ=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -20592,6 +20644,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -24594,10 +24658,11 @@
- { echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5
- echo $ECHO_N "checking for BASE_DEPENDENCIES... $ECHO_C" >&6; }
-
--if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
-- pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
-+ pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION\"") >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION") 2>&5
- ac_status=$?
-@@ -24607,13 +24672,15 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$BASE_DEPENDENCIES_LIBS"; then
-- pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$BASE_DEPENDENCIES_LIBS"; then
-+ pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION\"") >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION") 2>&5
- ac_status=$?
-@@ -24623,8 +24690,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -24637,9 +24705,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION" 2>&1`
-+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION"`
- else
-- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION" 2>&1`
-+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
-@@ -38555,6 +38623,11 @@
- LIBC="libc.so.12"
- INTL="libintl.so.0"
- ;;
-+ *-*-kfreebsd*-gnu)
-+ LIBC="libc.so.0.1"
-+ INTL="libc.so.0.1"
-+ X11="libX11.so.6"
-+ ;;
- *-*-*freebsd*)
- LIBC="libc.so"
- INTL="libintl.so"
-@@ -39082,11 +39155,20 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
--if test ${TARGET} = ARM && test x$cross_compiling = xno && test x$enable_mcs_build != xno; then
-+
-+# Check whether --with-fpu was given.
-+if test "${with_fpu+set}" = set; then
-+ withval=$with_fpu; fpu=$withval
-+fi
-+
-+
-+if test ${TARGET} = ARM; then
- { echo "$as_me:$LINENO: checking which FPU to use" >&5
- echo $ECHO_N "checking which FPU to use... $ECHO_C" >&6; }
-
-- cat >conftest.$ac_ext <<_ACEOF
-+ if test "x$fpu" = "x"; then
-+
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -39125,10 +39207,54 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ __asm__ ("fldd d0, [r0]");
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ fpu=VFP
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fpu=NONE
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
- { echo "$as_me:$LINENO: result: $fpu" >&5
-diff -urNad mono-2.0.1~/libgc/aclocal.m4 mono-2.0.1/libgc/aclocal.m4
---- mono-2.0.1~/libgc/aclocal.m4 2008-10-22 19:20:04.000000000 +0200
-+++ mono-2.0.1/libgc/aclocal.m4 2008-11-23 16:09:50.000000000 +0100
-@@ -21,7 +21,7 @@
-
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
--# serial 52 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
-
-
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1723,6 +1723,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -2504,7 +2516,7 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- else
-@@ -3511,7 +3523,7 @@
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
-@@ -5203,7 +5215,7 @@
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
-@@ -5580,6 +5592,9 @@
- cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
- ;;
-+ linux* | k*bsd*-gnu)
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+ ;;
- *)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -5788,12 +5803,13 @@
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -6224,7 +6240,7 @@
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-diff -urNad mono-2.0.1~/libgc/configure mono-2.0.1/libgc/configure
---- mono-2.0.1~/libgc/configure 2008-10-22 19:20:06.000000000 +0200
-+++ mono-2.0.1/libgc/configure 2008-11-23 16:09:50.000000000 +0100
-@@ -4637,6 +4637,32 @@
-
- THREADDLLIBS="-lpthread -lrt"
- ;;
-+ *-*-kfreebsd*-gnu)
-+ cat >>confdefs.h <<\_ACEOF
-+#define GC_FREEBSD_THREADS 1
-+_ACEOF
-+
-+ INCLUDES="$INCLUDES -pthread"
-+ THREADDLLIBS=-pthread
-+ cat >>confdefs.h <<\_ACEOF
-+#define _REENTRANT 1
-+_ACEOF
-+
-+ if test "${enable_parallel_mark}" = yes; then
-+ cat >>confdefs.h <<\_ACEOF
-+#define PARALLEL_MARK 1
-+_ACEOF
-+
-+ fi
-+ cat >>confdefs.h <<\_ACEOF
-+#define THREAD_LOCAL_ALLOC 1
-+_ACEOF
-+
-+ cat >>confdefs.h <<\_ACEOF
-+#define USE_COMPILER_TLS 1
-+_ACEOF
-+
-+ ;;
- *-*-freebsd4*)
- { echo "$as_me:$LINENO: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&5
- echo "$as_me: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&2;}
-@@ -5728,7 +5754,7 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- else
-@@ -5848,7 +5874,7 @@
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 5851 "configure"' > conftest.$ac_ext
-+ echo '#line 5877 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -8433,11 +8459,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8436: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8462: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8440: \$? = $ac_status" >&5
-+ echo "$as_me:8466: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -8723,11 +8749,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8726: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8752: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8730: \$? = $ac_status" >&5
-+ echo "$as_me:8756: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -8827,11 +8853,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8830: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8856: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8834: \$? = $ac_status" >&5
-+ echo "$as_me:8860: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -9092,12 +9118,13 @@
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ link_all_deplibs=no
- else
- ld_shlibs=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -9640,7 +9667,7 @@
- link_all_deplibs=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -10351,6 +10378,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -11191,7 +11230,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11194 "configure"
-+#line 11233 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -11291,7 +11330,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11294 "configure"
-+#line 11333 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -12879,7 +12918,7 @@
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
-@@ -13583,7 +13622,7 @@
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
-@@ -13692,11 +13731,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13695: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13734: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:13699: \$? = $ac_status" >&5
-+ echo "$as_me:13738: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -13796,11 +13835,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13799: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13838: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:13803: \$? = $ac_status" >&5
-+ echo "$as_me:13842: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -13868,6 +13907,9 @@
- cygwin* | mingw*)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- ;;
-+ linux* | k*bsd*-gnu)
-+ link_all_deplibs_CXX=no
-+ ;;
- *)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -14314,6 +14356,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -15379,11 +15433,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15382: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15436: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:15386: \$? = $ac_status" >&5
-+ echo "$as_me:15440: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -15483,11 +15537,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15486: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15540: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:15490: \$? = $ac_status" >&5
-+ echo "$as_me:15544: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -15748,12 +15802,13 @@
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ link_all_deplibs_F77=no
- else
- ld_shlibs_F77=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -16276,7 +16331,7 @@
- link_all_deplibs_F77=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -16935,6 +16990,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -17690,11 +17757,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17693: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17760: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:17697: \$? = $ac_status" >&5
-+ echo "$as_me:17764: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -17980,11 +18047,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17983: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18050: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:17987: \$? = $ac_status" >&5
-+ echo "$as_me:18054: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -18084,11 +18151,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18087: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18154: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:18091: \$? = $ac_status" >&5
-+ echo "$as_me:18158: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -18349,12 +18416,13 @@
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ link_all_deplibs_GCJ=no
- else
- ld_shlibs_GCJ=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -18897,7 +18965,7 @@
- link_all_deplibs_GCJ=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -19556,6 +19624,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
diff --git a/debian/patches/armel-glibc-2.8.dpatch b/debian/patches/armel-glibc-2.8.dpatch
deleted file mode 100755
index 67cabea..0000000
--- a/debian/patches/armel-glibc-2.8.dpatch
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## armel-glibc-2.8.dpatch by Michael Casadevall <sonicmctails at gmail.com>
-## tweaked for 2.0.1 by Jo Shields <directhex at apebox.org>
-##
-## DP: Moved the location files are included to prevent a FTBFS
-## DP: since in 2.8, you can't include headers within a function
-## DP: and expect it to work
- at DPATCH@
-diff -urNad mono-2.0.1~/mono/arch/arm/tramp.c mono-2.0.1/mono/arch/arm/tramp.c
---- mono-2.0.1~/mono/arch/arm/tramp.c 2008-11-19 23:05:19.000000000 +0000
-+++ mono-2.0.1/mono/arch/arm/tramp.c 2008-11-19 23:07:02.000000000 +0000
-@@ -10,6 +10,9 @@
-
- #if defined(_WIN32_WCE) || defined (UNDER_CE)
- # include <windows.h>
-+#else
-+#include <unistd.h>
-+#include <sys/mman.h>
- #endif
-
- #if !defined(PLATFORM_MACOSX)
-@@ -76,8 +79,6 @@
- code_buff = malloc(code_size);
- VirtualProtect(code_buff, code_size, PAGE_EXECUTE_READWRITE, &old_prot);
- #else
--#include <unistd.h>
--#include <sys/mman.h>
- int page_size = sysconf(_SC_PAGESIZE);
- int new_code_size;
-
diff --git a/debian/patches/armel_fix_configure_fpu_check.dpatch b/debian/patches/armel_fix_configure_fpu_check.dpatch
index 133c9cf..43b78f2 100755
--- a/debian/patches/armel_fix_configure_fpu_check.dpatch
+++ b/debian/patches/armel_fix_configure_fpu_check.dpatch
@@ -5,34 +5,6 @@
## DP: No description.
@DPATCH@
-diff -urNad mono-2.0.1~/configure mono-2.0.1/configure
---- mono-2.0.1~/configure 2008-10-22 19:20:01.000000000 +0200
-+++ mono-2.0.1/configure 2008-11-23 15:47:00.000000000 +0100
-@@ -1657,6 +1657,7 @@
- --with-jit=yes,no If you want to build scripts that default to the JIT
- --with-interp=yes,no If you want to build scripts that default to the interpreter
- --with-x use the X Window System
-+ --with-fpu=FPA,VFP,NONE Select fpu to use on arm
- --with-preview=yes,no If you want to install the 2.0 FX preview
- --with-moonlight=yes,no If you want to build the Moonlight 2.1 assemblies
- --with-oprofile=no,<path> Enable oprofile support (defaults to NO)
-@@ -39096,7 +39097,7 @@
- main ()
- {
-
-- __asm__ ("ldfd f0, [r0]");
-+ __asm__ ("ldfd f0, [r0]");
-
- ;
- return 0;
-@@ -39128,6 +39129,7 @@
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ fi
-
- { echo "$as_me:$LINENO: result: $fpu" >&5
- echo "${ECHO_T}$fpu" >&6; }
diff -urNad mono-2.0.1~/configure.in mono-2.0.1/configure.in
--- mono-2.0.1~/configure.in 2008-10-20 19:29:46.000000000 +0200
+++ mono-2.0.1/configure.in 2008-11-23 16:08:54.000000000 +0100
diff --git a/debian/patches/build_genxs_2.0.dpatch b/debian/patches/build_genxs_2.0.dpatch
index b14b423..559abc5 100755
--- a/debian/patches/build_genxs_2.0.dpatch
+++ b/debian/patches/build_genxs_2.0.dpatch
@@ -5,21 +5,22 @@
## DP: No description.
@DPATCH@
-diff -urNad mono-2.0~/mcs/tools/Makefile mono-2.0/mcs/tools/Makefile
---- mono-2.0~/mcs/tools/Makefile 2008-09-02 17:44:36.000000000 +0200
-+++ mono-2.0/mcs/tools/Makefile 2008-11-01 12:52:49.000000000 +0100
-@@ -8,7 +8,7 @@
- net_1_1_bootstrap_SUBDIRS = gacutil security resgen culevel
- net_2_0_bootstrap_SUBDIRS = resgen
+diff -urNad mono-2.4+dfsg~/mcs/tools/Makefile mono-2.4+dfsg/mcs/tools/Makefile
+--- mono-2.4+dfsg~/mcs/tools/Makefile 2009-04-11 02:43:07.000000000 +0200
++++ mono-2.4+dfsg/mcs/tools/Makefile 2009-04-11 02:44:26.000000000 +0200
+@@ -53,7 +53,8 @@
+ nunitreport \
+ sqlsharp \
+ gacutil \
+- csharplib
++ csharplib \
++ genxs
--net_2_0_SUBDIRS = al corcompare mono-xsd wsdl compiler-tester monop xbuild resgen mono-service mkbundle sgen security mconfig installutil nunitreport gacutil
-+net_2_0_SUBDIRS = al corcompare mono-xsd wsdl compiler-tester monop xbuild resgen mono-service mkbundle sgen security mconfig installutil nunitreport gacutil genxs
- net_2_1_raw_SUBDIRS = compiler-tester
- net_2_1_SUBDIRS = compiler-tester tuner
-
-diff -urNad mono-2.0~/mcs/tools/genxs/Makefile mono-2.0/mcs/tools/genxs/Makefile
---- mono-2.0~/mcs/tools/genxs/Makefile 2008-09-02 17:44:14.000000000 +0200
-+++ mono-2.0/mcs/tools/genxs/Makefile 2008-11-01 12:52:02.000000000 +0100
+ net_2_1_dirs := \
+ compiler-tester
+diff -urNad mono-2.4+dfsg~/mcs/tools/genxs/Makefile mono-2.4+dfsg/mcs/tools/genxs/Makefile
+--- mono-2.4+dfsg~/mcs/tools/genxs/Makefile 2009-04-11 02:43:07.000000000 +0200
++++ mono-2.4+dfsg/mcs/tools/genxs/Makefile 2009-04-11 02:43:42.000000000 +0200
@@ -5,4 +5,6 @@
LOCAL_MCS_FLAGS = -r:System.Xml.dll
PROGRAM = $(topdir)/class/lib/$(PROFILE)/genxs.exe
diff --git a/debian/patches/debian_version.dpatch b/debian/patches/debian_version.dpatch
new file mode 100644
index 0000000..c2a1f3a
--- /dev/null
+++ b/debian/patches/debian_version.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debian_version.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-2.4+dfsg~/mono/mini/Makefile.am mono-2.4+dfsg/mono/mini/Makefile.am
+--- mono-2.4+dfsg~/mono/mini/Makefile.am 2009-04-18 00:54:50.000000000 +0200
++++ mono-2.4+dfsg/mono/mini/Makefile.am 2009-04-18 01:03:46.000000000 +0200
+@@ -83,7 +83,7 @@
+ # We build this after libmono was built so it contains the date when the final
+ # link was done
+ buildver.h: libmono-static.la
+- @echo "const char *build_date = \"`date`\";" > buildver.h
++ @echo "const char *build_date;" > buildver.h
+
+ main.$(OBJEXT): buildver.h
+
+@@ -534,7 +534,7 @@
+ echo "#define FULL_VERSION \"$$branch r$$version\""; \
+ ); \
+ else \
+- echo "#define FULL_VERSION \"tarball\""; \
++ echo "#define FULL_VERSION \"Debian $$(dpkg-parsechangelog -l$(top_srcdir)/debian/changelog | grep ^Vers | cut -d\ -f2)\""; \
+ fi > version.h
+
+ # Utility target for patching libtool to speed up linking
diff --git a/debian/patches/disable_building_RabbitMQ.Client.dll.dpatch b/debian/patches/disable_building_RabbitMQ.Client.dll.dpatch
new file mode 100644
index 0000000..e145cf0
--- /dev/null
+++ b/debian/patches/disable_building_RabbitMQ.Client.dll.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## disable_building_RabbitMQ.Client.dll.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-2.4+dfsg~/mcs/class/Makefile mono-2.4+dfsg/mcs/class/Makefile
+--- mono-2.4+dfsg~/mcs/class/Makefile 2009-02-14 00:56:37.000000000 +0100
++++ mono-2.4+dfsg/mcs/class/Makefile 2009-05-08 23:56:11.000000000 +0200
+@@ -77,10 +77,8 @@
+ Novell.Directory.Ldap \
+ Mono.Security.Win32 \
+ System.DirectoryServices \
+- RabbitMQ.Client \
+ Mono.Messaging \
+ System.Messaging \
+- Mono.Messaging.RabbitMQ \
+ System.ServiceProcess \
+ System.Drawing.Design \
+ System.Design \
diff --git a/debian/patches/disable_building_convert.exe.dpatch b/debian/patches/disable_building_convert.exe.dpatch
new file mode 100644
index 0000000..1abe908
--- /dev/null
+++ b/debian/patches/disable_building_convert.exe.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## disable_building_convert.exe.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-2.4+dfsg~/Makefile.am mono-2.4+dfsg/Makefile.am
+--- mono-2.4+dfsg~/Makefile.am 2009-02-14 00:34:54.000000000 +0100
++++ mono-2.4+dfsg/Makefile.am 2009-04-11 04:18:32.000000000 +0200
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = foreign
+ ACLOCAL_AMFLAGS = -I .
+
+-SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc docs
++SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc
+
+ # Keep in sync with SUBDIRS
+ ## 'tools' is not normally built
+diff -urNad mono-2.4+dfsg~/docs/Makefile.am mono-2.4+dfsg/docs/Makefile.am
+--- mono-2.4+dfsg~/docs/Makefile.am 2009-02-14 00:32:42.000000000 +0100
++++ mono-2.4+dfsg/docs/Makefile.am 2009-04-11 04:15:52.000000000 +0200
+@@ -97,14 +97,10 @@
+ mono-file-formats.tree: docs.make Makefile.am $(srcdir)/deploy/.stamp
+ cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
+
+-$(srcdir)/deploy/.stamp: convert.exe Makefile.am
++$(srcdir)/deploy/.stamp: Makefile.am
+ $(mkdir_p) $(srcdir)/html
+ runtimedir=`cd ../runtime && pwd`; export runtimedir; \
+ cd $(srcdir) && MONO_PATH=$(mcs_topdir_from_srcdir)/class/lib/net_2_0 perl ./exdoc -h . ../mono/*/*.c
+ touch $@
+
+ extract: $(srcdir)/deploy/.stamp
+-
+-convert.exe: convert.cs AgilityPack.dll
+- cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
+-
diff --git a/debian/patches/fix-mono-nunit.pc.in.dpatch b/debian/patches/fix-mono-nunit.pc.in.dpatch
index 7af9f07..47e4d96 100755
--- a/debian/patches/fix-mono-nunit.pc.in.dpatch
+++ b/debian/patches/fix-mono-nunit.pc.in.dpatch
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad mono-1.9.1+dfsg~/scripts/mono-nunit.pc.in mono-1.9.1+dfsg/scripts/mono-nunit.pc.in
---- mono-1.9.1+dfsg~/scripts/mono-nunit.pc.in 2007-11-08 23:07:03.000000000 +0100
-+++ mono-1.9.1+dfsg/scripts/mono-nunit.pc.in 2008-08-05 22:31:51.000000000 +0200
+diff -urNad mono-2.4+dfsg~/data/mono-nunit.pc.in mono-2.4+dfsg/data/mono-nunit.pc.in
+--- mono-2.4+dfsg~/data/mono-nunit.pc.in 2009-02-14 00:34:32.000000000 +0100
++++ mono-2.4+dfsg/data/mono-nunit.pc.in 2009-04-11 02:28:21.000000000 +0200
@@ -1,4 +1,4 @@
-prefix=${pcfiledir}/../..
+prefix=@prefix@
diff --git a/debian/patches/fix_NetworkInterface_endless_loop.dpatch b/debian/patches/fix_NetworkInterface_endless_loop.dpatch
new file mode 100644
index 0000000..fb56cb6
--- /dev/null
+++ b/debian/patches/fix_NetworkInterface_endless_loop.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_NetworkInterface_endless_loop.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-2.4+dfsg~/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs mono-2.4+dfsg/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
+--- mono-2.4+dfsg~/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs 2009-04-11 02:30:06.000000000 +0200
++++ mono-2.4+dfsg/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs 2009-04-11 02:37:01.000000000 +0200
+@@ -183,6 +183,7 @@
+ if (((int)sockaddrll.sll_halen) > sockaddrll.sll_addr.Length){
+ Console.Error.WriteLine ("Got a bad hardware address length for an AF_PACKET {0} {1}",
+ sockaddrll.sll_halen, sockaddrll.sll_addr.Length);
++ next = addr.ifa_next;
+ continue;
+ }
+
diff --git a/debian/patches/fix_NetworkInterface_exception_r120282.dpatch b/debian/patches/fix_NetworkInterface_exception_r120282.dpatch
deleted file mode 100755
index ca0ea64..0000000
--- a/debian/patches/fix_NetworkInterface_exception_r120282.dpatch
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_NetworkInterface_exception_r120282.dpatch by Jo Shields <directhex at apebox.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Upstream patch to prevent System.Net.NetworkInformation.NetworkInterface from
-## DP: causing an exception on "funny" input data
-
- at DPATCH@
-Index: mono-2.0.1/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
-===================================================================
---- mono-2.0.1/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs (revision 120281)
-+++ mono-2.0.1/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs (revision 120282)
-@@ -180,8 +180,11 @@
- address = new IPAddress (sockaddr.sin_addr);
- } else if (sockaddr.sin_family == AF_PACKET) {
- sockaddr_ll sockaddrll = (sockaddr_ll) Marshal.PtrToStructure (addr.ifa_addr, typeof (sockaddr_ll));
-- if (((int)sockaddrll.sll_halen) > sockaddrll.sll_addr.Length)
-- throw new SystemException("Bad hardware address length");
-+ if (((int)sockaddrll.sll_halen) > sockaddrll.sll_addr.Length){
-+ Console.Error.WriteLine ("Got a bad hardware address length for an AF_PACKET {0} {1}",
-+ sockaddrll.sll_halen, sockaddrll.sll_addr.Length);
-+ continue;
-+ }
-
- macAddress = new byte [(int) sockaddrll.sll_halen];
- Array.Copy (sockaddrll.sll_addr, 0, macAddress, 0, macAddress.Length);
diff --git a/debian/patches/fix_TcpClient_IPv6_r122598.dpatch b/debian/patches/fix_TcpClient_IPv6_r122598.dpatch
deleted file mode 100755
index 324ffb1..0000000
--- a/debian/patches/fix_TcpClient_IPv6_r122598.dpatch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_TcpClient_IPv6_r122598.dpatch by David Paleino <d.paleino at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch backported from Mono trunk/ r122598
-## DP: Fixes IPv6 in TcpClient()
-
- at DPATCH@
-diff -urNad mono-2.0.1~/mcs/class/System/System.Net.Sockets/TcpClient.cs mono-2.0.1/mcs/class/System/System.Net.Sockets/TcpClient.cs
---- mono-2.0.1~/mcs/class/System/System.Net.Sockets/TcpClient.cs 2008-09-02 17:45:39.000000000 +0200
-+++ mono-2.0.1/mcs/class/System/System.Net.Sockets/TcpClient.cs 2009-01-07 09:17:49.000000000 +0100
-@@ -84,7 +84,10 @@
- }
-
- Init (family);
-- client.Bind (new IPEndPoint (IPAddress.Any, 0));
-+ IPAddress any = IPAddress.Any;
-+ if (family == AddressFamily.InterNetworkV6)
-+ any = IPAddress.IPv6Any;
-+ client.Bind (new IPEndPoint (any, 0));
- }
- #endif
-
diff --git a/debian/patches/fix_wsdl2_duplicate_keys_r117243.dpatch b/debian/patches/fix_wsdl2_duplicate_keys_r117243.dpatch
deleted file mode 100755
index f1794a6..0000000
--- a/debian/patches/fix_wsdl2_duplicate_keys_r117243.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_wsdl2_duplicate_keys_r117243.dpatch by Jo Shields <directhex at apebox.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix glitch in CLI 2.0 version of System.Web.Services which can
-## DP: cause wsdl files to be badly processed, due to key duplication
-
- at DPATCH@
-Index: mono-2.0.1/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs
-===================================================================
---- mono-2.0.1/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs (revision 117242)
-+++ mono-2.0.1/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs (revision 117243)
-@@ -177,7 +177,7 @@
- foreach (OperationMessage om in op.Messages) {
- Message msg = ctx.Services.GetMessage (om.Message);
- foreach (MessagePart part in msg.Parts)
-- parts.Add (part,part);
-+ parts [part] = part; // do not use Add() - there could be the same MessagePart instance.
- }
- }
-
diff --git a/debian/patches/kfreebsd_support.dpatch b/debian/patches/kfreebsd_support.dpatch
index d151b32..4a41b6a 100755
--- a/debian/patches/kfreebsd_support.dpatch
+++ b/debian/patches/kfreebsd_support.dpatch
@@ -5,10 +5,10 @@
## DP: kfreebsd support - mainly backport of gc 6.8
@DPATCH@
-diff -urNad mono-1.2.6~/configure.in mono-1.2.6/configure.in
---- mono-1.2.6~/configure.in 2007-12-16 15:41:43.000000000 +0100
-+++ mono-1.2.6/configure.in 2007-12-16 15:42:43.000000000 +0100
-@@ -93,6 +93,16 @@
+diff -urNad mono-2.4+dfsg~/configure.in mono-2.4+dfsg/configure.in
+--- mono-2.4+dfsg~/configure.in 2009-04-11 03:00:41.000000000 +0200
++++ mono-2.4+dfsg/configure.in 2009-04-11 03:02:23.000000000 +0200
+@@ -98,6 +98,16 @@
libgc_threads=pthreads
with_sigaltstack=no
;;
@@ -22,10 +22,10 @@ diff -urNad mono-1.2.6~/configure.in mono-1.2.6/configure.in
+ need_link_unlink=yes
+ with_sigaltstack=no
+ ;;
- # these flags will work for all versions of -STABLE
- #
- *-*-*freebsd4*)
-@@ -1855,6 +1865,11 @@
+ *-*-*freebsd*)
+ platform_win32=no
+ if test "x$PTHREAD_CFLAGS" = "x"; then
+@@ -2011,6 +2021,11 @@
LIBC="libc.so.12"
INTL="libintl.so.0"
;;
@@ -37,30 +37,30 @@ diff -urNad mono-1.2.6~/configure.in mono-1.2.6/configure.in
*-*-*freebsd*)
LIBC="libc.so"
INTL="libintl.so"
-diff -urNad mono-1.2.6~/libgc/configure.in mono-1.2.6/libgc/configure.in
---- mono-1.2.6~/libgc/configure.in 2007-12-16 15:41:43.000000000 +0100
-+++ mono-1.2.6/libgc/configure.in 2007-12-16 15:42:43.000000000 +0100
-@@ -103,6 +103,17 @@
+diff -urNad mono-2.4+dfsg~/libgc/configure.in mono-2.4+dfsg/libgc/configure.in
+--- mono-2.4+dfsg~/libgc/configure.in 2009-04-11 03:00:20.000000000 +0200
++++ mono-2.4+dfsg/libgc/configure.in 2009-04-11 03:00:52.000000000 +0200
+@@ -112,6 +112,17 @@
AC_DEFINE(THREAD_LOCAL_ALLOC)
THREADDLLIBS="-lpthread -lrt"
;;
-+ *-*-kfreebsd*-gnu)
-+ AC_DEFINE(GC_FREEBSD_THREADS)
-+ INCLUDES="$INCLUDES -pthread"
-+ THREADDLLIBS=-pthread
-+ AC_DEFINE(_REENTRANT)
-+ if test "${enable_parallel_mark}" = yes; then
-+ AC_DEFINE(PARALLEL_MARK)
-+ fi
-+ AC_DEFINE(THREAD_LOCAL_ALLOC)
-+ AC_DEFINE(USE_COMPILER_TLS)
-+ ;;
- *-*-freebsd4*)
- AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
++ *-*-kfreebsd*-gnu)
++ AC_DEFINE(GC_FREEBSD_THREADS)
++ INCLUDES="$INCLUDES -pthread"
++ THREADDLLIBS=-pthread
++ AC_DEFINE(_REENTRANT)
++ if test "${enable_parallel_mark}" = yes; then
++ AC_DEFINE(PARALLEL_MARK)
++ fi
++ AC_DEFINE(THREAD_LOCAL_ALLOC)
++ AC_DEFINE(USE_COMPILER_TLS)
++ ;;
+ *-*-freebsd*)
AC_DEFINE(GC_FREEBSD_THREADS)
-diff -urNad mono-1.2.6~/libgc/dyn_load.c mono-1.2.6/libgc/dyn_load.c
---- mono-1.2.6~/libgc/dyn_load.c 2007-12-16 15:41:43.000000000 +0100
-+++ mono-1.2.6/libgc/dyn_load.c 2007-12-16 15:42:43.000000000 +0100
+ if test "x$PTHREAD_CFLAGS" != "x"; then
+diff -urNad mono-2.4+dfsg~/libgc/dyn_load.c mono-2.4+dfsg/libgc/dyn_load.c
+--- mono-2.4+dfsg~/libgc/dyn_load.c 2009-04-11 03:00:20.000000000 +0200
++++ mono-2.4+dfsg/libgc/dyn_load.c 2009-04-11 03:00:52.000000000 +0200
@@ -26,7 +26,7 @@
* None of this is safe with dlclose and incremental collection.
* But then not much of anything is safe in the presence of dlclose.
@@ -79,10 +79,10 @@ diff -urNad mono-1.2.6~/libgc/dyn_load.c mono-1.2.6/libgc/dyn_load.c
&& (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-diff -urNad mono-1.2.6~/libgc/include/gc.h mono-1.2.6/libgc/include/gc.h
---- mono-1.2.6~/libgc/include/gc.h 2007-12-16 15:41:43.000000000 +0100
-+++ mono-1.2.6/libgc/include/gc.h 2007-12-16 15:42:43.000000000 +0100
-@@ -484,7 +484,7 @@
+diff -urNad mono-2.4+dfsg~/libgc/include/gc.h mono-2.4+dfsg/libgc/include/gc.h
+--- mono-2.4+dfsg~/libgc/include/gc.h 2009-04-11 03:00:20.000000000 +0200
++++ mono-2.4+dfsg/libgc/include/gc.h 2009-04-11 03:00:52.000000000 +0200
+@@ -488,7 +488,7 @@
# define GC_RETURN_ADDR (GC_word)__return_address
#endif
@@ -91,9 +91,9 @@ diff -urNad mono-1.2.6~/libgc/include/gc.h mono-1.2.6/libgc/include/gc.h
# include <features.h>
# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
&& !defined(__ia64__)
-diff -urNad mono-1.2.6~/libgc/include/private/gcconfig.h mono-1.2.6/libgc/include/private/gcconfig.h
---- mono-1.2.6~/libgc/include/private/gcconfig.h 2007-12-16 15:41:43.000000000 +0100
-+++ mono-1.2.6/libgc/include/private/gcconfig.h 2007-12-16 15:42:43.000000000 +0100
+diff -urNad mono-2.4+dfsg~/libgc/include/private/gcconfig.h mono-2.4+dfsg/libgc/include/private/gcconfig.h
+--- mono-2.4+dfsg~/libgc/include/private/gcconfig.h 2009-04-11 03:00:20.000000000 +0200
++++ mono-2.4+dfsg/libgc/include/private/gcconfig.h 2009-04-11 03:00:52.000000000 +0200
@@ -55,7 +55,7 @@
# endif
@@ -103,7 +103,7 @@ diff -urNad mono-1.2.6~/libgc/include/private/gcconfig.h mono-1.2.6/libgc/includ
# define FREEBSD
# endif
-@@ -1279,8 +1279,15 @@
+@@ -1291,8 +1291,15 @@
# ifndef GC_FREEBSD_THREADS
# define MPROTECT_VDB
# endif
@@ -121,7 +121,7 @@ diff -urNad mono-1.2.6~/libgc/include/private/gcconfig.h mono-1.2.6/libgc/includ
# define FREEBSD_STACKBOTTOM
# ifdef __ELF__
# define DYNAMIC_LOADING
-@@ -2009,6 +2016,28 @@
+@@ -2032,6 +2039,28 @@
extern char * GC_FreeBSDGetDataStart();
# define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext)
# endif
@@ -150,7 +150,7 @@ diff -urNad mono-1.2.6~/libgc/include/private/gcconfig.h mono-1.2.6/libgc/includ
# ifdef NETBSD
# define OS_TYPE "NETBSD"
# ifdef __ELF__
-@@ -2080,7 +2109,7 @@
+@@ -2103,7 +2132,7 @@
# define SUNOS5SIGS
# endif
@@ -159,7 +159,7 @@ diff -urNad mono-1.2.6~/libgc/include/private/gcconfig.h mono-1.2.6/libgc/includ
# define SUNOS5SIGS
# endif
-@@ -2143,7 +2172,7 @@
+@@ -2166,7 +2195,7 @@
# define CACHE_LINE_SIZE 32 /* Wild guess */
# endif
@@ -168,7 +168,7 @@ diff -urNad mono-1.2.6~/libgc/include/private/gcconfig.h mono-1.2.6/libgc/includ
# define REGISTER_LIBRARIES_EARLY
/* We sometimes use dl_iterate_phdr, which may acquire an internal */
/* lock. This isn't safe after the world has stopped. So we must */
-@@ -2224,7 +2253,7 @@
+@@ -2247,7 +2276,7 @@
#if defined(SPARC)
# define CAN_SAVE_CALL_ARGS
#endif
@@ -177,10 +177,10 @@ diff -urNad mono-1.2.6~/libgc/include/private/gcconfig.h mono-1.2.6/libgc/includ
/* SAVE_CALL_CHAIN is supported if the code is compiled to save */
/* frame pointers by default, i.e. no -fomit-frame-pointer flag. */
# define CAN_SAVE_CALL_ARGS
-diff -urNad mono-1.2.6~/mono/mini/exceptions-amd64.c mono-1.2.6/mono/mini/exceptions-amd64.c
---- mono-1.2.6~/mono/mini/exceptions-amd64.c 2007-12-16 15:41:43.000000000 +0100
-+++ mono-1.2.6/mono/mini/exceptions-amd64.c 2007-12-16 15:42:43.000000000 +0100
-@@ -682,7 +682,7 @@
+diff -urNad mono-2.4+dfsg~/mono/mini/exceptions-amd64.c mono-2.4+dfsg/mono/mini/exceptions-amd64.c
+--- mono-2.4+dfsg~/mono/mini/exceptions-amd64.c 2009-04-11 03:00:20.000000000 +0200
++++ mono-2.4+dfsg/mono/mini/exceptions-amd64.c 2009-04-11 03:00:52.000000000 +0200
+@@ -740,7 +740,7 @@
static inline guint64*
gregs_from_ucontext (ucontext_t *ctx)
{
@@ -189,15 +189,16 @@ diff -urNad mono-1.2.6~/mono/mini/exceptions-amd64.c mono-1.2.6/mono/mini/except
guint64 *gregs = (guint64 *) &ctx->uc_mcontext;
#else
guint64 *gregs = (guint64 *) &ctx->uc_mcontext.gregs;
-diff -urNad mono-1.2.6~/mono/mini/mini-amd64.h mono-1.2.6/mono/mini/mini-amd64.h
---- mono-1.2.6~/mono/mini/mini-amd64.h 2007-12-16 15:41:43.000000000 +0100
-+++ mono-1.2.6/mono/mini/mini-amd64.h 2007-12-16 15:42:43.000000000 +0100
-@@ -220,7 +220,7 @@
+diff -urNad mono-2.4+dfsg~/mono/mini/mini-amd64.h mono-2.4+dfsg/mono/mini/mini-amd64.h
+--- mono-2.4+dfsg~/mono/mini/mini-amd64.h 2009-04-11 03:00:20.000000000 +0200
++++ mono-2.4+dfsg/mono/mini/mini-amd64.h 2009-04-11 03:00:52.000000000 +0200
+@@ -245,8 +245,7 @@
- #endif /* PLATFORM_WIN32 */
-
--#ifdef __FreeBSD__
-+#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #define MONO_ARCH_NOMAP32BIT
+-#elif defined (__FreeBSD__)
+-
++#elif defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
#define REG_RAX 7
#define REG_RCX 4
+ #define REG_RDX 3
diff --git a/debian/rules b/debian/rules
index 617a5ef..f573859 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,14 @@
#export DH_VERBOSE=1
export MONO_SHARED_DIR=$(CURDIR)
-VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\ -f2)
-UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,')
+MAKEFILE = $(firstword $(MAKEFILE_LIST))
+DEBIAN_DIR = $(dir $(MAKEFILE))
+SOURCE_DIR = $(DEBIAN_DIR)/..
+
+VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Vers | cut -d\ -f2)
+UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,')
NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION))
+DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
RUN_MONO = LD_LIBRARY_PATH=debian/tmp/usr/lib MONO_PATH=debian/tmp/usr/lib/mono/1.0:debian/tmp/usr/lib/mono/2.0 debian/tmp/usr/bin/mono
DH_INTERNAL_MONO_PARAM = --internal-mono
@@ -58,8 +63,6 @@ CONFIGURE = CFLAGS="$(CFLAGS)" \
--infodir=\$${prefix}/share/info --sysconfdir=/etc \
--with-jit=yes --with-ikvm-native=no --with-preview=yes \
--with-libgdiplus=installed --with-x=yes \
- --with-moonlight=yes \
- --with-oprofile=yes \
--enable-quiet-build=no
# Mono's build system doesn't like -j > 1
@@ -76,17 +79,25 @@ include /usr/share/dpatch/dpatch.make
cli-wrapper: debian/cli-wrapper.c
$(CC) -o cli-wrapper debian/cli-wrapper.c `pkg-config glib-2.0 --cflags --libs`
-configure-arch: patch configure-arch-stamp
-configure-arch-stamp:
+autoreconf: patch autoreconf-stamp
+autoreconf-stamp:
+ autoreconf -f -i -s
+ touch $@
+
+configure-arch: configure-arch-stamp
+configure-arch-stamp: autoreconf
dh_testdir
$(CONFIGURE) --disable-mcs-build
- touch configure-arch-stamp
+ touch $@
configure-indep: patch configure-indep-stamp
-configure-indep-stamp:
+configure-indep-stamp: autoreconf
dh_testdir
$(CONFIGURE)
- touch configure-indep-stamp
+ touch $@
+
+build: build-arch
+build-all: build-arch build-indep
build-arch: configure-arch build-arch-stamp
build-arch-stamp: cli-wrapper
@@ -97,7 +108,7 @@ build-arch-stamp: cli-wrapper
cd debian/detector && \
$(MAKE)
#debian/mono-aot-bootstrap
- touch build-arch-stamp
+ touch $@
build-indep: configure-indep build-indep-stamp
build-indep-stamp:
@@ -108,15 +119,9 @@ build-indep-stamp:
debian/dh_clistrip \
debian/dh_clifixperms \
debian/dh_monoaot
- touch build-indep-stamp
-
-build: build-arch
-
-build-all: build-arch build-indep
+ touch $@
clean: clean-patched unpatch
- #rm -f configure
-
clean-patched:
dh_testdir
dh_testroot
@@ -136,9 +141,15 @@ clean-patched:
mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resources \
mcs/class/System.Web/resources/TranslationResources.resources
+ # clean stuff handled by autoreconf
+ rm -rf configure config.sub config.guess ltmain.sh aclocal.m4 autom4te.cache/
+ find . -name "Makefile.in" -delete
+
+ rm -f autoreconf-stamp
rm -f configure-*-stamp
rm -f build-*-stamp
rm -f install-*-stamp
+
dh_clean
install: install-arch install-indep
@@ -246,7 +257,6 @@ binary-indep: build-arch install-arch build-indep install-indep
dh_testdir
dh_testroot
-
# that exclude list are programs for arch-dep packages
dh_install -i -Xbin/monodis -Xbin/monograph -Xbin/mono-find-provides -Xbin/mono-find-requires -Xbin/pedump -Xbin/jay
@@ -355,14 +365,35 @@ binary-arch: build-arch install-arch
dh_md5sums -s
dh_builddeb -s
+get-orig-source: TARBALL_DIR = $(DEB_SOURCE_NAME)-$(UPVERSION)
get-orig-source:
- [ -d ../tarballs ] || mkdir ../tarballs
uscan \
- --force-download \
+ --package $(DEB_SOURCE_NAME) \
+ --watchfile $(DEBIAN_DIR)/watch \
+ --upstream-version $(UPVERSION) \
--download-version $(UPVERSION) \
- --repack \
+ --destdir . \
+ --force-download \
--rename \
- --destdir ../tarballs
-
-.PHONY: clean build binary-indep binary-arch install binary patch unpatch
+ --repack
+ if [ -d $(TARBALL_DIR) ]; then \
+ echo "$(TARBALL_DIR) is in the way, bailing out!"; \
+ exit 1; \
+ fi
+ if [ -d $(TARBALL_DIR)+dfsg ]; then \
+ echo "$(TARBALL_DIR)+dfsg is in the way, bailing out!"; \
+ exit 1; \
+ fi
+ tar -xzf $(DEB_SOURCE_NAME)_$(UPVERSION).orig.tar.gz
+ rm $(DEB_SOURCE_NAME)_$(UPVERSION).orig.tar.gz
+ rm -rf $(TARBALL_DIR)/mcs/class/RabbitMQ.Client/docs/specs/
+ find $(TARBALL_DIR) -name "*.dll" -not -path "$(TARBALL_DIR)/mcs/class/lib/monolite/*"
+ find $(TARBALL_DIR) -name "*.dll" -not -path "$(TARBALL_DIR)/mcs/class/lib/monolite/*" -delete
+ find $(TARBALL_DIR) -name "*.exe" -not -path "$(TARBALL_DIR)/mcs/class/lib/monolite/*"
+ find $(TARBALL_DIR) -name "*.exe" -not -path "$(TARBALL_DIR)/mcs/class/lib/monolite/*" -delete
+ mv $(TARBALL_DIR) $(TARBALL_DIR)+dfsg
+ tar -czf $(DEB_SOURCE_NAME)_$(UPVERSION)+dfsg.orig.tar.gz $(TARBALL_DIR)+dfsg
+ rm -r $(TARBALL_DIR)+dfsg
+
+.PHONY: autoreconf clean build binary-indep binary-arch install binary patch unpatch
.NOTPARALLEL:
--
mono
More information about the Pkg-mono-svn-commits
mailing list