[Pkg-mono-svn-commits] rev 2878 - in mono/trunk/debian: . patches
Sebastian Dröge
slomo-guest at alioth.debian.org
Tue Dec 5 20:10:00 CET 2006
Author: slomo-guest
Date: 2006-12-05 20:10:00 +0100 (Tue, 05 Dec 2006)
New Revision: 2878
Removed:
mono/trunk/debian/patches/arm_support_larger_stack_r65218.dpatch
mono/trunk/debian/patches/fix_directory_exists_reverts_r67043.dpatch
mono/trunk/debian/patches/fix_tmp_race_r65441.dpatch
mono/trunk/debian/patches/gmcs-static-anonmethods.dpatch
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/libmono1.0-cil.install
mono/trunk/debian/libmono2.0-cil.install
mono/trunk/debian/patches/00list
mono/trunk/debian/rules
Log:
* update mono to 1.2.2
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2006-12-05 15:23:25 UTC (rev 2877)
+++ mono/trunk/debian/changelog 2006-12-05 19:10:00 UTC (rev 2878)
@@ -1,8 +1,8 @@
-mono (1.2.1-1~pre1) unstable; urgency=low
+mono (1.2.2-1~pre1) unstable; urgency=low
- * New upstream release
* Mirco 'meebey' Bauer:
- + debian/NEWS:
+ + New upstream release (1.2.1)
+ + debian/NEWS:
- Added entry for Mono 1.2
+ debian/patches/gmcs-static-anonmethods.dpatch:
- Removed, already applied upstream.
@@ -13,8 +13,16 @@
- Override for GUI/X11 dependency on libmono-winforms2.0-cil to suggests.
+ debian/dh_clideps:
- Synced from cli-common-dev 0.4.7.
+ * Sebastian 'slomo' Dröge:
+ + New upstream release (1.2.2)
+ + debian/rules:
+ - Update MONO_API to 1.2.2
+ + debian/libmono?.0-cil.install:
+ - Add OpenSystem.C library
+ + debian/patches/*:
+ - Remove obsolete patches
- -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org> Wed, 22 Nov 2006 21:36:33 +0100
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org> Tue, 5 Dec 2006 20:03:41 +0100
mono (1.1.18-3) unstable; urgency=low
Modified: mono/trunk/debian/libmono1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono1.0-cil.install 2006-12-05 15:23:25 UTC (rev 2877)
+++ mono/trunk/debian/libmono1.0-cil.install 2006-12-05 19:10:00 UTC (rev 2878)
@@ -1,3 +1,5 @@
debian/tmp/usr/lib/mono/gac/Mono.*/1.0.*/
+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
+debian/tmp/usr/lib/mono/1.0/OpenSystem.C.dll
Modified: mono/trunk/debian/libmono2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono2.0-cil.install 2006-12-05 15:23:25 UTC (rev 2877)
+++ mono/trunk/debian/libmono2.0-cil.install 2006-12-05 19:10:00 UTC (rev 2878)
@@ -1,3 +1,5 @@
debian/tmp/usr/lib/mono/gac/Mono.*/2.0.*/
+debian/tmp/usr/lib/mono/gac/OpenSystem.C/2.0.*
debian/tmp/usr/lib/mono/gac/mono-service/2.0.*/
debian/tmp/usr/lib/mono/2.0/Mono.*.dll
+debian/tmp/usr/lib/mono/2.0/OpenSystem.C.dll
Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list 2006-12-05 15:23:25 UTC (rev 2877)
+++ mono/trunk/debian/patches/00list 2006-12-05 19:10:00 UTC (rev 2878)
@@ -1,3 +1,2 @@
remove_broken_dllmap_from_mono-shlib-cop.dpatch
console-no-utf8-bom.dpatch
-#fix_directory_exists_reverts_r67043.dpatch
Deleted: mono/trunk/debian/patches/arm_support_larger_stack_r65218.dpatch
===================================================================
--- mono/trunk/debian/patches/arm_support_larger_stack_r65218.dpatch 2006-12-05 15:23:25 UTC (rev 2877)
+++ mono/trunk/debian/patches/arm_support_larger_stack_r65218.dpatch 2006-12-05 19:10:00 UTC (rev 2878)
@@ -1,89 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## arm_support_larger_stack_r65218.dpatch by Mirco Bauer <meebey at meebey.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mono-1.1.17.1~/mono/mini/ChangeLog mono-1.1.17.1/mono/mini/ChangeLog
---- mono-1.1.17.1~/mono/mini/ChangeLog 2006-08-25 21:35:16.000000000 +0200
-+++ mono-1.1.17.1/mono/mini/ChangeLog 2006-09-11 21:01:36.000000000 +0200
-@@ -1,3 +1,6 @@
-+Mon Sep 11 11:31:10 BST 2006 Paolo Molaro <lupus at ximian.com>
-+
-+ * mini-arm.c: support larger stack frames (bug #79272).
-
- Wed Aug 23 19:24:00 CEST 2006 Paolo Molaro <lupus at ximian.com>
-
-diff -urNad mono-1.1.17.1~/mono/mini/mini-arm.c mono-1.1.17.1/mono/mini/mini-arm.c
---- mono-1.1.17.1~/mono/mini/mini-arm.c 2006-07-05 23:55:50.000000000 +0200
-+++ mono-1.1.17.1/mono/mini/mini-arm.c 2006-09-11 21:01:36.000000000 +0200
-@@ -100,16 +100,26 @@
- arm_patch (code - 4, start_loop);
- return code;
- }
-- g_assert (arm_is_imm12 (doffset));
-- g_assert (arm_is_imm12 (doffset + size));
-- g_assert (arm_is_imm12 (soffset));
-- g_assert (arm_is_imm12 (soffset + size));
-- while (size >= 4) {
-- ARM_LDR_IMM (code, ARMREG_LR, sreg, soffset);
-- ARM_STR_IMM (code, ARMREG_LR, dreg, doffset);
-- doffset += 4;
-- soffset += 4;
-- size -= 4;
-+ if (arm_is_imm12 (doffset) && arm_is_imm12 (doffset + size) &&
-+ arm_is_imm12 (soffset) && arm_is_imm12 (soffset + size)) {
-+ while (size >= 4) {
-+ ARM_LDR_IMM (code, ARMREG_LR, sreg, soffset);
-+ ARM_STR_IMM (code, ARMREG_LR, dreg, doffset);
-+ doffset += 4;
-+ soffset += 4;
-+ size -= 4;
-+ }
-+ } else if (size) {
-+ code = emit_big_add (code, ARMREG_R0, sreg, soffset);
-+ code = emit_big_add (code, ARMREG_R1, dreg, doffset);
-+ doffset = soffset = 0;
-+ while (size >= 4) {
-+ ARM_LDR_IMM (code, ARMREG_LR, ARMREG_R0, soffset);
-+ ARM_STR_IMM (code, ARMREG_LR, ARMREG_R1, doffset);
-+ doffset += 4;
-+ soffset += 4;
-+ size -= 4;
-+ }
- }
- g_assert (size == 0);
- return code;
-@@ -2810,8 +2820,13 @@
- }
- break;
- case 2:
-- g_assert (arm_is_imm8 (inst->inst_offset));
-- ARM_STRH_IMM (code, ainfo->reg, inst->inst_basereg, inst->inst_offset);
-+ if (arm_is_imm8 (inst->inst_offset)) {
-+ ARM_STRH_IMM (code, ainfo->reg, inst->inst_basereg, inst->inst_offset);
-+ } else {
-+ code = mono_arm_emit_load_imm (code, ARMREG_IP, inst->inst_offset);
-+ ARM_ADD_REG_REG (code, ARMREG_IP, ARMREG_IP, inst->inst_basereg);
-+ ARM_STRH_IMM (code, ainfo->reg, ARMREG_IP, 0);
-+ }
- break;
- case 8:
- g_assert (arm_is_imm12 (inst->inst_offset));
-@@ -2838,8 +2853,13 @@
- break;
- case 2:
- ARM_LDR_IMM (code, ARMREG_LR, ARMREG_SP, (prev_sp_offset + ainfo->offset));
-- g_assert (arm_is_imm8 (inst->inst_offset));
-- ARM_STRH_IMM (code, ARMREG_LR, inst->inst_basereg, inst->inst_offset);
-+ if (arm_is_imm8 (inst->inst_offset)) {
-+ ARM_STRH_IMM (code, ARMREG_LR, inst->inst_basereg, inst->inst_offset);
-+ } else {
-+ code = mono_arm_emit_load_imm (code, ARMREG_IP, inst->inst_offset);
-+ ARM_ADD_REG_REG (code, ARMREG_IP, ARMREG_IP, inst->inst_basereg);
-+ ARM_STRH_IMM (code, ARMREG_LR, ARMREG_IP, 0);
-+ }
- break;
- case 8:
- g_assert (arm_is_imm12 (inst->inst_offset));
Deleted: mono/trunk/debian/patches/fix_directory_exists_reverts_r67043.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_directory_exists_reverts_r67043.dpatch 2006-12-05 15:23:25 UTC (rev 2877)
+++ mono/trunk/debian/patches/fix_directory_exists_reverts_r67043.dpatch 2006-12-05 19:10:00 UTC (rev 2878)
@@ -1,59 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_directory_exists_reverts_r67043.dpatch by Mirco Bauer <meebey at meebey.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mono-1.2~/mono/io-layer/io.c mono-1.2/mono/io-layer/io.c
---- mono-1.2~/mono/io-layer/io.c 2006-11-02 19:09:50.000000000 +0100
-+++ mono-1.2/mono/io-layer/io.c 2006-11-09 23:29:37.000000000 +0100
-@@ -3178,7 +3178,7 @@
- guint32 GetFileAttributes (const gunichar2 *name)
- {
- gchar *utf8_name;
-- struct stat buf, linkbuf;
-+ struct stat buf;
- int result;
- guint32 ret;
-
-@@ -3213,21 +3213,7 @@
- return (INVALID_FILE_ATTRIBUTES);
- }
-
-- result = _wapi_lstat (utf8_name, &linkbuf);
-- if (result != 0) {
-- _wapi_set_last_path_error_from_errno (NULL, utf8_name);
-- g_free (utf8_name);
-- return (INVALID_FILE_ATTRIBUTES);
-- }
--
-- /* Don't treat symlinks to directories as directories. See
-- * bug 79733
-- */
-- if (S_ISDIR (buf.st_mode) && S_ISLNK (linkbuf.st_mode)) {
-- ret = _wapi_stat_to_file_attributes (utf8_name, &linkbuf);
-- } else {
-- ret = _wapi_stat_to_file_attributes (utf8_name, &buf);
-- }
-+ ret = _wapi_stat_to_file_attributes (utf8_name, &buf);
-
- g_free (utf8_name);
-
-diff -urNad mono-1.2~/mono/metadata/file-io.c mono-1.2/mono/metadata/file-io.c
---- mono-1.2~/mono/metadata/file-io.c 2006-11-02 19:09:50.000000000 +0100
-+++ mono-1.2/mono/metadata/file-io.c 2006-11-09 23:31:17.000000000 +0100
-@@ -341,11 +341,9 @@
- result = stat (filename, &linkbuf);
- if (result != -1) {
- buf = linkbuf;
-+ } else {
-+ buf.st_mode |= ~S_IFDIR; /* force it to be returned as regular file */
- }
-- /* force dangling symlinks or symlinks to directories
-- * to be returned as a regular file (see bug 79733)
-- */
-- buf.st_mode |= ~S_IFDIR;
- }
-
- /* Sockets (0140000) != Directory (040000) + Regular file (0100000) */
Deleted: mono/trunk/debian/patches/fix_tmp_race_r65441.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_tmp_race_r65441.dpatch 2006-12-05 15:23:25 UTC (rev 2877)
+++ mono/trunk/debian/patches/fix_tmp_race_r65441.dpatch 2006-12-05 19:10:00 UTC (rev 2878)
@@ -1,118 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_tmp_race_r65441.dpatch by Mirco Bauer <meebey at meebey.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mono-1.1.17.1~/mcs/class/System/System.CodeDom.Compiler/TempFileCollection.cs mono-1.1.17.1/mcs/class/System/System.CodeDom.Compiler/TempFileCollection.cs
---- mono-1.1.17.1~/mcs/class/System/System.CodeDom.Compiler/TempFileCollection.cs 2006-10-03 15:17:50.000000000 +0200
-+++ mono-1.1.17.1/mcs/class/System/System.CodeDom.Compiler/TempFileCollection.cs 2006-10-03 15:18:17.000000000 +0200
-@@ -31,6 +31,7 @@
- using System.IO;
- using System.Security;
- using System.Security.Permissions;
-+using System.Runtime.InteropServices;
-
- namespace System.CodeDom.Compiler {
-
-@@ -45,6 +46,7 @@
- bool keepfiles;
- string basepath;
- Random rnd;
-+ string ownTempDir;
-
- public TempFileCollection ()
- : this (String.Empty, false)
-@@ -67,16 +69,15 @@
- {
- get {
- if(basepath==null) {
-- // note: this property *cannot* change TempDir property
-- string temp = tempdir;
-- if (temp.Length == 0) {
-- // this call ensure the Environment permissions check
-- temp = Path.GetTempPath ();
-- }
--
-+
- if (rnd == null)
- rnd = new Random ();
-
-+ // note: this property *cannot* change TempDir property
-+ string temp = tempdir;
-+ if (temp.Length == 0)
-+ temp = GetOwnTempDir ();
-+
- // Create a temporary file at the target directory. This ensures
- // that the generated file name is unique.
- FileStream f = null;
-@@ -111,6 +112,32 @@
- return(basepath);
- }
- }
-+
-+ string GetOwnTempDir ()
-+ {
-+ if (ownTempDir != null)
-+ return ownTempDir;
-+
-+ // this call ensure the Environment permissions check
-+ string basedir = Path.GetTempPath ();
-+
-+ // Create a subdirectory with the correct user permissions
-+ int res = -1;
-+ do {
-+ int num = rnd.Next ();
-+ num++;
-+ ownTempDir = Path.Combine (basedir, num.ToString("x"));
-+ if (Directory.Exists (ownTempDir))
-+ continue;
-+ res = mkdir (ownTempDir, 0x1c0);
-+ if (res != 0) {
-+ if (!Directory.Exists (ownTempDir))
-+ throw new IOException ();
-+ // Somebody already created the dir, keep trying
-+ }
-+ } while (res != 0);
-+ return ownTempDir;
-+ }
-
- int ICollection.Count {
- get {
-@@ -190,18 +217,25 @@
-
- public void Delete()
- {
-- string[] filenames=new string[filehash.Count];
-- filehash.Keys.CopyTo(filenames, 0);
-+ bool allDeleted = true;
-+ string[] filenames = new string[filehash.Count];
-+ filehash.Keys.CopyTo (filenames, 0);
-
- foreach(string file in filenames) {
- if((bool)filehash[file]==false) {
- File.Delete(file);
- filehash.Remove(file);
-- }
-+ } else
-+ allDeleted = false;
- }
- if (basepath != null) {
- string tmpFile = basepath + ".tmp";
- File.Delete (tmpFile);
-+ basepath = null;
-+ }
-+ if (allDeleted && ownTempDir != null) {
-+ Directory.Delete (ownTempDir, true);
-+ ownTempDir = null;
- }
- }
-
-@@ -228,5 +262,6 @@
- Dispose(false);
- }
-
-+ [DllImport ("libc")] private static extern int mkdir (string olpath, uint mode);
- }
- }
Deleted: mono/trunk/debian/patches/gmcs-static-anonmethods.dpatch
===================================================================
--- mono/trunk/debian/patches/gmcs-static-anonmethods.dpatch 2006-12-05 15:23:25 UTC (rev 2877)
+++ mono/trunk/debian/patches/gmcs-static-anonmethods.dpatch 2006-12-05 19:10:00 UTC (rev 2878)
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
-Index: mono/mcs/mcs/anonymous.cs
-===================================================================
---- mono/mcs/mcs/anonymous.cs (revision 66807)
-+++ mono/mcs/mcs/anonymous.cs (working copy)
-@@ -1232,6 +1232,7 @@
-
- aec.CurrentAnonymousMethod = this;
- aec.IsFieldInitializer = ec.IsFieldInitializer;
-+ aec.IsStatic = ec.IsStatic;
-
- Report.Debug (64, "RESOLVE ANONYMOUS METHOD #1", this, Location, ec, aec,
- RootScope, Parameters, Block);
Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules 2006-12-05 15:23:25 UTC (rev 2877)
+++ mono/trunk/debian/rules 2006-12-05 19:10:00 UTC (rev 2878)
@@ -3,7 +3,7 @@
#export DH_VERBOSE=1
export MONO_SHARED_DIR=$(CURDIR)
-MONO_API = 1.1.17.1
+MONO_API = 1.2.2
VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\ -f2)
UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,')
NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION))
More information about the Pkg-mono-svn-commits
mailing list