[Pkg-cli-libs-commits] r3929 - in /packages/mono-addins/trunk: ./ debian/changelog debian/patches/00list debian/patches/fix_build-system.dpatch

Wed Dec 17 18:24:29 UTC 2008

Author: vorlon
Date: Wed Dec 17 18:24:29 2008
New Revision: 3929

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3929
Log:
debian/patches/fix_build-system.dpatch: fix the Makefile.am's to use
@MCS@ instead of hard-coding 'mcs'!

Added:
    packages/mono-addins/trunk/debian/patches/fix_build-system.dpatch
Modified:
    packages/mono-addins/trunk/   (props changed)
    packages/mono-addins/trunk/debian/changelog
    packages/mono-addins/trunk/debian/patches/00list

Propchange: packages/mono-addins/trunk/
------------------------------------------------------------------------------

--- bzr:file-ids (original)
+++ bzr:file-ids Wed Dec 17 18:24:29 2008
@@ -1,2 +1,3 @@
 debian/changelog	3235 at caf891c2-51b6-4cb3-8206-960372f2aebe:packages%2Fmono-addins%2Ftrunk:debian%2Fchangelog
-debian/control	3235 at caf891c2-51b6-4cb3-8206-960372f2aebe:packages%2Fmono-addins%2Ftrunk:debian%2Fcontrol
+debian/patches/00list	3235 at caf891c2-51b6-4cb3-8206-960372f2aebe:packages%2Fmono-addins%2Ftrunk:debian%2Fpatches%2F00list
+debian/patches/fix_build-system.dpatch	fix_buildsystem.dpat-20081217182414-e9e98oox1znrhivz-1

Propchange: packages/mono-addins/trunk/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-trunk2 (original)
+++ bzr:revision-id:v3-trunk2 Wed Dec 17 18:24:29 2008
@@ -1,2 +1,3 @@
 27 steve.langasek at canonical.com-20081217182012-rplbtlh7g2phvbmy
 28 steve.langasek at canonical.com-20081217182331-s4ux6pysw5exuu7p
+29 steve.langasek at canonical.com-20081217182422-m5bbugd0ovhmjzmf

Propchange: packages/mono-addins/trunk/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Wed Dec 17 18:24:29 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-12-17 10:23:31.122999907 -0800
+timestamp: 2008-12-17 10:24:22.618999958 -0800
 committer: Steve Langasek <steve.langasek at canonical.com>
 properties: 
 	branch-nick: mono-addins

Modified: packages/mono-addins/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mono-addins/trunk/debian/changelog?rev=3929&op=diff
==============================================================================
--- packages/mono-addins/trunk/debian/changelog (original)
+++ packages/mono-addins/trunk/debian/changelog Wed Dec 17 18:24:29 2008
@@ -8,6 +8,8 @@
   * debian/rules: pass MCS=/usr/bin/csc to configure, for the mono 2.0
     transition.
   * debian/control: update build-dependencies for mono 2.0.
+  * debian/patches/fix_build-system.dpatch: fix the Makefile.am's to use
+    @MCS@ instead of hard-coding 'mcs'!
 
  -- Tim Retout <tim at retout.co.uk>  Fri, 09 May 2008 19:37:49 +0100
 

Modified: packages/mono-addins/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mono-addins/trunk/debian/patches/00list?rev=3929&op=diff
==============================================================================
--- packages/mono-addins/trunk/debian/patches/00list (original)
+++ packages/mono-addins/trunk/debian/patches/00list Wed Dec 17 18:24:29 2008
@@ -4,4 +4,5 @@
 fix_gac_policy_filenames
 fix_addin_scan
 fix_configure.ac
+fix_build-system
 99_autoreconf

