[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:13:18 UTC 2009
The following commit has been merged in the master branch:
commit 23b13f3609070e7706b960455b1960a10b4bebcf
Author: Mirco Bauer <meebey at meebey.net>
Date: Thu May 21 00:29:17 2009 +0200
* debian/cli-wrapper.c
+ Dropped as this wrapper is obsolete since mono 1.1.6-1.
* debian/control:
+ Added mono-complete metapackage to make ISVs and users installing
non-Debian applications happy.
* debian/control
debian/mono-jt.*
debian/mono-common.*
debian/libmono0.*
debian/mono-runtime.*:
+ Merged mono-jit, mono-common and libmono0 (except libmono.so.*)
packages into mono-runtime. libmono0 was pulled in by
libmono-system2.0-cil as it pinvokes libMonoPosixHelper.so for
compression stream APIs. Since the interpreter (mint) was dropped long
time ago and is unmainained upstream, there is no reason to keep those
3 domains (VM, config / binfmt support, helper libraries) split.
+ Renamed mono-jit-dbg package to mono-runtime-dbg.
diff --git a/debian/changelog b/debian/changelog
index 7869706..31b83f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ mono (2.4+dfsg-1~pre1) unstable; urgency=low
+ Build MonoGetAssemblyName using gmcs instead of mcs.
+ Don't allow dh_clideps to add mono-runtime dependencies to
mono-1.0/2.0-gac to prevent circular dependency hell. (Closes: #528090)
+ * debian/cli-wrapper.c
+ + Dropped as this wrapper is obsolete since mono 1.1.6-1.
* 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.
@@ -50,14 +52,16 @@ mono (2.4+dfsg-1~pre1) unstable; urgency=low
debugging).
+ Added new libmono-management2.0-cil, libmono-messaging2.0-cil,
libmono-simd2.0-cil and libmono-wcf3.0-cil packages.
- + Merged monodoc, monodoc-base and monodoc-manual packages from the
- monodoc source package.
+ + Merged monodoc-base and monodoc-manual packages from the monodoc source
+ package.
+ Dropped mono-smcs, libmono-corlib2.1-cil and libmono-system2.1-cil as
those will be shipped by the moon source package.
+ Removed transition dependencies from libmono1.0-cil, libmono2.0-cil
mono-devel, as the Mono 2.0 transition has been completed some weeks ago.
+ Renamed libmono-nunit2.2-cil to libmono-nunit2.4-cil and only ship a
symlink to nunit.pc with a binary dependency on libnunit2.4-cil.
+ + Added mono-complete metapackage to make ISVs and users installing
+ non-Debian applications happy.
* debian/libmono-cairo1.0-cil.install
debian/libmono-cairo2.0-cil.install
debian/patches/fix-mono-cairo.pc.in.dpatch:
@@ -67,8 +71,6 @@ mono (2.4+dfsg-1~pre1) unstable; urgency=low
+ Added mono-cil-strip
+ Removed CorCompare.exe
+ Updated mono-shlib-cop and sqlsharp as they are now CLI 2.0
- * debian/patches/fix_mod_script.dpatch:
- + Run mod and monodoc on CLI 2.0.
* debian/patches/fix_recursive_unmanaged_types.dpatch:
+ Fixes recursive structs regression as seen with OpenOffice.org.
* debian/copyright:
@@ -76,8 +78,21 @@ mono (2.4+dfsg-1~pre1) unstable; urgency=low
* debian/patches/build_cecil_as_2.0.dpatch
debian/patches/build_firebirdsql_as_2.0.dpatch:
+ Build Mono.Cecil and FirebirdSql.Data.Firebird for CLI 2.0.
-
- -- Mirco Bauer <meebey at debian.org> Wed, 13 May 2009 01:40:02 +0200
+ * debian/control
+ debian/rules
+ debian/mono-jt.*
+ debian/mono-common.*
+ debian/libmono0.*
+ debian/mono-runtime.*:
+ + Merged mono-jit, mono-common and libmono0 (except libmono.so.*)
+ packages into mono-runtime. libmono0 was pulled in by
+ libmono-system2.0-cil as it pinvokes libMonoPosixHelper.so for
+ compression stream APIs. Since the interpreter (mint) was dropped long
+ time ago and is unmainained upstream, there is no reason to keep those
+ 3 domains (VM, config / binfmt support, helper libraries) split.
+ + Renamed mono-jit-dbg package to mono-runtime-dbg.
+
+ -- Mirco Bauer <meebey at debian.org> Wed, 20 May 2009 02:56:39 +0200
mono (2.0.1-6) unstable; urgency=low
diff --git a/debian/cli-wrapper b/debian/cli-wrapper
deleted file mode 100644
index 373b364..0000000
--- a/debian/cli-wrapper
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/cli "$0.exe" "$@"
diff --git a/debian/cli-wrapper.c b/debian/cli-wrapper.c
deleted file mode 100644
index 0060a56..0000000
--- a/debian/cli-wrapper.c
+++ /dev/null
@@ -1,67 +0,0 @@
-#include <stdio.h>
-#include <glib.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-
-extern int errno;
-extern char **environ;
-
-#define cmd args[1]
-#define NAME_ISREG(name) \
- ((! stat(name,&si)) && \
- S_ISREG((&si)->st_mode))
-
-/* extend monopath to the default lib path */
-#define usdl "/usr/share/dotnet/lib"
-#define mypaths "/usr/bin:/usr/share/dotnet/bin:/usr/share/dotnet:/usr/lib/dotnet/bin:/usr/lib/dotnet"
-
-int main(int argc, char **argv){
- char *exName;
- char *args[argc+2];
- struct stat si;
- char **runpaths=NULL;
- char *monopath=NULL;
- char *foo;
-
- memcpy(args+sizeof(char), argv, sizeof(char *) * argc);
- args[argc+1]=NULL;
- args[0]=argv[0];
- exName = strrchr(argv[0], '/');
- if(!exName) exName = argv[0]; else exName++;
- cmd = (char *) calloc( 512, sizeof(char));
- /* Done. exName has the binary name, look for it and write result to cmd */
-
- monopath = getenv ("MONO_PATH");
- /* only split to runpaths when found */
- foo = monopath ?
- g_strjoin(G_SEARCHPATH_SEPARATOR_S, monopath, mypaths, NULL) :
- mypaths;
-
- //printf("bla, %s\n", foo);
-
- runpaths = g_strsplit (foo, G_SEARCHPATH_SEPARATOR_S, 1000);
-
- while(*runpaths) {
- snprintf(cmd, 511, "%s/%s.exe", *runpaths, exName);
- if(NAME_ISREG(cmd)) {
- if(monopath) setenv("MONO_PATH", g_strjoin(G_SEARCHPATH_SEPARATOR_S, monopath, *runpaths, usdl, NULL), 1);
- else setenv("MONO_PATH", g_strjoin(G_SEARCHPATH_SEPARATOR_S, *runpaths, usdl, NULL), 1);
- return execve("/usr/bin/cli",args,environ);
- }
- snprintf(cmd, 511, "%s/%s/%s.exe", *runpaths, exName, exName);
- if(NAME_ISREG(cmd)) {
- if(monopath) setenv("MONO_PATH", g_strjoin(G_SEARCHPATH_SEPARATOR_S, monopath, g_strjoin("/", *runpaths, exName, NULL), usdl, NULL), 1);
- else setenv("MONO_PATH", g_strjoin(G_SEARCHPATH_SEPARATOR_S, g_strjoin("/", *runpaths, exName, NULL), usdl, NULL), 1);
- return execve("/usr/bin/cli",args,environ);
- }
- runpaths++;
- }
-
- /* should never be reached */
- errno = ENOENT;
- return(-1);
-}
diff --git a/debian/control b/debian/control
index 59a545d..9bfa7b5 100644
--- a/debian/control
+++ b/debian/control
@@ -21,24 +21,15 @@ Homepage: http://www.mono-project.com/
Vcs-Git: git://git.debian.org/git/pkg-mono/packages/mono.git
Vcs-Browser: http://git.debian.org/?p=pkg-mono/packages/mono.git
-Package: mono-common
-Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: binfmt-support (>= 1.1.2)
-Description: common files for Mono
- 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 base configuration files and configures the
- system to run CIL executables like native applications.
-
Package: mono-runtime
-Provides: cli-runtime
+Provides: cli-runtime, cli-virtual-machine
Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
-Depends: mono-2.0-runtime (= ${binary:Version}),
+Replaces: mono-common (<< 2.4), mono-jit (<< 2.4), libmono0 (<< 2.4)
+Conflicts: mono-common (<< 2.4), mono-jit (<< 2.4)
+Suggests: xdg-utils | libgnome2-0 | konqueror
+Recommends: binfmt-support (>= 1.1.2)
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
mono-gac (= ${source:Version})
Description: Mono runtime
Mono is a platform for running and developing applications based on the
@@ -47,62 +38,20 @@ Description: Mono runtime
runtime, which can produce and execute CIL (Common Intermediate Language)
bytecode (aka assemblies), and a class library.
.
- This package is a metapackage and pulls the default VM and the default GAC in
- (which is 2.0 currently).
-
-Package: mono-1.0-runtime
-Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
-Depends: mono-jit (= ${binary:Version}),
- libmono-corlib1.0-cil (= ${source:Version}),
- mono-1.0-gac (= ${source:Version})
-Description: Mono runtime (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 is a metapackage and pulls the VM, corlib and the GAC for
- CLI 1.0 in.
-
-Package: mono-2.0-runtime
-Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
-Depends: mono-jit (= ${binary:Version}),
- libmono-corlib2.0-cil (= ${source:Version}),
- mono-2.0-gac (= ${source:Version})
-Description: Mono runtime (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 is a metapackage and pulls the VM, corlib and the GAC for
- CLI 2.0 in.
-
-Package: mono-jit
-Provides: cli-virtual-machine
-Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
-Suggests: xdg-utils | libgnome2-0 | konqueror
-Depends: ${shlibs:Depends}, ${misc:Depends}, mono-common (= ${binary:Version})
-Description: fast CLI JIT/AOT compiler for Mono
- 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 Virtual Execution Environment and the JIT
- (Just-in-Time) and AOT (Ahead-of-Time) code generator "mono".
- "mono" runs CLI applications, which is currently only available for i386,
- powerpc, arm, amd64 kfreebsd-amd64 and ia64 architectures.
+ This package contains the Virtual Machine, JIT (Just-in-Time) and
+ AOT (Ahead-of-Time) code generator "mono".
+ "mono" executes applications for the CLI (Common Language Infrastructure).
+ Mono currently only supports the X86, PowerPC, ARM, SPARC, S/390, AMD64 and
+ IA64 architectures. Optionally this package configures BINFMT support.
-Package: mono-jit-dbg
+Package: mono-runtime-dbg
Priority: extra
Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
-Depends: mono-jit (= ${binary:Version})
+Replaces: mono-jit-dbg (<< 2.4)
+Conflicts: mono-jit-dbg (<< 2.4)
+Depends: mono-runtime (= ${binary:Version})
Recommends: gdb
-Description: fast CLI JIT/AOT compiler for Mono, debugging symbols
+Description: Mono runtime, debugging symbols
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
@@ -127,15 +76,83 @@ Description: Mono utilities
This package includes various tools useful for CLI developers, like
dh_installxsp, pedump, monodiet, monodis and monograph.
+Package: mono-complete
+Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Depends: mono-runtime (= ${binary:Version}),
+ mono-utils (= ${binary:Version}),
+ mono-jay (= ${binary:Version}),
+ mono-devel (= ${source:Version}),
+ mono-gmcs (= ${source:Version}),
+ mono-xbuild (= ${source:Version}),
+ mono-csharp-shell (= ${source:Version}),
+ mono-2.0-gac (= ${source:Version}),
+ mono-2.0-service (= ${source:Version}),
+ mono-2.0-devel (= ${source:Version}),
+ monodoc-base (= ${source:Version}),
+ monodoc-manual (= ${source:Version}),
+ prj2make-sharp (= ${source:Version}),
+ libmono2.0-cil (= ${source:Version}),
+ libmono-corlib2.0-cil (= ${source:Version}),
+ libmono-posix2.0-cil (= ${source:Version}),
+ libmono-getoptions2.0-cil (= ${source:Version}),
+ libmono-data2.0-cil (= ${source:Version}),
+ libmono-c5-1.0-cil (= ${source:Version}),
+ libmono-webbrowser0.5-cil (= ${source:Version}),
+ libmono-nunit2.4-cil (= ${source:Version}),
+ libmono-management2.0-cil (= ${source:Version}),
+ libmono-messaging2.0-cil (= ${source:Version}),
+ libmono-simd2.0-cil (= ${source:Version}),
+ libmono-i18n2.0-cil (= ${source:Version}),
+ libmono-system2.0-cil (= ${source:Version}),
+ libmono-system-messaging2.0-cil (= ${source:Version}),
+ libmono-security2.0-cil (= ${source:Version}),
+ libmono-data-tds2.0-cil (= ${source:Version}),
+ libmono-system-data2.0-cil (= ${source:Version}),
+ libmono-system-web2.0-cil (= ${source:Version}),
+ libmono-wcf3.0-cil (= ${source:Version}),
+ libmono-system-runtime2.0-cil (= ${source:Version}),
+ libmono-system-ldap2.0-cil (= ${source:Version}),
+ libmono-winforms2.0-cil (= ${source:Version}),
+ libmono-cairo2.0-cil (= ${source:Version}),
+ libmono-sharpzip0.84-cil (= ${source:Version}),
+ libmono-sharpzip2.6-cil (= ${source:Version}),
+ libmono-npgsql2.0-cil (= ${source:Version}),
+ libmono-bytefx0.7.6.2-cil (= ${source:Version}),
+ libmono-firebirdsql1.7-cil (= ${source:Version}),
+ libmono-db2-1.0-cil (= ${source:Version}),
+ libmono-oracle2.0-cil (= ${source:Version}),
+ libmono-sqlite2.0-cil (= ${source:Version}),
+ libmono-accessibility2.0-cil (= ${source:Version}),
+ libmono-cscompmgd8.0-cil (= ${source:Version}),
+ libmono-ldap2.0-cil (= ${source:Version}),
+ libmono-microsoft-build2.0-cil (= ${source:Version}),
+ libmono-microsoft8.0-cil (= ${source:Version}),
+ libmono-peapi2.0-cil (= ${source:Version}),
+ libmono-relaxng2.0-cil (= ${source:Version}),
+Description: complete Mono runtime, development tools and all libraries
+ 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 is a metapackage and pulls in the Mono runtime, development tools and
+ all libraries.
+ .
+ Install this package if you want to run software for Mono or Microsoft .NET
+ which you are not installing from a Debian package.
+ .
+ For packagers: This package is not to be used as dependency for packages!
+ You should build-depend on cli-common-dev and the needed libraries instead.
+
Package: libmono0
Section: libs
Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
Replaces: libmono-dev (<= 1.1.6-4)
Conflicts: mono-utils (<< 1.2.3.1-4)
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: libraries for the Mono JIT
- Shared libraries for Mono, used for embedding/hosting of the JIT.
- The package also contains libmono-profiler-cov used for optimisation work.
+Description: Mono JIT library
+ Shared library for Mono, used for embedding/hosting of the JIT.
.
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -149,8 +166,8 @@ Section: libdevel
Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
Depends: libmono0 (= ${binary:Version})
Recommends: gdb
-Description: libraries for the Mono JIT, debugging symbols
- This package contains the debugging symbols of the Mono JIT libraries.
+Description: Mono JIT library, debugging symbols
+ This package contains the debugging symbols of the Mono JIT 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.
@@ -162,8 +179,8 @@ Package: libmono-dev
Section: libdevel
Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
Depends: libmono0 (= ${binary:Version}), libglib2.0-dev
-Description: libraries for the Mono JIT - Development files
- Header files and static libraries for libmono and libmono-profiler-conv.
+Description: Mono JIT library - Development files
+ Header files and static libraries for libmono.
.
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -1519,19 +1536,6 @@ Description: interactive C# shell
For examples and a brief overview of the commands see:
http://www.mono-project.com/CsharpRepl
-Package: monodoc
-Architecture: all
-Suggests: monodoc-http
-Depends: monodoc-browser,
- monodoc-manual
-Description: Mono documentation viewer
- The MonoDoc Project is the documentation framework of the Mono project which
- provides detailed API documentation for all Mono components and the Mono CLI
- implementation.
- .
- This is a metapackage containing dependencies for the main components of
- monodoc.
-
Package: monodoc-base
Architecture: all
Depends: ${cli:Depends}
@@ -1541,8 +1545,7 @@ Description: shared MonoDoc binaries
implementation.
.
This packages contains the shared binaries which are used by the monodoc
- programs like the documentation file compiler (assembler.exe aka
-"monodoc").
+ programs like the documentation file compiler (assembler.exe aka "monodoc").
Package: monodoc-manual
Architecture: all
diff --git a/debian/libmono0.install b/debian/libmono0.install
deleted file mode 100644
index 5839ae3..0000000
--- a/debian/libmono0.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/libmono*.so.*
-debian/tmp/usr/lib/libMonoPosixHelper.so
-debian/tmp/usr/lib/libMonoSupportW.so
diff --git a/debian/libmono0.shlibs.in b/debian/libmono0.shlibs.in
index 8e1dd93..ad6e84c 100644
--- a/debian/libmono0.shlibs.in
+++ b/debian/libmono0.shlibs.in
@@ -1,2 +1 @@
libmono 0 libmono0 (= _VERSION_)
-libmono-profiler-cov 0 libmono0 (= _VERSION_)
diff --git a/debian/mono-common.install b/debian/mono-common.install
deleted file mode 100644
index ad7ba79..0000000
--- a/debian/mono-common.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/etc/mono/browscap.ini
-debian/tmp/etc/mono/config
-debian/tmp/etc/mono/1.0/
-debian/tmp/etc/mono/2.0/
-debian/tmp/usr/share/mono-1.0/mono/cil/cil-opcodes.xml
diff --git a/debian/mono-common.manpages b/debian/mono-common.manpages
deleted file mode 100644
index 28d1733..0000000
--- a/debian/mono-common.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/man/man5/mono-config.5
-debian/man/cli-wrapper.1
diff --git a/debian/mono-common.postinst b/debian/mono-common.postinst
deleted file mode 100644
index 1df6ecc..0000000
--- a/debian/mono-common.postinst
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh -e
-
-if [ configure = "$1" ] && [ -x /usr/sbin/update-binfmts ]; then
- /usr/sbin/update-binfmts --import cli
-fi
-
-if [ configure = "$1" ] && [ -d /usr/share/dotnet/mono/ ] && [ -L /usr/share/dotnet/mono ]; then
- # it's a symlink
- rm /usr/share/dotnet/mono
-fi
-
-#DEBHELPER#
diff --git a/debian/mono-common.prerm b/debian/mono-common.prerm
deleted file mode 100644
index 51bb09e..0000000
--- a/debian/mono-common.prerm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ remove = "$1" ] && [ -x /usr/sbin/update-binfmts ]; then
- /usr/sbin/update-binfmts --package mono-common --remove cli /usr/bin/cli
-fi
-
-#DEBHELPER#
diff --git a/debian/mono-jit.install b/debian/mono-jit.install
deleted file mode 100644
index 94ed8b8..0000000
--- a/debian/mono-jit.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/bin/mono
diff --git a/debian/mono-jit.links b/debian/mono-jit.links
deleted file mode 100644
index 7a9fe8a..0000000
--- a/debian/mono-jit.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/mono-common usr/share/doc/mono-jit
diff --git a/debian/mono-jit.manpages b/debian/mono-jit.manpages
deleted file mode 100644
index ca35166..0000000
--- a/debian/mono-jit.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man1/mono.1
diff --git a/debian/mono-jit.postinst b/debian/mono-jit.postinst
deleted file mode 100644
index 4d5e58c..0000000
--- a/debian/mono-jit.postinst
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh -e
-
-# if we're configuring, /usr/share/doc/mono-jit is a directory,
-# and isn't a symlink, replace it with a symlink to mono-common
-if test "$1" = "configure" && test -d /usr/share/doc/mono-jit && ! test -h /usr/share/doc/mono-jit ; then
- rmdir /usr/share/doc/mono-jit
- ln -s mono-common /usr/share/doc/mono-jit
-fi
-
-update-alternatives \
- --install /usr/bin/cli cli /usr/bin/mono 10 \
- --slave /usr/share/man/man1/cli.1.gz cli.1.gz /usr/share/man/man1/mono.1.gz
-
-#DEBHELPER#
diff --git a/debian/mono-jit.prerm b/debian/mono-jit.prerm
deleted file mode 100644
index 1c4c549..0000000
--- a/debian/mono-jit.prerm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = remove ]; then
- update-alternatives --remove cli /usr/bin/mono
-fi
-
-#DEBHELPER#
diff --git a/debian/mono-common.dirs b/debian/mono-runtime.dirs
similarity index 100%
rename from debian/mono-common.dirs
rename to debian/mono-runtime.dirs
diff --git a/debian/mono-common.docs b/debian/mono-runtime.docs
similarity index 100%
rename from debian/mono-common.docs
rename to debian/mono-runtime.docs
diff --git a/debian/mono-runtime.install b/debian/mono-runtime.install
new file mode 100644
index 0000000..4643f35
--- /dev/null
+++ b/debian/mono-runtime.install
@@ -0,0 +1,9 @@
+/usr/bin/mono
+/etc/mono/browscap.ini
+/etc/mono/config
+/etc/mono/1.0/
+/etc/mono/2.0/
+/usr/share/mono-1.0/mono/cil/cil-opcodes.xml
+/usr/lib/libmono-*.so.*
+/usr/lib/libMonoPosixHelper.so
+/usr/lib/libMonoSupportW.so
diff --git a/debian/mono-runtime.manpages b/debian/mono-runtime.manpages
new file mode 100644
index 0000000..a7ffbf6
--- /dev/null
+++ b/debian/mono-runtime.manpages
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man1/mono.1
+debian/tmp/usr/share/man/man5/mono-config.5
+debian/man/cli-wrapper.1
diff --git a/debian/mono-runtime.postinst b/debian/mono-runtime.postinst
new file mode 100644
index 0000000..0568a99
--- /dev/null
+++ b/debian/mono-runtime.postinst
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+# if we're configuring, /usr/share/doc/mono-jit is a directory,
+# and isn't a symlink, replace it with a symlink to mono-common
+if test "$1" = "configure" && test -d /usr/share/doc/mono-jit && ! test -h /usr/share/doc/mono-jit ; then
+ rmdir /usr/share/doc/mono-jit
+ ln -s mono-common /usr/share/doc/mono-jit
+fi
+
+update-alternatives \
+ --install /usr/bin/cli cli /usr/bin/mono 10 \
+ --slave /usr/share/man/man1/cli.1.gz cli.1.gz /usr/share/man/man1/mono.1.gz
+
+if [ configure = "$1" ] && [ -x /usr/sbin/update-binfmts ]; then
+ update-binfmts --import cli
+fi
+
+if [ configure = "$1" ] && [ -d /usr/share/dotnet/mono/ ] && [ -L /usr/share/dotnet/mono ]; then
+ # it's a symlink
+ rm /usr/share/dotnet/mono
+fi
+
+#DEBHELPER#
diff --git a/debian/mono-runtime.prerm b/debian/mono-runtime.prerm
new file mode 100644
index 0000000..959242a
--- /dev/null
+++ b/debian/mono-runtime.prerm
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+if [ "$1" = remove ] && [ -x /usr/sbin/update-binfmts ]; then
+ update-binfmts --package mono-runtime --remove cli /usr/bin/cli
+fi
+
+if [ "$1" = remove ]; then
+ update-alternatives --remove cli /usr/bin/mono
+fi
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index b7ed0c8..176a70d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,9 +76,6 @@ endif
# Include dpatch stuff.
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`
-
autoreconf: patch autoreconf-stamp
autoreconf-stamp:
autoreconf -f -i -s
@@ -100,7 +97,7 @@ build: build-arch
build-all: build-arch build-indep
build-arch: configure-arch build-arch-stamp
-build-arch-stamp: cli-wrapper
+build-arch-stamp:
dh_testdir
LC_ALL=C $(MAKE) $(MAKE_FLAGS) EXTERNAL_MCS=false EXTERNAL_MONO=false
cd mcs/jay && \
@@ -131,7 +128,7 @@ clean-patched:
# AOT stuff we created using mono-aot-wrapper/mono-aot-bootstrap
find mcs/class/lib -name "*.so" -delete
-cd debian/detector && $(MAKE) clean
- rm -f cli-wrapper debian/MonoGetAssemblyName.exe
+ rm -f debian/MonoGetAssemblyName.exe
rm -rf $(MONO_SHARED_DIR)/.wapi
rm -f mcs/class/lib/default/mono-api-info.exe \
@@ -347,10 +344,9 @@ binary-arch: build-arch install-arch
dh_testroot
cd debian/detector && \
- install -D -m 755 binfmt-detector-cli $(CURDIR)/debian/mono-common/usr/lib/cli/binfmt-detector-cli
- install -D -m 755 cli-wrapper debian/mono-common/usr/bin/cli-wrapper
+ install -D -m 755 binfmt-detector-cli $(CURDIR)/debian/mono-runtime/usr/lib/cli/binfmt-detector-cli
install -D -m 644 -o root -g root debian/cli.binfmt \
- debian/mono-common/usr/share/binfmts/cli
+ debian/mono-runtime/usr/share/binfmts/cli
dh_install -s
dh_link -s
@@ -360,7 +356,7 @@ binary-arch: build-arch install-arch
dh_installman -s
dh_installexamples -s
dh_installexamples -pmono-jay $(CURDIR)/mcs/jay/skeleton.cs
- dh_strip -pmono-jit --dbg-package=mono-jit-dbg
+ dh_strip -pmono-runtime --dbg-package=mono-runtime-dbg
dh_strip -plibmono0 --dbg-package=libmono0-dbg
dh_strip -s
dh_compress -s -Xskeleton.cs
--
mono
More information about the Pkg-mono-svn-commits
mailing list