[Pkg-mono-svn-commits] [mono] 26/40: Refresh debian/ - including new split-off packages - now SGen is default
Jo Shields
directhex at alioth.debian.org
Sun Aug 18 21:55:36 UTC 2013
This is an automated email from the git hooks/post-receive script.
directhex pushed a commit to branch merge/3.2.1+dfsg
in repository mono.
commit 45139dfc1aa061c0a44e44e42cb56b1e6001f5b2
Author: Jo Shields <directhex at apebox.org>
Date: Mon Aug 5 17:59:54 2013 +0100
Refresh debian/ - including new split-off packages - now SGen is default
---
debian/control | 62 ++++++++++++++++----
debian/mono-archs.make | 16 +++--
debian/mono-runtime-boehm.install | 1 +
...{mono-runtime.NEWS => mono-runtime-common.NEWS} | 0
...runtime.desktop => mono-runtime-common.desktop} | 2 +-
...{mono-runtime.dirs => mono-runtime-common.dirs} | 1 -
...{mono-runtime.docs => mono-runtime-common.docs} | 0
...runtime.install => mono-runtime-common.install} | 5 +-
...ntime.manpages => mono-runtime-common.manpages} | 0
.../{mono-runtime.png => mono-runtime-common.png} | Bin 20335 -> 20335 bytes
...ntime.postinst => mono-runtime-common.postinst} | 4 --
...o-runtime.postrm => mono-runtime-common.postrm} | 0
...ono-runtime.prerm => mono-runtime-common.prerm} | 4 --
debian/mono-runtime-terminal.desktop | 2 +-
debian/mono-runtime.dirs | 2 -
debian/mono-runtime.links | 1 +
debian/mono-runtime.postinst | 13 ----
debian/mono-runtime.prerm | 4 --
debian/source/include-binaries | 2 +-
19 files changed, 68 insertions(+), 51 deletions(-)
diff --git a/debian/control b/debian/control
index 785848c..4517672 100644
--- a/debian/control
+++ b/debian/control
@@ -21,39 +21,60 @@ 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-runtime
+Package: mono-runtime-common
Provides: cli-runtime, cli-virtual-machine
Architecture: amd64 armel i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
-Replaces: mono-common (<< 2.4), mono-jit (<< 2.4), libmono0 (<< 2.4)
+Replaces: mono-common (<< 2.4), mono-jit (<< 2.4), libmono0 (<< 2.4), mono-runtime (<< 3.2.1)
Conflicts: mono-common (<< 2.4),
mono-jit (<< 2.4),
mono-1.0-runtime (<< 2.4),
- mono-2.0-runtime (<< 2.4)
+ mono-2.0-runtime (<< 2.4),
+ mono-runtime (<< 3.2.1)
Suggests: xdg-utils | libgnome2-0 | konqueror
Recommends: binfmt-support (>= 1.1.2)
Depends: ${shlibs:Depends},
${misc:Depends},
mono-gac (= ${source:Version})
-Description: Mono runtime
+Description: Mono runtime - common files
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 Machine, JIT (Just-in-Time) and
+ This package contains common files for 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
MIPS architectures. Optionally this package configures BINFMT support.
+Package: mono-runtime
+Architecture: amd64 armel i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ mono-runtime-sgen (= ${binary:Version})
+Description: Mono runtime - default 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.
+ .
+ This package contains the Virtual Machine, JIT (Just-in-Time) and
+ AOT (Ahead-of-Time) code generator "mono-sgen".
+ mono-sgen executes applications for the CLI (Common Language Infrastructure).
+ Mono currently only supports the X86, PowerPC, ARM, SPARC, S/390, AMD64 and
+ MIPS architectures.
+ .
+ This package installs this architecture's default runtime version.
+
Package: mono-runtime-sgen
-Architecture: amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 s390x
+Architecture: amd64 armel i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
Depends: ${shlibs:Depends},
${misc:Depends},
- mono-runtime (= ${binary:Version})
+ mono-runtime-common (= ${binary:Version})
Homepage: http://www.mono-project.com/Compacting_GC
-Description: Mono runtime - SGen (experimental)
+Description: Mono runtime - SGen
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
@@ -67,8 +88,27 @@ Description: Mono runtime - SGen (experimental)
MIPS architectures.
.
This package uses SGen which is Mono's new simple generational garbage
- collector instead of Boehm's conservative garbage collector. SGen is
- currently only for testing and thus should not be used in production.
+ collector.
+
+Package: mono-runtime-boehm
+Architecture: amd64 armel i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ mono-runtime-common (= ${binary:Version})
+Description: Mono runtime - Boehm
+ 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 Machine, JIT (Just-in-Time) and
+ AOT (Ahead-of-Time) code generator "mono-sgen".
+ mono-sgen executes applications for the CLI (Common Language Infrastructure).
+ Mono currently only supports the X86, PowerPC, ARM, SPARC, S/390, AMD64 and
+ MIPS architectures.
+ .
+ This package uses Boehm's conservative garbage collector.
Package: mono-runtime-dbg
Priority: extra
@@ -76,7 +116,7 @@ Section: debug
Architecture: amd64 armel i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
Replaces: mono-jit-dbg (<< 2.4)
Conflicts: mono-jit-dbg (<< 2.4)
-Depends: ${misc:Depends}, mono-runtime (= ${binary:Version})
+Depends: ${misc:Depends}, mono-runtime-sgen (= ${binary:Version}), mono-runtime-boehm (= ${binary:Version})
Recommends: gdb
Description: Mono runtime, debugging symbols
Mono is a platform for running and developing applications based on the
diff --git a/debian/mono-archs.make b/debian/mono-archs.make
index 27e82ae..9b6ed92 100644
--- a/debian/mono-archs.make
+++ b/debian/mono-archs.make
@@ -1,8 +1,12 @@
-DEB_MONO_ARCHS = amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
+DEB_MONO_ARCHS = amd64 armel i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
# grep defined mono/metadata/sgen-archdep.h
-#elif defined(__x86_64__)
-#elif defined(__ppc__)
-#elif defined(__arm__)
+#if defined(MONO_CROSS_COMPILE)
+#elif defined(TARGET_X86)
+#elif defined(TARGET_AMD64)
+#elif defined(TARGET_POWERPC)
+#elif defined(TARGET_ARM)
+#elif defined(__mips__)
#elif defined(__s390x__)
-# mono with sgen FTBFS on powerpc
-DEB_MONO_SGEN_ARCHS = amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
+#elif defined(__sparc__)
+# SGen is default now - Every arch is expected to support it
+DEB_MONO_SGEN_ARCHS = $(DEB_MONO_ARCHS)
diff --git a/debian/mono-runtime-boehm.install b/debian/mono-runtime-boehm.install
new file mode 100644
index 0000000..3dbfcc5
--- /dev/null
+++ b/debian/mono-runtime-boehm.install
@@ -0,0 +1 @@
+usr/bin/mono-boehm
diff --git a/debian/mono-runtime.NEWS b/debian/mono-runtime-common.NEWS
similarity index 100%
rename from debian/mono-runtime.NEWS
rename to debian/mono-runtime-common.NEWS
diff --git a/debian/mono-runtime.desktop b/debian/mono-runtime-common.desktop
similarity index 84%
rename from debian/mono-runtime.desktop
rename to debian/mono-runtime-common.desktop
index bf745ef..cdb3343 100644
--- a/debian/mono-runtime.desktop
+++ b/debian/mono-runtime-common.desktop
@@ -3,6 +3,6 @@ Name=Mono Runtime
Exec=mono
Terminal=false
Type=Application
-Icon=mono-runtime
+Icon=mono-runtime-common
MimeType=application/x-ms-dos-executable;
NoDisplay=true
diff --git a/debian/mono-runtime.dirs b/debian/mono-runtime-common.dirs
similarity index 81%
copy from debian/mono-runtime.dirs
copy to debian/mono-runtime-common.dirs
index e7aef09..a65f8e5 100644
--- a/debian/mono-runtime.dirs
+++ b/debian/mono-runtime-common.dirs
@@ -1,3 +1,2 @@
-usr/bin
usr/share/binfmts
usr/share/dotnet
diff --git a/debian/mono-runtime.docs b/debian/mono-runtime-common.docs
similarity index 100%
rename from debian/mono-runtime.docs
rename to debian/mono-runtime-common.docs
diff --git a/debian/mono-runtime.install b/debian/mono-runtime-common.install
similarity index 69%
rename from debian/mono-runtime.install
rename to debian/mono-runtime-common.install
index a70cd3e..76b5a92 100644
--- a/debian/mono-runtime.install
+++ b/debian/mono-runtime-common.install
@@ -1,4 +1,3 @@
-/usr/bin/mono
/etc/mono/browscap.ini
/etc/mono/config
/etc/mono/2.0/
@@ -7,6 +6,6 @@
/usr/share/mono-2.0/mono/cil/cil-opcodes.xml
/usr/lib/libMonoPosixHelper.so
/usr/lib/libMonoSupportW.so
-debian/mono-runtime.png /usr/share/pixmaps
-debian/mono-runtime.desktop /usr/share/applications
+debian/mono-runtime-common.png /usr/share/pixmaps
+debian/mono-runtime-common.desktop /usr/share/applications
debian/mono-runtime-terminal.desktop /usr/share/applications
diff --git a/debian/mono-runtime.manpages b/debian/mono-runtime-common.manpages
similarity index 100%
rename from debian/mono-runtime.manpages
rename to debian/mono-runtime-common.manpages
diff --git a/debian/mono-runtime.png b/debian/mono-runtime-common.png
similarity index 100%
rename from debian/mono-runtime.png
rename to debian/mono-runtime-common.png
diff --git a/debian/mono-runtime.postinst b/debian/mono-runtime-common.postinst
similarity index 68%
copy from debian/mono-runtime.postinst
copy to debian/mono-runtime-common.postinst
index 5ec2dee..4385ef5 100644
--- a/debian/mono-runtime.postinst
+++ b/debian/mono-runtime-common.postinst
@@ -1,9 +1,5 @@
#!/bin/sh -e
-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
diff --git a/debian/mono-runtime.postrm b/debian/mono-runtime-common.postrm
similarity index 100%
rename from debian/mono-runtime.postrm
rename to debian/mono-runtime-common.postrm
diff --git a/debian/mono-runtime.prerm b/debian/mono-runtime-common.prerm
similarity index 66%
copy from debian/mono-runtime.prerm
copy to debian/mono-runtime-common.prerm
index 959242a..554f3b5 100644
--- a/debian/mono-runtime.prerm
+++ b/debian/mono-runtime-common.prerm
@@ -4,8 +4,4 @@ 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/mono-runtime-terminal.desktop b/debian/mono-runtime-terminal.desktop
index 719a5e5..404a58e 100644
--- a/debian/mono-runtime-terminal.desktop
+++ b/debian/mono-runtime-terminal.desktop
@@ -3,6 +3,6 @@ Name=Mono Runtime (Terminal)
Exec=mono
Terminal=true
Type=Application
-Icon=mono-runtime
+Icon=mono-runtime-common
MimeType=application/x-ms-dos-executable;
NoDisplay=true
diff --git a/debian/mono-runtime.dirs b/debian/mono-runtime.dirs
index e7aef09..e772481 100644
--- a/debian/mono-runtime.dirs
+++ b/debian/mono-runtime.dirs
@@ -1,3 +1 @@
usr/bin
-usr/share/binfmts
-usr/share/dotnet
diff --git a/debian/mono-runtime.links b/debian/mono-runtime.links
new file mode 100644
index 0000000..5f4c804
--- /dev/null
+++ b/debian/mono-runtime.links
@@ -0,0 +1 @@
+usr/bin/mono-sgen usr/bin/mono
diff --git a/debian/mono-runtime.postinst b/debian/mono-runtime.postinst
index 5ec2dee..5e7285c 100644
--- a/debian/mono-runtime.postinst
+++ b/debian/mono-runtime.postinst
@@ -4,17 +4,4 @@ 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
-
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-
#DEBHELPER#
diff --git a/debian/mono-runtime.prerm b/debian/mono-runtime.prerm
index 959242a..1c4c549 100644
--- a/debian/mono-runtime.prerm
+++ b/debian/mono-runtime.prerm
@@ -1,9 +1,5 @@
#!/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
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index 92678b0..160dbab 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1 +1 @@
-debian/mono-runtime.png
+debian/mono-runtime-common.png
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mono/packages/mono.git
More information about the Pkg-mono-svn-commits
mailing list