[Pkg-mono-svn-commits] rev 3592 - in mono/trunk/debian: . patches
Mirco Bauer
meebey at alioth.debian.org
Mon Feb 4 20:09:21 UTC 2008
Author: meebey
Date: 2008-02-04 20:09:21 +0000 (Mon, 04 Feb 2008)
New Revision: 3592
Added:
mono/trunk/debian/mono-1.0-devel.postinst
mono/trunk/debian/mono-1.0-devel.prerm
mono/trunk/debian/mono-utils.postinst
mono/trunk/debian/patches/ppc_fix_flushing_of_icache_r92014.dpatch
Removed:
mono/trunk/debian/mono-utils.postint
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/mono-mcs.postinst
mono/trunk/debian/mono-mcs.prerm
mono/trunk/debian/patches/00list
Log:
- preparing -6
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2008-01-29 17:41:37 UTC (rev 3591)
+++ mono/trunk/debian/changelog 2008-02-04 20:09:21 UTC (rev 3592)
@@ -1,11 +1,26 @@
-mono (1.2.6+dfsg-6) UNRELEASED; urgency=low
+mono (1.2.6+dfsg-6) unstable; urgency=high
- * NOT RELEASED YET
+ * debian/mono-mcs.postinst
+ debian/mono-1.0-devel.postinst:
+ + Moved alternatives handling for cli-sn, cli-resgen and cli-al from
+ mono-mcs to mono-1.0-devel, as mono-1.0-devel ships those applications
+ (since mono 1.2.6+dfsg-1). (Closes: #460513)
+ This caused FTBS for different source packages that didn't explicitly
+ build-depend on mono-mcs, thus urgency set to high.
+ (Thanks to Laurent Bigonville <bigon at bigon.be> for the investigation)
+ * debian/mono-utils.postint
+ debian/mono-utils.postinst:
+ + Fixed file name.
* debian/control:
+ Added libmono-dev and pkg-config to recommends of mono-{1,2}.0-devel, as
mkbundle(2) uses pkg-config and needs mono.pc.
+ * debian/patches/ppc_disable_delegate_trampoline_optimization.dpatch
+ debian/patches/ppc_fix_flushing_of_icache_r92014.dpatch
+ + Replaced ppc_disable_delegate_trampoline_optimization with
+ ppc_fix_flushing_of_icache_r92014, as that one fixes instead of
+ workarounds the PPC SIGILL issue (taken from upstream's SVN).
- -- Mirco Bauer <meebey at debian.org> Wed, 02 Jan 2008 21:05:48 +0100
+ -- Mirco Bauer <meebey at debian.org> Mon, 04 Feb 2008 20:57:20 +0100
mono (1.2.6+dfsg-5) unstable; urgency=low
@@ -39,7 +54,7 @@
(thanks to Emanuele Rocca <ema at debian.org> for the hint)
+ Enhanced "make distclean" error handling, making lintian happy.
* debian/libmono-system-messaging{1,2}.0-cil.clideps-override
- debian/libmono--bytefx0.7.6.{1,2}-cil.clideps-override:
+ debian/libmono-bytefx0.7.6.{1,2}-cil.clideps-override:
+ Added suggests libmono-winforms{1,2}.0-cil, doesn't make sense to pull in
System.Windows.Forms for designer classes (which are only used by VS.NET)
* debian/patches/fix_implicit_pointer_conversions.dpatch:
Added: mono/trunk/debian/mono-1.0-devel.postinst
===================================================================
--- mono/trunk/debian/mono-1.0-devel.postinst (rev 0)
+++ mono/trunk/debian/mono-1.0-devel.postinst 2008-02-04 20:09:21 UTC (rev 3592)
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+update-alternatives \
+ --install /usr/bin/cli-resgen resource-file-generator /usr/bin/resgen 10 \
+ --slave /usr/share/man/man1/cli-resgen.1.gz cli-resgen.1.gz /usr/share/man/man1/resgen.1.gz
+
+update-alternatives \
+ --install /usr/bin/cli-al assembly-linker /usr/bin/al 10 \
+ --slave /usr/share/man/man1/cli-al.1.gz cli-al.1.gz /usr/share/man/man1/al.1.gz
+
+update-alternatives \
+ --install /usr/bin/cli-sn strong-name-tool /usr/bin/sn 10 \
+ --slave /usr/share/man/man1/cli-sn.1.gz cli-sn.1.gz /usr/share/man/man1/sn.1.gz
+
+#DEBHELPER#
Added: mono/trunk/debian/mono-1.0-devel.prerm
===================================================================
--- mono/trunk/debian/mono-1.0-devel.prerm (rev 0)
+++ mono/trunk/debian/mono-1.0-devel.prerm 2008-02-04 20:09:21 UTC (rev 3592)
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+if [ "$1" = remove ]; then
+ update-alternatives --remove resource-file-generator /usr/bin/resgen
+ update-alternatives --remove assembly-linker /usr/bin/al
+ update-alternatives --remove strong-name-tool /usr/bin/sn
+fi
+
+#DEBHELPER#
Modified: mono/trunk/debian/mono-mcs.postinst
===================================================================
--- mono/trunk/debian/mono-mcs.postinst 2008-01-29 17:41:37 UTC (rev 3591)
+++ mono/trunk/debian/mono-mcs.postinst 2008-02-04 20:09:21 UTC (rev 3592)
@@ -1,19 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
update-alternatives \
--install /usr/bin/cli-csc c-sharp-compiler /usr/bin/mcs 10 \
--slave /usr/share/man/man1/cli-csc.1.gz cli-csc.1.gz /usr/share/man/man1/mcs.1.gz
-update-alternatives \
- --install /usr/bin/cli-resgen resource-file-generator /usr/bin/resgen 10 \
- --slave /usr/share/man/man1/cli-resgen.1.gz cli-resgen.1.gz /usr/share/man/man1/resgen.1.gz
-
-update-alternatives \
- --install /usr/bin/cli-al assembly-linker /usr/bin/al 10 \
- --slave /usr/share/man/man1/cli-al.1.gz cli-al.1.gz /usr/share/man/man1/al.1.gz
-
-update-alternatives \
- --install /usr/bin/cli-sn strong-name-tool /usr/bin/sn 10 \
- --slave /usr/share/man/man1/cli-sn.1.gz cli-sn.1.gz /usr/share/man/man1/sn.1.gz
-
#DEBHELPER#
Modified: mono/trunk/debian/mono-mcs.prerm
===================================================================
--- mono/trunk/debian/mono-mcs.prerm 2008-01-29 17:41:37 UTC (rev 3591)
+++ mono/trunk/debian/mono-mcs.prerm 2008-02-04 20:09:21 UTC (rev 3592)
@@ -2,9 +2,6 @@
if [ "$1" = remove ]; then
update-alternatives --remove c-sharp-compiler /usr/bin/mcs
- update-alternatives --remove resource-file-generator /usr/bin/resgen
- update-alternatives --remove assembly-linker /usr/bin/al
- update-alternatives --remove strong-name-tool /usr/bin/sn
fi
#DEBHELPER#
Copied: mono/trunk/debian/mono-utils.postinst (from rev 3591, mono/trunk/debian/mono-utils.postint)
===================================================================
--- mono/trunk/debian/mono-utils.postinst (rev 0)
+++ mono/trunk/debian/mono-utils.postinst 2008-02-04 20:09:21 UTC (rev 3592)
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+update-alternatives \
+ --install /usr/bin/cli-ildasm cil-disassembler /usr/bin/monodis 10 \
+ --slave /usr/share/man/man1/cli-ildasm.1.gz cli-ildasm.1.gz /usr/share/man/man1/monodis.1.gz
+
+#DEBHELPER#
Deleted: mono/trunk/debian/mono-utils.postint
===================================================================
--- mono/trunk/debian/mono-utils.postint 2008-01-29 17:41:37 UTC (rev 3591)
+++ mono/trunk/debian/mono-utils.postint 2008-02-04 20:09:21 UTC (rev 3592)
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-update-alternatives \
- --install /usr/bin/cli-ildasm cil-disassembler /usr/bin/monodis 10 \
- --slave /usr/share/man/man1/cli-ildasm.1.gz cli-ildasm.1.gz /usr/share/man/man1/monodis.1.gz
-
-#DEBHELPER#
Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list 2008-01-29 17:41:37 UTC (rev 3591)
+++ mono/trunk/debian/patches/00list 2008-02-04 20:09:21 UTC (rev 3592)
@@ -7,5 +7,5 @@
fix_BigInteger_overflow_CVE-2007-5197
fix_Mono.Cecil_linkage
fix_implicit_pointer_conversions
-ppc_disable_delegate_trampoline_optimization
+ppc_fix_flushing_of_icache_r92014
fix_threads.h
Added: mono/trunk/debian/patches/ppc_fix_flushing_of_icache_r92014.dpatch
===================================================================
--- mono/trunk/debian/patches/ppc_fix_flushing_of_icache_r92014.dpatch (rev 0)
+++ mono/trunk/debian/patches/ppc_fix_flushing_of_icache_r92014.dpatch 2008-02-04 20:09:21 UTC (rev 3592)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ppc_fix_flushing_of_icache_r92014.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~/mono/mini/ChangeLog mono-1.2.6/mono/mini/ChangeLog
+--- mono-1.2.6~/mono/mini/ChangeLog 2007-12-11 17:04:37.000000000 +0100
++++ mono-1.2.6/mono/mini/ChangeLog 2007-12-29 22:46:48.000000000 +0100
+@@ -1,3 +1,6 @@
++2007-12-29 Zoltan Varga <vargaz at gmail.com>
++
++ * mini-ppc.c (mono_arch_get_delegate_invoke_impl): Fix flushing of icache.
+
+ Mon Dec 10 11:08:49 CET 2007 Paolo Molaro <lupus at ximian.com>
+
+diff -urNad mono-1.2.6~/mono/mini/mini-ppc.c mono-1.2.6/mono/mini/mini-ppc.c
+--- mono-1.2.6~/mono/mini/mini-ppc.c 2007-11-08 23:07:34.000000000 +0100
++++ mono-1.2.6/mono/mini/mini-ppc.c 2007-12-29 22:46:48.000000000 +0100
+@@ -316,7 +316,7 @@
+
+ g_assert ((code - start) <= 16);
+
+- mono_arch_flush_icache (code, 16);
++ mono_arch_flush_icache (start, 16);
+ cached = start;
+ mono_mini_arch_unlock ();
+ return cached;
+@@ -350,7 +350,7 @@
+
+ g_assert ((code - start) <= size);
+
+- mono_arch_flush_icache (code, size);
++ mono_arch_flush_icache (start, size);
+ cache [sig->param_count] = start;
+ mono_mini_arch_unlock ();
+ return start;
Property changes on: mono/trunk/debian/patches/ppc_fix_flushing_of_icache_r92014.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-mono-svn-commits
mailing list