[Pkg-mono-svn-commits] [SCM] mono-tools branch, master, updated. debian/2.6.2-3

Jo Shields directhex at apebox.org
Wed Sep 15 10:10:06 UTC 2010


The following commit has been merged in the master branch:
commit c0932b12689992921b6db77a0a3fc370d5667819
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Jun 7 20:27:38 2010 +0100

    refresh patch (mostly merged upstream)

diff --git a/debian/changelog b/debian/changelog
index 22f96db..b3507af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mono-tools (2.6.2-1) UNRELEASED; urgency=low
     + Don't use ../tarballs in get-orig-source
   * debian/source/format:
     + Explicitly use DebSrc 1.0
+  * debian/patches/00-fix_build_system.patch:
+    + Refresh (mostly rendered irrelevant upstream)
 
  -- Jo Shields <directhex at apebox.org>  Mon, 07 Jun 2010 20:14:57 +0100
 
diff --git a/debian/patches/00-fix_build_system.patch b/debian/patches/00-fix_build_system.patch
index 4aea38c..9185483 100644
--- a/debian/patches/00-fix_build_system.patch
+++ b/debian/patches/00-fix_build_system.patch
@@ -1,5 +1,7 @@
---- mono-tools-2.0.orig/configure.in
-+++ mono-tools-2.0/configure.in
+Index: mono-tools.git/configure.in
+===================================================================
+--- mono-tools.git.orig/configure.in	2010-06-07 20:19:05.000000000 +0100
++++ mono-tools.git/configure.in	2010-06-07 20:23:30.000000000 +0100
 @@ -7,8 +7,8 @@
  AC_PROG_INSTALL
  
@@ -11,83 +13,10 @@
  AC_PATH_PROG(RUNTIME, mono, no)
  AC_PATH_PROG(GACUTIL, gacutil, no)
  
---- mono-tools-2.0.orig/Mono.Profiler/profiler-file-decoder/Makefile.am
-+++ mono-tools-2.0/Mono.Profiler/profiler-file-decoder/Makefile.am
-@@ -4,7 +4,7 @@
- # Warning: This is an automatically generated file, do not edit!
- 
- if ENABLE_DEBUG
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = mono-csc
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG
- ASSEMBLY = bin/Debug/mprof-decoder.exe
- ASSEMBLY_MDB = $(ASSEMBLY).mdb
-@@ -25,7 +25,7 @@
- endif
- 
- if ENABLE_RELEASE
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = mono-csc
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+
- ASSEMBLY = bin/Release/mprof-decoder.exe
- ASSEMBLY_MDB = 
---- mono-tools-2.0.orig/Mono.Profiler/profiler-decoder-library/Makefile.am
-+++ mono-tools-2.0/Mono.Profiler/profiler-decoder-library/Makefile.am
-@@ -4,7 +4,7 @@
- # Warning: This is an automatically generated file, do not edit!
- 
- if ENABLE_DEBUG
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = mono-csc
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG
- ASSEMBLY = bin/Debug/mprof-decoder-library.dll
- ASSEMBLY_MDB = $(ASSEMBLY).mdb
-@@ -18,7 +18,7 @@
- endif
- 
- if ENABLE_RELEASE
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = mono-csc
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+
- ASSEMBLY = bin/Release/profiler-decoder-library.dll
- ASSEMBLY_MDB = 
---- mono-tools-2.0.orig/Mono.Profiler/heap-snapshot-explorer/Makefile.am
-+++ mono-tools-2.0/Mono.Profiler/heap-snapshot-explorer/Makefile.am
-@@ -4,7 +4,7 @@
- # Warning: This is an automatically generated file, do not edit!
- 
- if ENABLE_DEBUG
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = mono-csc
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -debug "-define:DEBUG"
- 
- ASSEMBLY = bin/Debug/mprof-heap-snapshot-explorer.dll
-@@ -25,7 +25,7 @@
- endif
- 
- if ENABLE_RELEASE
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = mono-csc
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+
- ASSEMBLY = bin/Release/heap-snapshot-explorer.dll
- ASSEMBLY_MDB = 
---- mono-tools-2.0.orig/Mono.Profiler/heap-snapshot-viewer/Makefile.am
-+++ mono-tools-2.0/Mono.Profiler/heap-snapshot-viewer/Makefile.am
-@@ -4,7 +4,7 @@
- # Warning: This is an automatically generated file, do not edit!
- 
- if ENABLE_DEBUG
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = mono-csc
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -debug "-define:DEBUG"
- 
- ASSEMBLY = bin/Debug/mprof-heap-viewer.exe
-@@ -33,7 +33,7 @@
- endif
- 
- if ENABLE_RELEASE
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = mono-csc
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+
- ASSEMBLY = bin/Release/mprof-heap-viewer.exe
- ASSEMBLY_MDB = 
+Index: mono-tools.git/Mono.Profiler/compile
+===================================================================
+--- mono-tools.git.orig/Mono.Profiler/compile	2010-06-07 20:25:43.000000000 +0100
++++ mono-tools.git/Mono.Profiler/compile	2010-06-07 20:25:50.000000000 +0100
+@@ -1 +1 @@
+-gmcs -debug -out:profiler-decoder.exe profiler-decoder-library/*.cs profiler-file-decoder/*.cs
++mono-csc -debug -out:profiler-decoder.exe profiler-decoder-library/*.cs profiler-file-decoder/*.cs

-- 
mono-tools



More information about the Pkg-mono-svn-commits mailing list