Added: packages/mono-addins/trunk/debian/patches/fix_build-system.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mono-addins/trunk/debian/patches/fix_build-system.dpatch?rev=3929&op=file
==============================================================================
--- packages/mono-addins/trunk/debian/patches/fix_build-system.dpatch (added)
+++ packages/mono-addins/trunk/debian/patches/fix_build-system.dpatch Wed Dec 17 18:24:29 2008
@@ -1,0 +1,179 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_build-system.dpatch by Steve Langasek <steve.langasek at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-addins-0.3.1~/Mono.Addins/Makefile.am mono-addins-0.3.1/Mono.Addins/Makefile.am
+--- mono-addins-0.3.1~/Mono.Addins/Makefile.am	2008-01-30 22:37:53.000000000 +0000
++++ mono-addins-0.3.1/Mono.Addins/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ KEY_FILE=$(top_srcdir)/mono-addins.snk
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -keyfile:$(KEY_FILE) -langversion:ISO-1 -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG "-main:Mono.Addins.Database.SetupProcess"
+ ASSEMBLY = ../bin/Mono.Addins.dll
+ ASSEMBLY_NAME=Mono.Addins
+diff -urNad mono-addins-0.3.1~/Mono.Addins.Gui/Makefile.am mono-addins-0.3.1/Mono.Addins.Gui/Makefile.am
+--- mono-addins-0.3.1~/Mono.Addins.Gui/Makefile.am	2008-01-30 22:37:49.000000000 +0000
++++ mono-addins-0.3.1/Mono.Addins.Gui/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ KEY_FILE=$(top_srcdir)/mono-addins.snk
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/Mono.Addins.Gui.dll
+ ASSEMBLY_NAME=Mono.Addins.Gui
+diff -urNad mono-addins-0.3.1~/Mono.Addins.Setup/Makefile.am mono-addins-0.3.1/Mono.Addins.Setup/Makefile.am
+--- mono-addins-0.3.1~/Mono.Addins.Setup/Makefile.am	2008-01-30 22:37:51.000000000 +0000
++++ mono-addins-0.3.1/Mono.Addins.Setup/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ KEY_FILE=$(top_srcdir)/mono-addins.snk
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -keyfile:$(KEY_FILE) -langversion:ISO-1 -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/Mono.Addins.Setup.dll
+ ASSEMBLY_NAME=Mono.Addins.Setup
+diff -urNad mono-addins-0.3.1~/Samples/TextEditor/Makefile.am mono-addins-0.3.1/Samples/TextEditor/Makefile.am
+--- mono-addins-0.3.1~/Samples/TextEditor/Makefile.am	2008-01-30 22:37:50.000000000 +0000
++++ mono-addins-0.3.1/Samples/TextEditor/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,5 +1,5 @@
+ 
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/TextEditor.exe
+ COMPILE_TARGET = exe
+diff -urNad mono-addins-0.3.1~/Samples/TextEditor.CompilerService/Makefile.am mono-addins-0.3.1/Samples/TextEditor.CompilerService/Makefile.am
+--- mono-addins-0.3.1~/Samples/TextEditor.CompilerService/Makefile.am	2008-01-30 22:37:49.000000000 +0000
++++ mono-addins-0.3.1/Samples/TextEditor.CompilerService/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,5 +1,5 @@
+ 
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/TextEditor.CompilerService.dll
+ COMPILE_TARGET = library
+diff -urNad mono-addins-0.3.1~/Samples/TextEditor.CompilerService.CSharp/Makefile.am mono-addins-0.3.1/Samples/TextEditor.CompilerService.CSharp/Makefile.am
+--- mono-addins-0.3.1~/Samples/TextEditor.CompilerService.CSharp/Makefile.am	2008-01-30 22:37:49.000000000 +0000
++++ mono-addins-0.3.1/Samples/TextEditor.CompilerService.CSharp/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,5 +1,5 @@
+ 
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/TextEditor.CompilerService.CSharp.dll
+ COMPILE_TARGET = library
+diff -urNad mono-addins-0.3.1~/Samples/TextEditor.Xml/Makefile.am mono-addins-0.3.1/Samples/TextEditor.Xml/Makefile.am
+--- mono-addins-0.3.1~/Samples/TextEditor.Xml/Makefile.am	2008-01-30 22:37:50.000000000 +0000
++++ mono-addins-0.3.1/Samples/TextEditor.Xml/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/XmlAddin.dll
+ COMPILE_TARGET = library
+diff -urNad mono-addins-0.3.1~/Samples/TextEditorLib/Makefile.am mono-addins-0.3.1/Samples/TextEditorLib/Makefile.am
+--- mono-addins-0.3.1~/Samples/TextEditorLib/Makefile.am	2008-01-30 22:37:49.000000000 +0000
++++ mono-addins-0.3.1/Samples/TextEditorLib/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/TextEditorLib.dll
+ COMPILE_TARGET = library
+diff -urNad mono-addins-0.3.1~/Samples/WriterService/Makefile.am mono-addins-0.3.1/Samples/WriterService/Makefile.am
+--- mono-addins-0.3.1~/Samples/WriterService/Makefile.am	2008-01-30 22:37:50.000000000 +0000
++++ mono-addins-0.3.1/Samples/WriterService/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/WriterService.dll
+ COMPILE_TARGET = library
+diff -urNad mono-addins-0.3.1~/Samples/WriterService.SampleExtender/Makefile.am mono-addins-0.3.1/Samples/WriterService.SampleExtender/Makefile.am
+--- mono-addins-0.3.1~/Samples/WriterService.SampleExtender/Makefile.am	2008-01-30 22:37:50.000000000 +0000
++++ mono-addins-0.3.1/Samples/WriterService.SampleExtender/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/SampleExtender.dll
+ COMPILE_TARGET = library
+diff -urNad mono-addins-0.3.1~/Samples/WriterServiceHost/Makefile.am mono-addins-0.3.1/Samples/WriterServiceHost/Makefile.am
+--- mono-addins-0.3.1~/Samples/WriterServiceHost/Makefile.am	2008-01-30 22:37:50.000000000 +0000
++++ mono-addins-0.3.1/Samples/WriterServiceHost/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/SampleAddinHost.exe
+ COMPILE_TARGET = exe
+diff -urNad mono-addins-0.3.1~/Test/CommandExtension/Makefile.am mono-addins-0.3.1/Test/CommandExtension/Makefile.am
+--- mono-addins-0.3.1~/Test/CommandExtension/Makefile.am	2008-01-30 22:37:47.000000000 +0000
++++ mono-addins-0.3.1/Test/CommandExtension/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../lib/CommandExtension.dll
+ COMPILE_TARGET = library
+diff -urNad mono-addins-0.3.1~/Test/FileContentExtension/Makefile.am mono-addins-0.3.1/Test/FileContentExtension/Makefile.am
+--- mono-addins-0.3.1~/Test/FileContentExtension/Makefile.am	2008-01-30 22:37:47.000000000 +0000
++++ mono-addins-0.3.1/Test/FileContentExtension/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../lib/FileContentExtension.dll
+ COMPILE_TARGET = library
+diff -urNad mono-addins-0.3.1~/Test/FileExtender/Makefile.am mono-addins-0.3.1/Test/FileExtender/Makefile.am
+--- mono-addins-0.3.1~/Test/FileExtender/Makefile.am	2008-01-30 22:37:48.000000000 +0000
++++ mono-addins-0.3.1/Test/FileExtender/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../lib/extras/FileExtender.dll
+ COMPILE_TARGET = library
+diff -urNad mono-addins-0.3.1~/Test/HelloWorldExtension/Makefile.am mono-addins-0.3.1/Test/HelloWorldExtension/Makefile.am
+--- mono-addins-0.3.1~/Test/HelloWorldExtension/Makefile.am	2008-01-30 22:37:47.000000000 +0000
++++ mono-addins-0.3.1/Test/HelloWorldExtension/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../lib/HelloWorldExtension.dll
+ COMPILE_TARGET = library
+diff -urNad mono-addins-0.3.1~/Test/SystemInfoExtension/Makefile.am mono-addins-0.3.1/Test/SystemInfoExtension/Makefile.am
+--- mono-addins-0.3.1~/Test/SystemInfoExtension/Makefile.am	2008-01-30 22:37:47.000000000 +0000
++++ mono-addins-0.3.1/Test/SystemInfoExtension/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../lib/SystemInfoExtension.dll
+ COMPILE_TARGET = library
+diff -urNad mono-addins-0.3.1~/Test/UnitTests/Makefile.am mono-addins-0.3.1/Test/UnitTests/Makefile.am
+--- mono-addins-0.3.1~/Test/UnitTests/Makefile.am	2008-01-30 22:37:47.000000000 +0000
++++ mono-addins-0.3.1/Test/UnitTests/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ./bin/Debug/UnitTests.dll
+ COMPILE_TARGET = library
+diff -urNad mono-addins-0.3.1~/mautil/Makefile.am mono-addins-0.3.1/mautil/Makefile.am
+--- mono-addins-0.3.1~/mautil/Makefile.am	2008-01-30 22:37:49.000000000 +0000
++++ mono-addins-0.3.1/mautil/Makefile.am	2008-12-17 17:43:36.000000000 +0000
+@@ -1,5 +1,5 @@
+ 
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/mautil.exe
+ COMPILE_TARGET = exe


