[Pkg-cli-apps-commits] [SCM] ikvm branch, master, updated. debian/7.0.4335.0+ds-1

[Jo Shields]

The following commit has been merged in the master branch:
commit 8b01a7dcbaa579c4897502e5df7797f0fd4ad6b4
Author: Jo Shields <directhex at apebox.org>
Date:   Tue Feb 7 01:32:01 2012 +0000

    Refreshed debian/patches/03-use_mono.snk_for_ikvm-key.patch

diff --git a/debian/patches/03-use_mono.snk_for_ikvm-key.patch b/debian/patches/03-use_mono.snk_for_ikvm-key.patch
index f69be9e..34ce79d 100644
--- a/debian/patches/03-use_mono.snk_for_ikvm-key.patch
+++ b/debian/patches/03-use_mono.snk_for_ikvm-key.patch
@@ -3,10 +3,10 @@ Description: This patch ensures that rather than trying to use the Mono Crypto
 Description: Service Provider to retrieve a signing key (CSP is not safe to
 Description: run with fakeroot), we simply hard-code the path to a bundled key
 Description: file
-Index: ikvm/ikvm-0.46.0.1/CommonAssemblyInfo.cs.in
+Index: ikvm/ikvm-7.0.4335.0/CommonAssemblyInfo.cs.in
 ===================================================================
---- ikvm.orig/ikvm-0.46.0.1/CommonAssemblyInfo.cs.in	2011-07-05 01:24:45.000000000 +0100
-+++ ikvm/ikvm-0.46.0.1/CommonAssemblyInfo.cs.in	2011-07-05 01:28:22.000000000 +0100
+--- ikvm.orig/ikvm-7.0.4335.0/CommonAssemblyInfo.cs.in	2012-02-07 01:29:25.080047165 +0000
++++ ikvm/ikvm-7.0.4335.0/CommonAssemblyInfo.cs.in	2012-02-07 01:30:58.092593303 +0000
 @@ -33,5 +33,6 @@
  
  #if SIGNCODE
@@ -15,10 +15,10 @@ Index: ikvm/ikvm-0.46.0.1/CommonAssemblyInfo.cs.in
 +	[assembly: AssemblyDelaySign(false)]
 +	[assembly: AssemblyKeyFile("../../debian/mono.snk")]
  #endif
-Index: ikvm/ikvm-0.46.0.1/ikvm.build
+Index: ikvm/ikvm-7.0.4335.0/ikvm.build
 ===================================================================
---- ikvm.orig/ikvm-0.46.0.1/ikvm.build	2011-07-05 01:24:45.000000000 +0100
-+++ ikvm/ikvm-0.46.0.1/ikvm.build	2011-07-05 01:33:07.000000000 +0100
+--- ikvm.orig/ikvm-7.0.4335.0/ikvm.build	2012-02-07 01:29:57.152235493 +0000
++++ ikvm/ikvm-7.0.4335.0/ikvm.build	2012-02-07 01:30:48.348536094 +0000
 @@ -6,8 +6,8 @@
      </target>
      <target name="signed">
@@ -30,32 +30,32 @@ Index: ikvm/ikvm-0.46.0.1/ikvm.build
           <call target="managed" />
      </target>
      <target name="managed" depends="clean-managed CommonAssemblyInfo">
-Index: ikvm/ikvm-0.46.0.1/runtime/runtime.build
+Index: ikvm/ikvm-7.0.4335.0/runtime/runtime.build
 ===================================================================
---- ikvm.orig/ikvm-0.46.0.1/runtime/runtime.build	2011-07-05 01:24:45.000000000 +0100
-+++ ikvm/ikvm-0.46.0.1/runtime/runtime.build	2011-07-05 01:32:53.000000000 +0100
-@@ -7,8 +7,8 @@
-     </target>
+--- ikvm.orig/ikvm-7.0.4335.0/runtime/runtime.build	2012-02-07 01:31:20.084722420 +0000
++++ ikvm/ikvm-7.0.4335.0/runtime/runtime.build	2012-02-07 01:31:47.120881144 +0000
+@@ -19,8 +19,8 @@
+ 
      <target name="signed">
          <property name="signed" value="SIGNCODE" />
 -        <property name="signoption" value="-key:ikvm-key" />
 -        <property name="ilasm_signoption" value="/key:@ikvm-key" />
 +        <property name="signoption" value="-keyfile:../../../debian/mono.snk" />
 +        <property name="ilasm_signoption" value="/key:../../../debian/mono.snk" />
-         <call target="IKVM.Runtime" />
+         <call target="full" />
      </target>
  
-Index: ikvm/ikvm-0.46.0.1/tools/pubkey.cs
+Index: ikvm/ikvm-7.0.4335.0/tools/pubkey.cs
 ===================================================================
---- ikvm.orig/ikvm-0.46.0.1/tools/pubkey.cs	2011-07-05 01:24:45.000000000 +0100
-+++ ikvm/ikvm-0.46.0.1/tools/pubkey.cs	2011-07-05 01:28:22.000000000 +0100
+--- ikvm.orig/ikvm-7.0.4335.0/tools/pubkey.cs	2012-02-07 01:28:30.479726527 +0000
++++ ikvm/ikvm-7.0.4335.0/tools/pubkey.cs	2012-02-07 01:28:58.927893592 +0000
 @@ -29,7 +29,8 @@
  
  #if SIGNCODE
      #pragma warning disable 1699
 -    [assembly: AssemblyKeyName("ikvm-key")]
-+	[assembly: AssemblyDelaySign(false)]
-+	[assembly: AssemblyKeyFile("../../debian/mono.snk")]
++    [assembly: AssemblyDelaySign(false)]
++    [assembly: AssemblyKeyFile("../../debian/mono.snk")]
  #endif
  
  class PublicKey

-- 
ikvm