[Pkg-mono-svn-commits] rev 3521 - in mono/trunk/debian: . patches
Mirco Bauer
meebey at alioth.debian.org
Sun Dec 16 22:42:55 UTC 2007
Author: meebey
Date: 2007-12-16 22:42:55 +0000 (Sun, 16 Dec 2007)
New Revision: 3521
Added:
mono/trunk/debian/libmono-corlib2.1-cil.install
mono/trunk/debian/libmono-db2-1.0-cil.install
mono/trunk/debian/libmono-mozilla0.1-cil.install
mono/trunk/debian/libmono-system2.1-cil.install
mono/trunk/debian/mono-1.0-service.install
mono/trunk/debian/mono-1.0-tools-dev.install
mono/trunk/debian/mono-1.0-tools-dev.manpages
mono/trunk/debian/mono-2.0-service.install
mono/trunk/debian/mono-2.0-tools-dev.install
mono/trunk/debian/mono-2.0-tools-dev.manpages
mono/trunk/debian/mono-smcs.install
mono/trunk/debian/mono-xbuild.manpages
mono/trunk/debian/patches/fix_Mono.Cecil_linkage.dpatch
mono/trunk/debian/update-shlibs.local.sh
Removed:
mono/trunk/debian/patches/ppc_fix_mono_class_proxy_vtable_r84948.dpatch
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/control
mono/trunk/debian/libmono1.0-cil.install
mono/trunk/debian/mono-gmcs.install
mono/trunk/debian/mono-gmcs.manpages
mono/trunk/debian/mono-mcs.install
mono/trunk/debian/mono-mcs.manpages
mono/trunk/debian/patches/00list
mono/trunk/debian/patches/fix-mono-cairo.pc.in.dpatch
mono/trunk/debian/patches/fix-mono.pc.in.dpatch
mono/trunk/debian/patches/kfreebsd_support.dpatch
mono/trunk/debian/rules
mono/trunk/debian/shlibs.local
Log:
- big mono 1.2.6 update, but not finished yet (work in progress)
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2007-12-14 18:45:54 UTC (rev 3520)
+++ mono/trunk/debian/changelog 2007-12-16 22:42:55 UTC (rev 3521)
@@ -1,8 +1,37 @@
-mono (1.2.5.1-3) UNRELEASED; urgency=low
-
+mono (1.2.6-1~pre1) UNRELEASED; urgency=low
- -- Sebastian Dröge <slomo at debian.org> Sun, 11 Nov 2007 11:54:28 +0100
+ * New upstream release.
+ + Invoking GetFields on emitted type doesn't crash anymore, as seen with
+ nemerle. (Closes: #452585)
+ * debian/rules:
+ + Updated MONO_API to 1.2.6
+ + Enabled moonlight in configure call.
+ * debian/patches/00list:
+ + Disabled armel_fix_configure_fpu_check.dpatch
+ (FPU check is fixed upstream)
+ * debian/patches/kfreebsd_support.dpatch:
+ + Updated (and re-autoconfed)
+ * debian/patches/fix-mono.pc.in.dpatch:
+ + Updated
+ * debian/patches/ppc_fix_mono_class_proxy_vtable_r84948.dpatch:
+ + Removed, already applied upstream.
+ * debian/patches/fix_Mono.Cecil_linkage.dpatch:
+ + Link Mono.Cecil(.Mdb) against CLI 1.0 instead of 2.0, patch taken from
+ upstream.
+ * debian/libmono1.0-cil.install:
+ + Added Mono.Cecil.dll and Mono.Cecil.Mdb.dll.
+ * debian/control:
+ + Created mono-smcs, mono-xbuild, mono-1.0-tools-dev, mono-2.0-tools-dev,
+ libmono-mozilla0.1-cil, libmono-corlib2.1-cil, libmono-system2.1-cil and
+ libmono-db2-1.0-cil packages.
+ (monolinker.exe is now shipped, Closes: #443833)
+ * debian/update-shlibs.local.sh:
+ + Wrote this script to ease updating the debian/shlibs.local file.
+ * debian/shlibs.local:
+ + Updated
+ -- Mirco Bauer <meebey at debian.org> Sun, 16 Dec 2007 15:44:33 +0100
+
mono (1.2.5.1-2) unstable; urgency=high
* Mirco 'meebey' Bauer:
Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control 2007-12-14 18:45:54 UTC (rev 3520)
+++ mono/trunk/debian/control 2007-12-16 22:42:55 UTC (rev 3521)
@@ -198,6 +198,19 @@
.
This package contains the Mono C5 library.
+Package: libmono-mozilla0.1-cil
+Section: libs
+Architecture: all
+Depends: ${cli:Depends}
+Description: Mono Mozilla library
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono Mozilla library.
+
Package: libmono-corlib1.0-cil
Section: libs
Architecture: all
@@ -211,7 +224,7 @@
bytecode (aka assemblies), and a class library.
.
This package contains the Core Library (mscorlib.dll) of Mono which is the
- glue between the Class Library and the JIT.
+ glue between the BCL (Base Class Libraries) and the JIT.
Package: libmono-corlib2.0-cil
Section: libs
@@ -226,8 +239,22 @@
bytecode (aka assemblies), and a class library.
.
This package contains the Core Library (mscorlib.dll) of Mono which is the
- glue between the Class Library and the JIT.
+ glue between the BCL (Base Class Libraries) and the JIT.
+Package: libmono-corlib2.1-cil
+Section: libs
+Architecture: all
+Depends: mono-jit (>= ${mono:upversion}), mono-jit (<< ${mono:next-upversion})
+Description: Mono core library (2.1)
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Core Library (mscorlib.dll) of Mono which is the
+ glue between the BCL (Base Class Libraries) and the JIT.
+
Package: libmono-system1.0-cil
Section: libs
Architecture: all
@@ -258,6 +285,20 @@
.
This package contains the BCL (Base Class Libraries) of Mono.
+Package: libmono-system2.1-cil
+Section: libs
+Architecture: all
+Suggests: ${cli:Suggests}
+Depends: ${cli:Depends}, mono-jit (>= ${mono:upversion}), mono-jit (<< ${mono:next-upversion})
+Description: Mono System libraries (2.1)
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the BCL (Base Class Libraries) of Mono.
+
Package: libmono-system-messaging1.0-cil
Section: libs
Architecture: all
@@ -641,6 +682,19 @@
.
This package contains the Mono FirebirdSql library.
+Package: libmono-db2-1.0-cil
+Section: libs
+Architecture: all
+Depends: ${cli:Depends}
+Description: Mono DB2 library
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono DB2 library.
+
Package: libmono-oracle1.0-cil
Section: libs
Architecture: all
@@ -949,17 +1003,31 @@
runtime, which can produce and execute CIL (Common Intermediate Language)
bytecode (aka assemblies), and a class library.
+Package: mono-mjs
+Section: devel
+Architecture: all
+Depends: ${cli:Depends}
+Replaces: mono-mcs (<< 1.2.5-1)
+Description: Mono JScript compiler
+ This is the Mono JScript compiler, a platform-independent compiler which
+ produces CIL (Common Intermediate Language) binary executables.
+ .
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+
Package: mono-mcs
Section: devel
Architecture: all
Depends: ${cli:Depends}
Recommends: pkg-config
Provides: c-sharp-compiler, resource-file-generator, assembly-linker, strong-name-tool
-Description: Mono C# compiler
+Description: Mono C# compiler for CLI 1.1
This is the Mono C# (C-Sharp) compiler, a platform-independent compiler which
- produces CIL (Common Intermediate Language) binary executables, and the
- most development tools around it like ilasm, wsdl stub generator, assembly
- linker and security tools.
+ produces CIL (Common Intermediate Language) binary executables.
+ This compiler targets the CLI 1.1 runtime version.
.
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -967,33 +1035,58 @@
runtime, which can produce and execute CIL (Common Intermediate Language)
bytecode (aka assemblies), and a class library.
-Package: mono-mjs
+Package: mono-gmcs
Section: devel
Architecture: all
Depends: ${cli:Depends}
-Replaces: mono-mcs (<< 1.2.5-1)
-Description: Mono JScript compiler
- This is the Mono JScript compiler, a platform-independent compiler which
- produces CIL (Common Intermediate Language) binary executables.
+Recommends: pkg-config
+Replaces: mono-mcs (>= 1.1.10), mono-mcs (<= 1.1.13)
+Provides: c-sharp-2.0-compiler, c-sharp-3.0-compiler
+Description: Mono C# 2.0 and C# 3.0 compiler for CLI 2.0
+ This is the Mono C# (C-Sharp) 2.0 and C# 3.0 compiler, a platform-independent
+ compiler which produces CIL (Common Intermediate Language) binary executables.
+ The gmcs compiler supports two different featuresets (C# versions).
.
+ With C# 2.0 (which is the default) it supports:
+ - generics
+ - iterators (yield)
+ - nullable value types
+ - partial types
+ - anonymous methods
+ - static classes
+ - coalesce operator: ??
+ .
+ With C# 3.0 it supports:
+ - Language Integrated Query (LINQ)
+ - object initializers
+ - collection initializers
+ - anonymous types
+ - local variable type inference
+ - implicitly-typed arrays
+ - lambda expressions
+ - automatic properties
+ - extension methods
+ - partial methods
+ .
+ This compiler targets the CLI 2.0 runtime version.
+ .
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
Mono provides a complete CLR (Common Language Runtime) including compiler and
runtime, which can produce and execute CIL (Common Intermediate Language)
bytecode (aka assemblies), and a class library.
-Package: mono-gmcs
+Package: mono-smcs
Section: devel
Architecture: all
Depends: ${cli:Depends}
Recommends: pkg-config
-Replaces: mono-mcs (>= 1.1.10), mono-mcs (<= 1.1.13)
-Provides: c-sharp-2.0-compiler
-Description: Mono C# 2.0 compiler
- This is the Mono C# (C-Sharp) 2.0 compiler, a platform-independent compiler
- which produces CIL (Common Intermediate Language) binary executables.
- The gmcs compiler supports the C# 2.0 featureset like generics, anonymous
- methods, iterators, partial types and nullable types.
+Description: Mono C# 3.0 compiler for CLI 2.1 (Moonlight / Silverlight)
+ This is a special C# (C-Sharp) 3.0 compiler for Moonlight (Silverlight)
+ applications, a platform-independent compiler which
+ produces CIL (Common Intermediate Language) binary executables.
+ This compiler targets the CLI 2.1 runtime version, also known as Moonlight or
+ Silverlight.
.
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -1001,6 +1094,85 @@
runtime, which can produce and execute CIL (Common Intermediate Language)
bytecode (aka assemblies), and a class library.
+Package: mono-1.0-tools-dev
+Section: devel
+Architecture: all
+Depends: ${cli:Depends}
+Replaces: mono-mcs (<< 1.2.6-1)
+Description: Mono development tools for CLI 1.0
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains various development tools for Mono targeting CLI 1.0.
+
+Package: mono-2.0-tools-dev
+Section: devel
+Architecture: all
+Depends: ${cli:Depends}
+Replaces: mono-gmcs (<< 1.2.6-1)
+Description: Mono development tools for CLI 2.0
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains various development tools for Mono targeting CLI 2.0.
+
+Package: mono-1.0-service
+Section: devel
+Architecture: all
+Depends: ${cli:Depends}
+Replaces: mono-mcs (<< 1.2.6-1)
+Description: Mono service manager for CLI 1.0
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the mono-service manager, used to start and stop
+ services.
+
+Package: mono-2.0-service
+Section: devel
+Architecture: all
+Depends: ${cli:Depends}
+Replaces: mono-gmcs (<< 1.2.6-1)
+Description: Mono server manager for CLI 2.0
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the mono-service2 manager, used to start and stop
+ services.
+
+Package: mono-xbuild
+Section: devel
+Architecture: all
+Depends: ${cli:Depends}
+Replaces: mono-gmcs (<< 1.2.6-1)
+Description: Mono xbuild
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ xbuild is Mono's implementation of msbuild and allows projects that have a
+ msbuild file to be compiled natively on Linux.
+ .
+ Microsoft Build (msbuild) is a build system developed by Microsoft similar in
+ spirit to Nant (in that it uses XML files for describing the build process)
+ and in the same spirit as make.
+ .
+ http://www.mono-project.com/Microsoft.Build
+
Package: mono-gac
Section: devel
Architecture: all
Added: mono/trunk/debian/libmono-corlib2.1-cil.install
===================================================================
--- mono/trunk/debian/libmono-corlib2.1-cil.install (rev 0)
+++ mono/trunk/debian/libmono-corlib2.1-cil.install 2007-12-16 22:42:55 UTC (rev 3521)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/mono/2.1/mscorlib.dll*
Added: mono/trunk/debian/libmono-db2-1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-db2-1.0-cil.install (rev 0)
+++ mono/trunk/debian/libmono-db2-1.0-cil.install 2007-12-16 22:42:55 UTC (rev 3521)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/IBM.Data.DB2/1.0.*/
+debian/tmp/usr/lib/mono/1.0/IBM.Data.DB2.dll
Added: mono/trunk/debian/libmono-mozilla0.1-cil.install
===================================================================
--- mono/trunk/debian/libmono-mozilla0.1-cil.install (rev 0)
+++ mono/trunk/debian/libmono-mozilla0.1-cil.install 2007-12-16 22:42:55 UTC (rev 3521)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Mono.Mozilla/
+debian/tmp/usr/lib/mono/2.0/Mono.Mozilla.dll
Added: mono/trunk/debian/libmono-system2.1-cil.install
===================================================================
--- mono/trunk/debian/libmono-system2.1-cil.install (rev 0)
+++ mono/trunk/debian/libmono-system2.1-cil.install 2007-12-16 22:42:55 UTC (rev 3521)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/System*/2.1.*/
+debian/tmp/usr/lib/mono/2.1/System*.dll
Modified: mono/trunk/debian/libmono1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono1.0-cil.install 2007-12-14 18:45:54 UTC (rev 3520)
+++ mono/trunk/debian/libmono1.0-cil.install 2007-12-16 22:42:55 UTC (rev 3521)
@@ -1,4 +1,6 @@
debian/tmp/usr/lib/mono/gac/Mono.*/1.0.*/
+debian/tmp/usr/lib/mono/gac/Mono.Cecil/
+debian/tmp/usr/lib/mono/gac/Mono.Cecil.Mdb/
debian/tmp/usr/lib/mono/gac/OpenSystem.C/1.0.*
debian/tmp/usr/lib/mono/gac/mono-service/1.0.*/
debian/tmp/usr/lib/mono/1.0/Mono.*.dll
Added: mono/trunk/debian/mono-1.0-service.install
===================================================================
--- mono/trunk/debian/mono-1.0-service.install (rev 0)
+++ mono/trunk/debian/mono-1.0-service.install 2007-12-16 22:42:55 UTC (rev 3521)
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin/mono-service
+debian/tmp/usr/lib/mono/1.0/mono-service.exe*
Added: mono/trunk/debian/mono-1.0-tools-dev.install
===================================================================
--- mono/trunk/debian/mono-1.0-tools-dev.install (rev 0)
+++ mono/trunk/debian/mono-1.0-tools-dev.install 2007-12-16 22:42:55 UTC (rev 3521)
@@ -0,0 +1,34 @@
+debian/tmp/usr/bin/al
+debian/tmp/usr/bin/caspol
+debian/tmp/usr/bin/cert2spc
+debian/tmp/usr/bin/certmgr
+debian/tmp/usr/bin/chktrust
+debian/tmp/usr/bin/cilc
+debian/tmp/usr/bin/disco
+debian/tmp/usr/bin/dtd2xsd
+debian/tmp/usr/bin/dtd2rng
+debian/tmp/usr/bin/genxs
+debian/tmp/usr/bin/ilasm
+debian/tmp/usr/bin/installvst
+debian/tmp/usr/bin/macpack
+debian/tmp/usr/bin/mkbundle
+debian/tmp/usr/bin/mono-api-diff
+debian/tmp/usr/bin/mono-api-info
+debian/tmp/usr/bin/mono-service
+debian/tmp/usr/bin/mono-shlib-cop
+debian/tmp/usr/bin/mono-xmltool
+debian/tmp/usr/bin/monop
+debian/tmp/usr/bin/monolinker
+debian/tmp/usr/bin/mozroots
+debian/tmp/usr/bin/permview
+debian/tmp/usr/bin/resgen
+debian/tmp/usr/bin/secutil
+debian/tmp/usr/bin/setreg
+debian/tmp/usr/bin/signcode
+debian/tmp/usr/bin/sn
+debian/tmp/usr/bin/soapsuds
+debian/tmp/usr/bin/sqlsharp
+debian/tmp/usr/bin/wsdl
+debian/tmp/usr/bin/xsd
+debian/tmp/usr/lib/mono/1.0/*.exe*
+debian/mono-api-check /usr/bin/
Added: mono/trunk/debian/mono-1.0-tools-dev.manpages
===================================================================
--- mono/trunk/debian/mono-1.0-tools-dev.manpages (rev 0)
+++ mono/trunk/debian/mono-1.0-tools-dev.manpages 2007-12-16 22:42:55 UTC (rev 3521)
@@ -0,0 +1,28 @@
+debian/tmp/usr/share/man/man1/al.1
+debian/man/caspol.1
+debian/tmp/usr/share/man/man1/cert2spc.1
+debian/tmp/usr/share/man/man1/certmgr.1
+debian/tmp/usr/share/man/man1/chktrust.1
+debian/tmp/usr/share/man/man1/cilc.1
+debian/tmp/usr/share/man/man1/disco.1
+debian/tmp/usr/share/man/man1/dtd2xsd.1
+debian/tmp/usr/share/man/man1/genxs.1
+debian/tmp/usr/share/man/man1/ilasm.1
+debian/tmp/usr/share/man/man1/macpack.1
+debian/tmp/usr/share/man/man1/makecert.1
+debian/tmp/usr/share/man/man1/mkbundle.1
+debian/tmp/usr/share/man/man1/mono-service.1
+debian/tmp/usr/share/man/man1/mono-shlib-cop.1
+debian/tmp/usr/share/man/man1/monolinker.1
+debian/tmp/usr/share/man/man1/monop.1
+debian/tmp/usr/share/man/man1/mozroots.1
+debian/tmp/usr/share/man/man1/permview.1
+debian/tmp/usr/share/man/man1/resgen.1
+debian/tmp/usr/share/man/man1/secutil.1
+debian/tmp/usr/share/man/man1/setreg.1
+debian/tmp/usr/share/man/man1/signcode.1
+debian/tmp/usr/share/man/man1/sn.1
+debian/tmp/usr/share/man/man1/soapsuds.1
+debian/tmp/usr/share/man/man1/sqlsharp.1
+debian/tmp/usr/share/man/man1/wsdl.1
+debian/tmp/usr/share/man/man1/xsd.1
Added: mono/trunk/debian/mono-2.0-service.install
===================================================================
--- mono/trunk/debian/mono-2.0-service.install (rev 0)
+++ mono/trunk/debian/mono-2.0-service.install 2007-12-16 22:42:55 UTC (rev 3521)
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin/mono-service2
+debian/tmp/usr/lib/mono/2.0/mono-service.exe*
Added: mono/trunk/debian/mono-2.0-tools-dev.install
===================================================================
--- mono/trunk/debian/mono-2.0-tools-dev.install (rev 0)
+++ mono/trunk/debian/mono-2.0-tools-dev.install 2007-12-16 22:42:55 UTC (rev 3521)
@@ -0,0 +1,10 @@
+debian/tmp/usr/bin/wsdl2
+debian/tmp/usr/bin/monop2
+debian/tmp/usr/bin/ilasm2
+debian/tmp/usr/bin/resgen2
+debian/tmp/usr/bin/mono-api-info2
+debian/tmp/usr/bin/mkbundle2
+debian/tmp/usr/bin/sgen
+debian/tmp/usr/bin/al2
+debian/tmp/usr/bin/httpcfg
+debian/tmp/usr/lib/mono/2.0/*.exe*
Added: mono/trunk/debian/mono-2.0-tools-dev.manpages
===================================================================
--- mono/trunk/debian/mono-2.0-tools-dev.manpages (rev 0)
+++ mono/trunk/debian/mono-2.0-tools-dev.manpages 2007-12-16 22:42:55 UTC (rev 3521)
@@ -0,0 +1,6 @@
+debian/man/wsdl2.1
+debian/man/monop2.1
+debian/man/ilasm2.1
+debian/man/resgen2.1
+debian/man/mono-service2.1
+debian/tmp/usr/share/man/man1/httpcfg.1
Modified: mono/trunk/debian/mono-gmcs.install
===================================================================
--- mono/trunk/debian/mono-gmcs.install 2007-12-14 18:45:54 UTC (rev 3520)
+++ mono/trunk/debian/mono-gmcs.install 2007-12-16 22:42:55 UTC (rev 3521)
@@ -1,20 +1,2 @@
debian/tmp/usr/bin/gmcs
-debian/tmp/usr/bin/wsdl2
-debian/tmp/usr/bin/monop2
-debian/tmp/usr/bin/ilasm2
-debian/tmp/usr/bin/resgen2
-debian/tmp/usr/bin/mono-api-info2
-debian/tmp/usr/bin/mono-service2
-debian/tmp/usr/bin/mkbundle2
-debian/tmp/usr/bin/xbuild
-debian/tmp/usr/bin/sgen
-debian/tmp/usr/bin/al2
-debian/tmp/usr/bin/httpcfg
-debian/tmp/usr/lib/mono/2.0/*.exe*
-debian/tmp/usr/lib/mono/2.0/xbuild.rsp
-debian/tmp/usr/lib/mono/2.0/MSBuild/
-debian/tmp/usr/lib/mono/2.0/Microsoft.Build.xsd
-debian/tmp/usr/lib/mono/2.0/Microsoft.CSharp.targets
-debian/tmp/usr/lib/mono/2.0/Microsoft.Common.tasks
-debian/tmp/usr/lib/mono/2.0/Microsoft.Common.targets
-debian/tmp/usr/lib/mono/2.0/Microsoft.VisualBasic.targets
+debian/tmp/usr/lib/mono/2.0/gmcs.exe*
Modified: mono/trunk/debian/mono-gmcs.manpages
===================================================================
--- mono/trunk/debian/mono-gmcs.manpages 2007-12-14 18:45:54 UTC (rev 3520)
+++ mono/trunk/debian/mono-gmcs.manpages 2007-12-16 22:42:55 UTC (rev 3521)
@@ -1,8 +1 @@
debian/man/gmcs.1
-debian/man/wsdl2.1
-debian/man/monop2.1
-debian/man/ilasm2.1
-debian/man/resgen2.1
-debian/man/mono-service2.1
-debian/man/xbuild.1
-debian/tmp/usr/share/man/man1/httpcfg.1
Modified: mono/trunk/debian/mono-mcs.install
===================================================================
--- mono/trunk/debian/mono-mcs.install 2007-12-14 18:45:54 UTC (rev 3520)
+++ mono/trunk/debian/mono-mcs.install 2007-12-16 22:42:55 UTC (rev 3521)
@@ -1,3 +1,2 @@
-debian/tmp/usr/bin/
-debian/tmp/usr/lib/mono/1.0/*.exe*
-debian/mono-api-check /usr/bin
+debian/tmp/usr/bin/mcs
+debian/tmp/usr/lib/mono/1.0/mcs.exe*
Modified: mono/trunk/debian/mono-mcs.manpages
===================================================================
--- mono/trunk/debian/mono-mcs.manpages 2007-12-14 18:45:54 UTC (rev 3520)
+++ mono/trunk/debian/mono-mcs.manpages 2007-12-16 22:42:55 UTC (rev 3521)
@@ -1,29 +1 @@
-debian/tmp/usr/share/man/man1/al.1
-debian/man/caspol.1
-debian/tmp/usr/share/man/man1/cert2spc.1
-debian/tmp/usr/share/man/man1/certmgr.1
-debian/tmp/usr/share/man/man1/chktrust.1
-debian/tmp/usr/share/man/man1/cilc.1
-debian/tmp/usr/share/man/man1/disco.1
-debian/tmp/usr/share/man/man1/dtd2xsd.1
-debian/tmp/usr/share/man/man1/genxs.1
-debian/tmp/usr/share/man/man1/ilasm.1
-debian/tmp/usr/share/man/man1/macpack.1
-debian/tmp/usr/share/man/man1/makecert.1
debian/tmp/usr/share/man/man1/mcs.1
-debian/tmp/usr/share/man/man1/mkbundle.1
-debian/tmp/usr/share/man/man1/mono-service.1
-debian/tmp/usr/share/man/man1/mono-shlib-cop.1
-debian/tmp/usr/share/man/man1/monolinker.1
-debian/tmp/usr/share/man/man1/monop.1
-debian/tmp/usr/share/man/man1/mozroots.1
-debian/tmp/usr/share/man/man1/permview.1
-debian/tmp/usr/share/man/man1/resgen.1
-debian/tmp/usr/share/man/man1/secutil.1
-debian/tmp/usr/share/man/man1/setreg.1
-debian/tmp/usr/share/man/man1/signcode.1
-debian/tmp/usr/share/man/man1/sn.1
-debian/tmp/usr/share/man/man1/soapsuds.1
-debian/tmp/usr/share/man/man1/sqlsharp.1
-debian/tmp/usr/share/man/man1/wsdl.1
-debian/tmp/usr/share/man/man1/xsd.1
Added: mono/trunk/debian/mono-smcs.install
===================================================================
--- mono/trunk/debian/mono-smcs.install (rev 0)
+++ mono/trunk/debian/mono-smcs.install 2007-12-16 22:42:55 UTC (rev 3521)
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin/smcs
+debian/tmp/usr/lib/mono/2.1/smcs.exe*
Added: mono/trunk/debian/mono-xbuild.manpages
===================================================================
--- mono/trunk/debian/mono-xbuild.manpages (rev 0)
+++ mono/trunk/debian/mono-xbuild.manpages 2007-12-16 22:42:55 UTC (rev 3521)
@@ -0,0 +1 @@
+debian/man/xbuild.1
Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list 2007-12-14 18:45:54 UTC (rev 3520)
+++ mono/trunk/debian/patches/00list 2007-12-16 22:42:55 UTC (rev 3521)
@@ -1,9 +1,9 @@
-armel_fix_configure_fpu_check
+#armel_fix_configure_fpu_check
kfreebsd_support
console-no-utf8-bom
firebird-fbclient
fix-mono.pc.in
fix-mono-cairo.pc.in
g_thread_init
-ppc_fix_mono_class_proxy_vtable_r84948
fix_BigInteger_overflow_CVE-2007-5197
+fix_Mono.Cecil_linkage
Modified: mono/trunk/debian/patches/fix-mono-cairo.pc.in.dpatch
===================================================================
--- mono/trunk/debian/patches/fix-mono-cairo.pc.in.dpatch 2007-12-14 18:45:54 UTC (rev 3520)
+++ mono/trunk/debian/patches/fix-mono-cairo.pc.in.dpatch 2007-12-16 22:42:55 UTC (rev 3521)
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad mono-1.2.4~/mono-cairo.pc.in mono-1.2.4/mono-cairo.pc.in
---- mono-1.2.4~/mono-cairo.pc.in 2007-04-25 20:48:44.000000000 +0200
-+++ mono-1.2.4/mono-cairo.pc.in 2007-05-17 11:14:44.000000000 +0200
+diff -urNad mono-1.2.6~/data/mono-cairo.pc.in mono-1.2.6/data/mono-cairo.pc.in
+--- mono-1.2.6~/data/mono-cairo.pc.in 2007-11-08 23:07:46.000000000 +0100
++++ mono-1.2.6/data/mono-cairo.pc.in 2007-12-16 15:51:57.000000000 +0100
@@ -1,5 +1,5 @@
-prefix=${pcfiledir}/../..
-exec_prefix=${pcfiledir}/../..
Modified: mono/trunk/debian/patches/fix-mono.pc.in.dpatch
===================================================================
--- mono/trunk/debian/patches/fix-mono.pc.in.dpatch 2007-12-14 18:45:54 UTC (rev 3520)
+++ mono/trunk/debian/patches/fix-mono.pc.in.dpatch 2007-12-16 22:42:55 UTC (rev 3521)
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad mono-1.2.4~/mono.pc.in mono-1.2.4/mono.pc.in
---- mono-1.2.4~/mono.pc.in 2007-04-25 20:48:44.000000000 +0200
-+++ mono-1.2.4/mono.pc.in 2007-05-17 11:03:54.000000000 +0200
+diff -urNad mono-1.2.6~/data/mono.pc.in mono-1.2.6/data/mono.pc.in
+--- mono-1.2.6~/data/mono.pc.in 2007-11-08 23:07:46.000000000 +0100
++++ mono-1.2.6/data/mono.pc.in 2007-12-16 15:50:02.000000000 +0100
@@ -1,5 +1,5 @@
-prefix=${pcfiledir}/../..
-exec_prefix=${pcfiledir}/../..
@@ -15,4 +15,4 @@
+exec_prefix=${prefix}
libdir=${prefix}/@reloc_libdir@
includedir=${prefix}/include/mono- at API_VER@
-
+ sysconfdir=@sysconfdir@
Added: mono/trunk/debian/patches/fix_Mono.Cecil_linkage.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_Mono.Cecil_linkage.dpatch (rev 0)
+++ mono/trunk/debian/patches/fix_Mono.Cecil_linkage.dpatch 2007-12-16 22:42:55 UTC (rev 3521)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_Mono.Cecil_linkage.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-1.2.6~/mcs/class/Makefile mono-1.2.6/mcs/class/Makefile
+--- mono-1.2.6~/mcs/class/Makefile 2007-11-08 23:16:36.000000000 +0100
++++ mono-1.2.6/mcs/class/Makefile 2007-12-16 20:16:17.000000000 +0100
+@@ -44,8 +44,6 @@
+ System.EnterpriseServices \
+ Mono.C5 \
+ Mono.Data.Tds \
+- Mono.Cecil \
+- Mono.Cecil.Mdb \
+ System.Transactions \
+ System.Data \
+ Mono.Data \
+@@ -92,7 +90,10 @@
+ CustomMarshalers \
+ OpenSystem.C
+
+-default_dirs := FirebirdSql.Data.Firebird
++default_dirs := \
++ FirebirdSql.Data.Firebird \
++ Mono.Cecil \
++ Mono.Cecil.Mdb
+
+ net_2_0_dirs := \
+ System.Core \
Property changes on: mono/trunk/debian/patches/fix_Mono.Cecil_linkage.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: mono/trunk/debian/patches/kfreebsd_support.dpatch
===================================================================
--- mono/trunk/debian/patches/kfreebsd_support.dpatch 2007-12-14 18:45:54 UTC (rev 3520)
+++ mono/trunk/debian/patches/kfreebsd_support.dpatch 2007-12-16 22:42:55 UTC (rev 3521)
@@ -5,10 +5,10 @@
## DP: kfreebsd support - mainly backport of gc 6.8
@DPATCH@
-diff -urNad mono-1.2.5~/configure.in mono-1.2.5/configure.in
---- mono-1.2.5~/configure.in 2007-08-17 19:44:44.000000000 +0200
-+++ mono-1.2.5/configure.in 2007-08-17 19:44:56.000000000 +0200
-@@ -93,6 +93,16 @@
+diff -urNad mono-1.2.6~/configure mono-1.2.6/configure
+--- mono-1.2.6~/configure 2007-12-16 15:41:43.000000000 +0100
++++ mono-1.2.6/configure 2007-12-16 15:43:32.000000000 +0100
+@@ -2894,6 +2894,16 @@
libgc_threads=pthreads
with_sigaltstack=no
;;
@@ -25,206 +25,174 @@
# these flags will work for all versions of -STABLE
#
*-*-*freebsd4*)
-@@ -1808,6 +1818,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"
-diff -urNad mono-1.2.5~/configure mono-1.2.5/configure
---- mono-1.2.5~/configure 2007-08-17 19:44:44.000000000 +0200
-+++ mono-1.2.5/configure 2007-08-17 19:45:20.000000000 +0200
-@@ -2855,6 +2855,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*)
-@@ -6546,7 +6556,7 @@
+@@ -6485,7 +6495,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6549 "configure"' > conftest.$ac_ext
-+ echo '#line 6559 "configure"' > conftest.$ac_ext
+- echo '#line 6488 "configure"' > conftest.$ac_ext
++ echo '#line 6498 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -9345,11 +9355,11 @@
+@@ -9107,11 +9117,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:9348: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9358: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9110: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9120: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9352: \$? = $ac_status" >&5
-+ echo "$as_me:9362: \$? = $ac_status" >&5
+- echo "$as_me:9114: \$? = $ac_status" >&5
++ echo "$as_me:9124: \$? = $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.
-@@ -9613,11 +9623,11 @@
+@@ -9397,11 +9407,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:9616: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9626: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9400: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9410: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9620: \$? = $ac_status" >&5
-+ echo "$as_me:9630: \$? = $ac_status" >&5
+- echo "$as_me:9404: \$? = $ac_status" >&5
++ echo "$as_me:9414: \$? = $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.
-@@ -9717,11 +9727,11 @@
+@@ -9501,11 +9511,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:9720: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9730: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9504: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9514: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9724: \$? = $ac_status" >&5
-+ echo "$as_me:9734: \$? = $ac_status" >&5
+- echo "$as_me:9508: \$? = $ac_status" >&5
++ echo "$as_me:9518: \$? = $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
-@@ -12169,7 +12179,7 @@
+@@ -11850,7 +11860,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 12172 "configure"
-+#line 12182 "configure"
+-#line 11853 "configure"
++#line 11863 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12269,7 +12279,7 @@
+@@ -11950,7 +11960,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 12272 "configure"
-+#line 12282 "configure"
+-#line 11953 "configure"
++#line 11963 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -14637,11 +14647,11 @@
+@@ -14370,11 +14380,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:14640: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14650: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14373: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14383: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14644: \$? = $ac_status" >&5
-+ echo "$as_me:14654: \$? = $ac_status" >&5
+- echo "$as_me:14377: \$? = $ac_status" >&5
++ echo "$as_me:14387: \$? = $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.
-@@ -14741,11 +14751,11 @@
+@@ -14474,11 +14484,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:14744: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14754: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14477: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14487: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14748: \$? = $ac_status" >&5
-+ echo "$as_me:14758: \$? = $ac_status" >&5
+- echo "$as_me:14481: \$? = $ac_status" >&5
++ echo "$as_me:14491: \$? = $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
-@@ -16311,11 +16321,11 @@
+@@ -16036,11 +16046,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:16314: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16324: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16039: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16049: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16318: \$? = $ac_status" >&5
-+ echo "$as_me:16328: \$? = $ac_status" >&5
+- echo "$as_me:16043: \$? = $ac_status" >&5
++ echo "$as_me:16053: \$? = $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.
-@@ -16415,11 +16425,11 @@
+@@ -16140,11 +16150,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:16418: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16428: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16143: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16153: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16422: \$? = $ac_status" >&5
-+ echo "$as_me:16432: \$? = $ac_status" >&5
+- echo "$as_me:16147: \$? = $ac_status" >&5
++ echo "$as_me:16157: \$? = $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
-@@ -18645,11 +18655,11 @@
+@@ -18327,11 +18337,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:18648: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18658: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18330: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18340: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18652: \$? = $ac_status" >&5
-+ echo "$as_me:18662: \$? = $ac_status" >&5
+- echo "$as_me:18334: \$? = $ac_status" >&5
++ echo "$as_me:18344: \$? = $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.
-@@ -18913,11 +18923,11 @@
+@@ -18617,11 +18627,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:18916: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18926: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18620: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18630: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18920: \$? = $ac_status" >&5
-+ echo "$as_me:18930: \$? = $ac_status" >&5
+- echo "$as_me:18624: \$? = $ac_status" >&5
++ echo "$as_me:18634: \$? = $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.
-@@ -19017,11 +19027,11 @@
+@@ -18721,11 +18731,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:19020: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19030: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18724: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18734: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:19024: \$? = $ac_status" >&5
-+ echo "$as_me:19034: \$? = $ac_status" >&5
+- echo "$as_me:18728: \$? = $ac_status" >&5
++ echo "$as_me:18738: \$? = $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
-@@ -40023,6 +40033,11 @@
+@@ -37389,6 +37399,11 @@
LIBC="libc.so.12"
INTL="libintl.so.0"
;;
@@ -236,31 +204,42 @@
*-*-*freebsd*)
LIBC="libc.so"
INTL="libintl.so"
-diff -urNad mono-1.2.5~/libgc/configure.in mono-1.2.5/libgc/configure.in
---- mono-1.2.5~/libgc/configure.in 2007-08-17 19:44:19.000000000 +0200
-+++ mono-1.2.5/libgc/configure.in 2007-08-17 19:44:56.000000000 +0200
-@@ -103,6 +103,17 @@
- AC_DEFINE(THREAD_LOCAL_ALLOC)
- THREADDLLIBS="-lpthread -lrt"
+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 @@
+ 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*)
+@@ -1855,6 +1865,11 @@
+ LIBC="libc.so.12"
+ INTL="libintl.so.0"
;;
-+ *-*-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.")
- AC_DEFINE(GC_FREEBSD_THREADS)
-diff -urNad mono-1.2.5~/libgc/configure mono-1.2.5/libgc/configure
---- mono-1.2.5~/libgc/configure 2007-08-17 19:44:19.000000000 +0200
-+++ mono-1.2.5/libgc/configure 2007-08-17 19:44:56.000000000 +0200
-@@ -4632,6 +4632,32 @@
++ *-*-kfreebsd*-gnu)
++ LIBC="libc.so.0.1"
++ INTL="libc.so.0.1"
++ X11="libX11.so.6"
++ ;;
+ *-*-*freebsd*)
+ LIBC="libc.so"
+ INTL="libintl.so"
+diff -urNad mono-1.2.6~/libgc/configure mono-1.2.6/libgc/configure
+--- mono-1.2.6~/libgc/configure 2007-12-16 15:41:43.000000000 +0100
++++ mono-1.2.6/libgc/configure 2007-12-16 15:42:43.000000000 +0100
+@@ -4626,6 +4626,32 @@
THREADDLLIBS="-lpthread -lrt"
;;
@@ -293,9 +272,30 @@
*-*-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;}
-diff -urNad mono-1.2.5~/libgc/dyn_load.c mono-1.2.5/libgc/dyn_load.c
---- mono-1.2.5~/libgc/dyn_load.c 2007-08-17 19:44:19.000000000 +0200
-+++ mono-1.2.5/libgc/dyn_load.c 2007-08-17 19:44:56.000000000 +0200
+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 @@
+ 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.")
+ 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
@@ -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.
@@ -314,9 +314,9 @@
&& (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
-diff -urNad mono-1.2.5~/libgc/include/gc.h mono-1.2.5/libgc/include/gc.h
---- mono-1.2.5~/libgc/include/gc.h 2007-08-17 19:44:19.000000000 +0200
-+++ mono-1.2.5/libgc/include/gc.h 2007-08-17 19:44:56.000000000 +0200
+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 @@
# define GC_RETURN_ADDR (GC_word)__return_address
#endif
@@ -326,9 +326,9 @@
# include <features.h>
# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
&& !defined(__ia64__)
-diff -urNad mono-1.2.5~/libgc/include/private/gcconfig.h mono-1.2.5/libgc/include/private/gcconfig.h
---- mono-1.2.5~/libgc/include/private/gcconfig.h 2007-08-17 19:44:19.000000000 +0200
-+++ mono-1.2.5/libgc/include/private/gcconfig.h 2007-08-17 19:44:56.000000000 +0200
+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
@@ -55,7 +55,7 @@
# endif
@@ -412,10 +412,10 @@
/* 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.5~/mono/mini/exceptions-amd64.c mono-1.2.5/mono/mini/exceptions-amd64.c
---- mono-1.2.5~/mono/mini/exceptions-amd64.c 2007-08-17 19:44:19.000000000 +0200
-+++ mono-1.2.5/mono/mini/exceptions-amd64.c 2007-08-17 19:44:56.000000000 +0200
-@@ -643,7 +643,7 @@
+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 @@
static inline guint64*
gregs_from_ucontext (ucontext_t *ctx)
{
@@ -424,10 +424,10 @@
guint64 *gregs = (guint64 *) &ctx->uc_mcontext;
#else
guint64 *gregs = (guint64 *) &ctx->uc_mcontext.gregs;
-diff -urNad mono-1.2.5~/mono/mini/mini-amd64.h mono-1.2.5/mono/mini/mini-amd64.h
---- mono-1.2.5~/mono/mini/mini-amd64.h 2007-08-17 19:44:19.000000000 +0200
-+++ mono-1.2.5/mono/mini/mini-amd64.h 2007-08-17 19:44:56.000000000 +0200
-@@ -215,7 +215,7 @@
+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 @@
#endif /* PLATFORM_WIN32 */
Deleted: mono/trunk/debian/patches/ppc_fix_mono_class_proxy_vtable_r84948.dpatch
===================================================================
--- mono/trunk/debian/patches/ppc_fix_mono_class_proxy_vtable_r84948.dpatch 2007-12-14 18:45:54 UTC (rev 3520)
+++ mono/trunk/debian/patches/ppc_fix_mono_class_proxy_vtable_r84948.dpatch 2007-12-16 22:42:55 UTC (rev 3521)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ppc_fix_mono_class_proxy_vtable_r84948.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-1.2.5~/mono/metadata/object.c mono-1.2.5/mono/metadata/object.c
---- mono-1.2.5~/mono/metadata/object.c 2007-08-01 20:07:31.000000000 +0200
-+++ mono-1.2.5/mono/metadata/object.c 2007-09-13 21:39:41.000000000 +0200
-@@ -1537,7 +1537,7 @@
- vtsize = sizeof (gpointer) * (MONO_IMT_SIZE) +
- sizeof (MonoVTable) + class->vtable_size * sizeof (gpointer);
- } else {
-- vtsize = sizeof (gpointer) * (class->max_interface_id + 1) +
-+ vtsize = sizeof (gpointer) * (max_interface_id + 1) +
- sizeof (MonoVTable) + class->vtable_size * sizeof (gpointer);
- }
-
Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules 2007-12-14 18:45:54 UTC (rev 3520)
+++ mono/trunk/debian/rules 2007-12-16 22:42:55 UTC (rev 3521)
@@ -3,7 +3,7 @@
#export DH_VERBOSE=1
export MONO_SHARED_DIR=$(CURDIR)
-MONO_API = 1.2.5
+MONO_API = 1.2.6
VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\ -f2)
UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,')
@@ -53,11 +53,9 @@
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --sysconfdir=/etc \
--with-jit=yes --with-ikvm-native=no --with-preview=yes \
- --with-libgdiplus=installed --with-x=yes
+ --with-libgdiplus=installed --with-x=yes \
+ --with-moonlight=yes
-# no usable moonlight yet, maybe with 1.2.6
-# --with-moonlight=yes \
-
# Include dpatch stuff.
include /usr/share/dpatch/dpatch.make
@@ -140,6 +138,7 @@
cd mcs && \
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp && \
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PROFILE=net_2_0
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PROFILE=net_2_1
touch install-indep-stamp
binary: binary-arch binary-indep
@@ -160,16 +159,11 @@
rm -f debian/tmp/usr/lib/mono/1.0/prj2make.exe*
# upstream forgot to remove this one
rm -f debian/tmp/usr/bin/mbas
- # shouldn't be there without --with-moonlight
- rm -f debian/tmp/usr/bin/smcs
# that exclude list are programs for arch-dep packages
dh_install -i -Xbin/monodiet -Xbin/monodis -Xbin/monograph -Xbin/mono-find-provides -Xbin/mono-find-requires -Xbin/pedump -Xbin/jay
# Late GAC
install -D -m 755 debian/mono.runtime-script debian/mono-gac/usr/share/cli-common/runtimes.d/mono
- # CLI Policy
- cd debian && find -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" | xargs -r chmod -x
- cd debian && find -type f -name "*.exe" | xargs -r chmod +x
# Build the late-GAC tool,
# using the built Mono runtime from debian/tmp
# (thus the install-arch target dependency!)
@@ -191,39 +185,14 @@
install -m 644 debian/Mono.Data.Sqlite.dll.config debian/libmono-sqlite2.0-cil/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/
install -m 644 debian/FirebirdSql.Data.Firebird.dll.config debian/libmono-firebirdsql1.7-cil/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/
- # delete bin/mono from mono-mcs, no way to exclude it with dh_install,
- # without exluding other things too, which I do not want
- rm -f debian/mono-mcs/usr/bin/mono
- # delete gacutil from mono-mcs (this is already in mono-gac)
- rm debian/mono-mcs/usr/bin/gacutil
- rm debian/mono-mcs/usr/lib/mono/1.0/gacutil.exe*
- # delete mjs from mono-mcs (this is already in mono-mjs)
- rm debian/mono-mcs/usr/bin/mjs
- rm debian/mono-mcs/usr/lib/mono/1.0/mjs.exe*
- # delete wsdl2 from mono-mcs (this is already in mono-gmcs)
- rm debian/mono-mcs/usr/bin/wsdl2
- # delete gmcs from mono-mcs (this is already in mono-gmcs)
- rm debian/mono-mcs/usr/bin/gmcs
- # delete monop2 from mono-mcs (this is already in mono-gmcs)
- rm debian/mono-mcs/usr/bin/monop2
- # delete ilasm2 from mono-mcs (this is already in mono-gmcs)
- rm debian/mono-mcs/usr/bin/ilasm2
- # delete resgen2 from mono-mcs (this is already in mono-gmcs)
- rm debian/mono-mcs/usr/bin/resgen2
- # delete mono-api-info2 from mono-mcs (this is already in mono-gmcs)
- rm debian/mono-mcs/usr/bin/mono-api-info2
- # delete mono-service2 from mono-mcs (this is already in mono-gmcs)
- rm debian/mono-mcs/usr/bin/mono-service2
- # delete xbuild from mono-mcs (this is already in mono-gmcs)
- rm debian/mono-mcs/usr/bin/xbuild
- # delete mkbundle2 from mono-mcs (this is already in mono-gmcs)
- rm debian/mono-mcs/usr/bin/mkbundle2
- # delete sgen from mono-mcs (this is already in mono-gmcs)
- rm debian/mono-mcs/usr/bin/sgen
- # delete al2 from mono-mcs (this is already in mono-gmcs)
- rm debian/mono-mcs/usr/bin/al2
- # delete httpcfg from mono-mcs (this is already in mono-gmcs)
- rm debian/mono-mcs/usr/bin/httpcfg
+ # delete gacutil from mono-1.0-tools-dev (this is already in mono-gac)
+ rm debian/mono-1.0-tools-dev/usr/lib/mono/1.0/gacutil.exe*
+ # delete mjs from mono-1.0-tools-dev (this is already in mono-mjs)
+ rm debian/mono-1.0-tools-dev/usr/lib/mono/1.0/mjs.exe*
+ # delete mono-service from mono-1.0-tools-dev (this is already in mono-1.0-service)
+ rm debian/mono-1.0-tools-dev/usr/lib/mono/1.0/mono-service.exe*
+ # delete mono-service from mono-2.0-tools-dev (this is already in mono-2.0-service)
+ rm debian/mono-2.0-tools-dev/usr/lib/mono/2.0/mono-service.exe*
# delete Mono.Data.Tds from libmono1.0/2.0-cil (those are already in libmono-data-tds*-cil)
rm -r debian/libmono1.0-cil/usr/lib/mono/gac/Mono.Data.Tds/
rm -r debian/libmono2.0-cil/usr/lib/mono/gac/Mono.Data.Tds/
Modified: mono/trunk/debian/shlibs.local
===================================================================
--- mono/trunk/debian/shlibs.local 2007-12-14 18:45:54 UTC (rev 3520)
+++ mono/trunk/debian/shlibs.local 2007-12-16 22:42:55 UTC (rev 3521)
@@ -1,8 +1,9 @@
-libgdiplus 0 libgdiplus (>= 1.1.18)
-libcairo 2 libcairo2 (>= 1.2.4)
+libMonoPosixHelper 0 libmono0 (>= 1.2.6)
+libgdiplus 0 libgdiplus (>= 1.2.6)
+libgluezilla 0 libgluezilla (>= 1.2.6)
+libcairo 2 libcairo2 (>=1.4.0)
libfbclient 2 libfbclient2
libsqlite 0 libsqlite0 (>= 2.8.17)
-libsqlite3 0 libsqlite3-0 (>= 3.3.8)
-libMonoPosixHelper 0 libmono0 (>= 1.2.2)
-libasound 2 libasound2 (>> 1.0.12)
+libsqlite3 0 libsqlite3-0 (>= 3.4.2)
+libasound 2 libasound2 (>> 1.0.14)
libgda-2 3 libgda2-3
Added: mono/trunk/debian/update-shlibs.local.sh
===================================================================
--- mono/trunk/debian/update-shlibs.local.sh (rev 0)
+++ mono/trunk/debian/update-shlibs.local.sh 2007-12-16 22:42:55 UTC (rev 3521)
@@ -0,0 +1,25 @@
+#!/bin/sh -e
+
+VERSION=$(dpkg-parsechangelog | grep ^Vers | cut -d\ -f2)
+UPVERSION=$(echo $VERSION | sed 's,-.*,,')
+
+echo -n "Updating shlibs.local for Mono $UPVERSION..."
+
+cp debian/shlibs.local debian/shlibs.local.backup
+rm -f debian/shlibs.local.new
+
+# libs that don't ship shlibs
+echo "libMonoPosixHelper 0 libmono0 (>= $UPVERSION)" >> debian/shlibs.local.new
+echo "libgdiplus 0 libgdiplus (>= $UPVERSION)" >> debian/shlibs.local.new
+echo "libgluezilla 0 libgluezilla (>= $UPVERSION)" >> debian/shlibs.local.new
+
+grep --no-filename "libcairo 2" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new
+grep --no-filename "libfbclient 2" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new
+grep --no-filename "libsqlite 0" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new
+grep --no-filename "libsqlite3 0" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new
+grep --no-filename "libasound 2" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new
+grep --no-filename "libgda-2 3" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new
+
+cp debian/shlibs.local.new debian/shlibs.local
+
+echo "done."
Property changes on: mono/trunk/debian/update-shlibs.local.sh
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-mono-svn-commits
mailing list