[Pkg-cli-libs-commits] [SCM] mono-addins branch, master, updated. debian/1.0+git20130406.adcd75b-1

Jo Shields directhex at apebox.org
Fri Apr 26 16:49:44 UTC 2013


The following commit has been merged in the master branch:
commit 39e565c07aab6d01d6863e26658c1dbb2e6a6e51
Author: Jo Shields <directhex at apebox.org>
Date:   Fri Apr 26 17:27:33 2013 +0100

    Remove obsolete patch 0001-configurable_compiler.patch.patch

diff --git a/debian/patches/0001-configurable_compiler.patch.patch b/debian/patches/0001-configurable_compiler.patch.patch
deleted file mode 100644
index 222bf99..0000000
--- a/debian/patches/0001-configurable_compiler.patch.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
-Date: Tue, 2 Aug 2011 14:31:49 +0100
-Subject: configurable_compiler.patch
-
-===================================================================
----
- Mono.Addins.Gui/Makefile.am          |    2 +-
- Mono.Addins.MSBuild/Makefile.am      |    2 +-
- Mono.Addins.Setup/Makefile.am        |    2 +-
- Mono.Addins/Makefile.am              |    2 +-
- Test/SystemInfoExtension/Makefile.am |    2 +-
- mautil/Makefile.am                   |    2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Mono.Addins.Gui/Makefile.am b/Mono.Addins.Gui/Makefile.am
-index 0705ae4..1f21cd2 100644
---- a/Mono.Addins.Gui/Makefile.am
-+++ b/Mono.Addins.Gui/Makefile.am
-@@ -1,6 +1,6 @@
- 
- KEY_FILE=$(top_srcdir)/mono-addins.snk
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = @MCS@
- ASSEMBLY_COMPILER_FLAGS = -unsafe -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
- ASSEMBLY = ../bin/Mono.Addins.Gui.dll
- ASSEMBLY_NAME=Mono.Addins.Gui
-diff --git a/Mono.Addins.MSBuild/Makefile.am b/Mono.Addins.MSBuild/Makefile.am
-index 6b74000..bc8bc07 100644
---- a/Mono.Addins.MSBuild/Makefile.am
-+++ b/Mono.Addins.MSBuild/Makefile.am
-@@ -1,6 +1,6 @@
- 
- KEY_FILE=$(top_srcdir)/mono-addins.snk
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = @MCS@
- ASSEMBLY_COMPILER_FLAGS = -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
- ASSEMBLY = ../bin/Mono.Addins.MSBuild.dll
- ASSEMBLY_NAME=Mono.Addins.MSBuild
-diff --git a/Mono.Addins.Setup/Makefile.am b/Mono.Addins.Setup/Makefile.am
-index 598f62f..f77b391 100644
---- a/Mono.Addins.Setup/Makefile.am
-+++ b/Mono.Addins.Setup/Makefile.am
-@@ -1,6 +1,6 @@
- 
- KEY_FILE=$(top_srcdir)/mono-addins.snk
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = @MCS@
- ASSEMBLY_COMPILER_FLAGS = -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
- ASSEMBLY = ../bin/Mono.Addins.Setup.dll
- ASSEMBLY_NAME=Mono.Addins.Setup
-diff --git a/Mono.Addins/Makefile.am b/Mono.Addins/Makefile.am
-index d5c1442..13ebaa8 100644
---- a/Mono.Addins/Makefile.am
-+++ b/Mono.Addins/Makefile.am
-@@ -1,6 +1,6 @@
- 
- KEY_FILE=$(top_srcdir)/mono-addins.snk
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = @MCS@
- ASSEMBLY_COMPILER_FLAGS =  -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
- ASSEMBLY = ../bin/Mono.Addins.dll
- ASSEMBLY_NAME=Mono.Addins
-diff --git a/Test/SystemInfoExtension/Makefile.am b/Test/SystemInfoExtension/Makefile.am
-index 41aa6a7..f20e289 100644
---- a/Test/SystemInfoExtension/Makefile.am
-+++ b/Test/SystemInfoExtension/Makefile.am
-@@ -1,4 +1,4 @@
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = @MCS@
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
- ASSEMBLY = ../lib/SystemInfoExtension.dll
- COMPILE_TARGET = library
-diff --git a/mautil/Makefile.am b/mautil/Makefile.am
-index 89c7df6..0e92ef0 100644
---- a/mautil/Makefile.am
-+++ b/mautil/Makefile.am
-@@ -1,5 +1,5 @@
- 
--ASSEMBLY_COMPILER_COMMAND = gmcs
-+ASSEMBLY_COMPILER_COMMAND = @MCS@
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
- ASSEMBLY = ../bin/mautil.exe
- COMPILE_TARGET = exe
--- 
diff --git a/debian/patches/series b/debian/patches/series
index b29db4b..b19b6a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-configurable_compiler.patch.patch
 0002-fix_mono-addins.pc.patch.patch
 0003-fix_mono-addins-gui.pc.patch.patch
 0004-fix_mono-addins-setup.pc.patch.patch

-- 
mono-addins



More information about the Pkg-cli-libs-commits mailing list