[Pkg-mono-svn-commits] rev 2587 - in mono/trunk/debian: . patches
Sebastian Dröge
slomo-guest at costa.debian.org
Wed Jun 28 09:54:09 UTC 2006
Author: slomo-guest
Date: 2006-06-28 09:54:07 +0000 (Wed, 28 Jun 2006)
New Revision: 2587
Added:
mono/trunk/debian/patches/console-no-utf8-bom.dpatch
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/mono.runtime-script
mono/trunk/debian/patches/00list
Log:
* byte order mark isn't printed anymore to the console
* call everything from mono.runtime-script with LANG=C
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2006-06-27 14:01:47 UTC (rev 2586)
+++ mono/trunk/debian/changelog 2006-06-28 09:54:07 UTC (rev 2587)
@@ -12,6 +12,11 @@
Fixes it to not return always 0 on PPC. Patch from mono SVN (rev 60676).
+ debian/patches/resource-manager-boo.dpatch:
- dropped, upstream now
+ + debian/patches/console-no-utf8-bom.dpatch:
+ - don't output the Byte Order Mark on UTF8 locales to the console. This
+ breaks scripts and everything that parses the output of mono programs.
+ + debian/mono.runtime-scripts:
+ - added LANG=C to all calls of external programs
-- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org> Tue, 27 Jun 2006 15:11:24 +0200
Modified: mono/trunk/debian/mono.runtime-script
===================================================================
--- mono/trunk/debian/mono.runtime-script 2006-06-27 14:01:47 UTC (rev 2586)
+++ mono/trunk/debian/mono.runtime-script 2006-06-28 09:54:07 UTC (rev 2587)
@@ -62,9 +62,9 @@
# Clean up the line and get the base directory
chomp;
my $basedir = dirname($_);
- system("rm -f $_/*");
- system("rmdir $_");
- system("rmdir $basedir");
+ system("LANG=C rm -f $_/*");
+ system("LANG=C rmdir $_");
+ system("LANG=C rmdir $basedir");
}
close UNINSTALL;
@@ -116,7 +116,7 @@
# absolute paths). There isn't a problem of doing too many
# since we typically run from the root context.
my $cmd = "(cd / && "
- . "/usr/bin/mono /usr/lib/mono/1.0/gacutil.exe /i ./$dll"
+ . "LANG=C /usr/bin/mono /usr/lib/mono/1.0/gacutil.exe /i ./$dll"
. " > /dev/null)";
system($cmd);
}
@@ -135,7 +135,7 @@
my $dll = shift;
# Open a pipe to monop
- my $cmd = "/usr/bin/mono /usr/share/mono/MonoGetAssemblyName.exe $dll";
+ my $cmd = "LANG=C /usr/bin/mono /usr/share/mono/MonoGetAssemblyName.exe $dll";
open PIPE, "$cmd |" or die "E: Cannot open pipe to assembly builder $dll";
# This generate a single line that produces the desired results
Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list 2006-06-27 14:01:47 UTC (rev 2586)
+++ mono/trunk/debian/patches/00list 2006-06-28 09:54:07 UTC (rev 2587)
@@ -4,3 +4,4 @@
fix-mono-cairo-image-surface-constructor-signature.dpatch
ppc_missing_lock.dpatch
sqliteclient-ppc.dpatch
+console-no-utf8-bom.dpatch
Added: mono/trunk/debian/patches/console-no-utf8-bom.dpatch
===================================================================
--- mono/trunk/debian/patches/console-no-utf8-bom.dpatch 2006-06-27 14:01:47 UTC (rev 2586)
+++ mono/trunk/debian/patches/console-no-utf8-bom.dpatch 2006-06-28 09:54:07 UTC (rev 2587)
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- trunk/mcs/class/corlib/System/Console.cs 2006/01/02 20:42:25 54982
++++ trunk/mcs/class/corlib/System/Console.cs 2006/01/20 00:47:16 55804
+@@ -63,8 +63,7 @@
+ // On Unix systems (128), do not output the
+ // UTF-8 ZWNBSP (zero-width non-breaking space).
+ //
++ if (code_page == UTF8Encoding.UTF8_CODE_PAGE || ((code_page & 0x10000000) != 0))
+- if (code_page != -1 && ((code_page & 0x0fffffff) == 3 // UTF8Encoding.UTF8_CODE_PAGE
+- || ((code_page & 0x10000000) != 0)))
+ encoding = Encoding.UTF8Unmarked;
+ else
+ encoding = Encoding.Default;
+
Property changes on: mono/trunk/debian/patches/console-no-utf8-bom.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-mono-svn-commits
mailing list