[Pkg-mono-svn-commits] [SCM] moon branch, master, updated. upstream/2.3-47-g8f32d36

[Jo Shields]

The following commit has been merged in the master branch:
commit bf128763274f40898e5155710334ae20ddab6753
Author: Jo Shields <directhex at apebox.org>
Date:   Thu Nov 4 23:45:18 2010 +0000

    Clean up patches
    Fix package description
    (Historic bzr commit from Wed 2010-02-17 11:16:58 +0000)

diff --git a/debian/changelog b/debian/changelog
index d3fd1b2..d0519ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,6 @@ moon (2.1-0ubuntu1~pre~ppa1) UNRELEASED; urgency=low
     + Remove dpatch build-dep
     + We now only work on Mono arches, so use the list of Mono arches rather
       than Arch:any
-  * debian/patches/fix_mono_build_on_amd64_xen_r149671.patch:
-    + Backport from Mono Trunk to fix "Illegal Instruction" on AMD64 Xen
   * debian/control,
     debian/libmoonlight-*.install:
     + Create new packages for Moonlight system assemblies (e.g. for desktop
@@ -22,8 +20,6 @@ moon (2.1-0ubuntu1~pre~ppa1) UNRELEASED; urgency=low
     + Rewrite, port to fully DH7 format
   * debian/monodoc-moonlight-manual.install:
     + Create manual package for GTK# widget assembly
-  * debian/patches/fix_monodoc_basefile.patch:
-    + Fix misnamed root entry in documentation file
 
  -- Jo Shields <directhex at apebox.org>  Sat, 19 Dec 2009 13:46:40 +0000
 
diff --git a/debian/control b/debian/control
index 0487922..ee90b4e 100644
--- a/debian/control
+++ b/debian/control
@@ -72,7 +72,7 @@ Package: libmoon
 Section: libs
 Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Free Software clone of Silverlight 1.0 - unstable runtime library
+Description: Free Software clone of Silverlight 2.0 - unstable runtime library
  Moonlight is a free Silverlight clone, allowing Free Software systems to
  run embedded web-browser objects or standalone code targetting Microsoft
  Silverlight.
diff --git a/debian/patches/fix_mono_build_on_amd64_xen_r149671.patch b/debian/patches/fix_mono_build_on_amd64_xen_r149671.patch
deleted file mode 100644
index f6dc6f4..0000000
--- a/debian/patches/fix_mono_build_on_amd64_xen_r149671.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: moonlight-2.0/mono-2-6/mono/mini/mini-amd64.c
-===================================================================
---- moonlight-2.0.orig/mono-2-6/mono/mini/mini-amd64.c	2010-02-08 12:42:56.000000000 +0000
-+++ moonlight-2.0/mono-2-6/mono/mini/mini-amd64.c	2010-02-08 12:43:14.000000000 +0000
-@@ -2558,11 +2558,6 @@
- 			/* These methods are allocated using malloc */
- 			near_call = FALSE;
- 
--		if (cfg->compile_aot) {
--			near_call = TRUE;
--			no_patch = TRUE;
--		}
--
- #ifdef MONO_ARCH_NOMAP32BIT
- 		near_call = FALSE;
- #endif
-@@ -2571,6 +2566,11 @@
- 		if (optimize_for_xen)
- 			near_call = FALSE;
- 
-+		if (cfg->compile_aot) {
-+			near_call = TRUE;
-+			no_patch = TRUE;
-+		}
-+
- 		if (near_call) {
- 			/* 
- 			 * Align the call displacement to an address divisible by 4 so it does
diff --git a/debian/patches/fix_monodoc_basefile.patch b/debian/patches/fix_monodoc_basefile.patch
deleted file mode 100644
index de545cf..0000000
--- a/debian/patches/fix_monodoc_basefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: moonlight-2.0/gtk/moonlight-gtk.source
-===================================================================
---- moonlight-2.0.orig/gtk/moonlight-gtk.source	2009-12-21 09:54:30.000000000 +0000
-+++ moonlight-2.0/gtk/moonlight-gtk.source	2009-12-21 09:54:56.000000000 +0000
-@@ -1,5 +1,5 @@
- <?xml version="1.0"?>
- <monodoc>
-   <node label="Moonlight/Silverlight" name="moonlight" parent="libraries" />
--  <source provider="ecma" basefile="gtksilver" path="moonlight"/>
-+  <source provider="ecma" basefile="moonlight-gtk" path="moonlight"/>
- </monodoc>
diff --git a/debian/patches/series b/debian/patches/series
index 7e119c1..73ac86a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-fix_monodoc_basefile.patch
 use_bundled_mono_runtime_for_smcs.patch
-fix_mono_build_on_amd64_xen_r149671.patch

-- 
moon