[Pkg-cli-apps-commits] [SCM] monodevelop branch, master, updated. debian/2.4+dfsg-3-2-gf185c8a

[Jo Shields]

The following commit has been merged in the master branch:
commit 714db731c7bb5c0802410fdd4b14f2de5733ec0a
Author: Jo Shields <directhex at apebox.org>
Date:   Tue Sep 14 16:43:29 2010 +0100

    Two assemblies, Mono.Debugging.dll and MonoDevelop.Debugger.Soft.dll, are built specifying -keycontainer on their compiler command line. Unfortunately, -keycontainer usually fails to function as expected, and instead generates a random key. This causes major problems for extensions built against these assemblies. This patch uses -keyfile instead, which removes the problem.

diff --git a/debian/changelog b/debian/changelog
index a5c85b8..7055fe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+monodevelop (2.4+dfsg-3) UNRELEASED; urgency=low
+
+  * debian/patches/use_keyfile_not_keycontainer.patch:
+    + Two assemblies, Mono.Debugging.dll and MonoDevelop.Debugger.Soft.dll, 
+      are built specifying -keycontainer on their compiler command line. 
+      Unfortunately, -keycontainer usually fails to function as expected, 
+      and instead generates a random key. This causes major problems for
+      extensions built against these assemblies. This patch uses -keyfile
+      instead, which removes the problem.
+
+ -- Jo Shields <directhex at apebox.org>  Tue, 14 Sep 2010 16:40:37 +0100
+
 monodevelop (2.4+dfsg-2) unstable; urgency=low
 
   * debian/patches/inject_Mono.Debugger.Soft_source.patch,
diff --git a/debian/patches/series b/debian/patches/series
index 5a1181d..91adb25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 #stetic_widget_corruption_r144546.patch -p3
 use_system_Mono.Debugger.Soft.patch
+use_keyfile_not_keycontainer.patch
 link_system_nunit.patch
 use_libsvn1.patch
 use_libapr1.patch
diff --git a/debian/patches/use_keyfile_not_keycontainer.patch b/debian/patches/use_keyfile_not_keycontainer.patch
new file mode 100644
index 0000000..c7ce1b6
--- /dev/null
+++ b/debian/patches/use_keyfile_not_keycontainer.patch
@@ -0,0 +1,26 @@
+Index: monodevelop-2.4+dfsg/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Makefile.am
+===================================================================
+--- monodevelop-2.4+dfsg.orig/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Makefile.am	2010-09-14 14:25:06.547939151 +0100
++++ monodevelop-2.4+dfsg/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Makefile.am	2010-09-14 14:25:13.467938607 +0100
+@@ -32,7 +32,7 @@
+ 
+ $(ASSEMBLY): $(build_sources) $(build_resources) $(DEPS) $(DBG_ASM)
+ 	mkdir -p $(ADDIN_BUILD)
+-	$(CSC) $(CSC_FLAGS) -debug -out:$@ -keycontainer:$(SIGNING_KEY) -target:library $(REFS) $(build_deps) \
++	$(CSC) $(CSC_FLAGS) -debug -out:$@ -keyfile:$(SIGNING_KEY) -target:library $(REFS) $(build_deps) \
+ 		$(build_resources:%=/resource:%) $(build_sources)
+ 
+ $(DBG_ASM): $(DBG_ASM_SRC)
+Index: monodevelop-2.4+dfsg/src/core/Mono.Debugging/Makefile.am
+===================================================================
+--- monodevelop-2.4+dfsg.orig/src/core/Mono.Debugging/Makefile.am	2010-09-14 14:25:18.467939886 +0100
++++ monodevelop-2.4+dfsg/src/core/Mono.Debugging/Makefile.am	2010-09-14 14:25:28.530437511 +0100
+@@ -82,7 +82,7 @@
+ 
+ $(ASSEMBLY): $(build_sources) $(build_resources) $(SIGNING_KEY) $(DEPS)
+ 	mkdir -p $(ASSEMBLY_BUILD_DIR)
+-	$(CSC) $(CSC_FLAGS) -debug -out:$@ /keycontainer:$(SIGNING_KEY) -target:library $(REFS) $(build_deps) $(build_resources:%=/resource:%) $(build_sources)
++	$(CSC) $(CSC_FLAGS) -debug -out:$@ /keyfile:$(SIGNING_KEY) -target:library $(REFS) $(build_deps) $(build_resources:%=/resource:%) $(build_sources)
+ 
+ $(ASSEMBLY).mdb: $(ASSEMBLY)
+ 

-- 
monodevelop