[Pkg-cli-libs-commits] [SCM] ironruby branch, master, updated. debian/0.9.0+dfsg-1-49-ge6af35a

[Mirco Bauer]

The following commit has been merged in the master branch:
commit e6af35a42666c6718847da4e10a0fcfca5427fec
Author: Mirco Bauer <meebey at meebey.net>
Date:   Thu Aug 13 21:56:43 2009 +0200

      * Added Dynamic Language Runtime packaging.

diff --git a/debian/changelog b/debian/changelog
index 115feb4..0943392 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,5 +9,6 @@ dlr-languages (20090805+git.e6b28d27+dfsg-1) UNRELEASED; urgency=low
       definition is taken from the ironpython source package.
     + Moved Matthias Klose to Uploaders as it's team maintained now.
     + Removed Andrew Mitchell from Uploaders. (Closes: #503491)
+  * Added Dynamic Language Runtime packaging.
 
  -- C.J. Adams-Collier <cjac at colliertech.org>  Mon, 27 Jul 2009 15:25:10 -0700
diff --git a/debian/control b/debian/control
index 4e2a7a7..5933f66 100644
--- a/debian/control
+++ b/debian/control
@@ -72,3 +72,12 @@ Description: Python implementation targeting the .NET and Mono platforms - debug
  Framework and makes all .NET libraries easily available to Python
  programmers, while maintaining full compatibility with the Python
  language.
+
+Package: libdlr0.9-cil
+Architecture: all
+Depends: ${cli:Depends}, ${misc:Depends}
+Homepage: http://www.codeplex.com/dlr
+Description: Dynamic Language Runtime for the CLI
+ This package contains the libraries of the Dynamic Language Runtime used by
+ scripting languages like IronPython, IronRuby, IronScheme or Nua running on
+ top of the Common Language Runtime.
diff --git a/debian/ironruby.install b/debian/ironruby.install
index 4a91b39..58c6194 100644
--- a/debian/ironruby.install
+++ b/debian/ironruby.install
@@ -1,4 +1,4 @@
-Merlin/Main/Bin/Debug/*.dll* /usr/lib/ironruby
+Merlin/Main/Bin/Debug/IronRuby.*.dll* /usr/lib/ironruby
 Merlin/Main/Languages/Ruby/Libs /usr/lib/ironruby
 Merlin/Main/Bin/Debug/ir.exe* /usr/lib/ironruby
 debian/ir /usr/bin
diff --git a/debian/libdlr0.9-cil.install b/debian/libdlr0.9-cil.install
new file mode 100644
index 0000000..0037bf0
--- /dev/null
+++ b/debian/libdlr0.9-cil.install
@@ -0,0 +1,5 @@
+Merlin/Main/Bin/Debug/Microsoft.Dynamic.dll*				/usr/lib/cli/Microsoft.Dynamic-0.9/
+Merlin/Main/Bin/Debug/Microsoft.Scripting.dll*				/usr/lib/cli/Microsoft.Scripting-0.9/
+Merlin/Main/Bin/Debug/Microsoft.Scripting.Core.dll*			/usr/lib/cli/Microsoft.Scripting.Core-0.9/
+Merlin/Main/Bin/Debug/Microsoft.Scripting.Debugging.dll*		/usr/lib/cli/Microsoft.Scripting.Debugging-0.9/
+Merlin/Main/Bin/Debug/Microsoft.Scripting.ExtensionAttribute.dll*	/usr/lib/cli/Microsoft.Scripting.ExtensionAttribute-0.9/
diff --git a/debian/libdlr0.9-cil.installcligac b/debian/libdlr0.9-cil.installcligac
new file mode 100644
index 0000000..e3cd907
--- /dev/null
+++ b/debian/libdlr0.9-cil.installcligac
@@ -0,0 +1,5 @@
+/usr/lib/cli/Microsoft.Dynamic-0.9/Microsoft.Dynamic.dll
+/usr/lib/cli/Microsoft.Scripting-0.9/Microsoft.Scripting.dll
+/usr/lib/cli/Microsoft.Scripting.Core-0.9/Microsoft.Scripting.Core.dll
+/usr/lib/cli/Microsoft.Scripting.Debugging-0.9/Microsoft.Scripting.Debugging.dll
+/usr/lib/cli/Microsoft.Scripting.ExtensionAttribute-0.9/Microsoft.Scripting.ExtensionAttribute.dll
diff --git a/debian/patches/fix_Microsoft.Scripting.ExtensionAttribute_assembly_version.patch b/debian/patches/fix_Microsoft.Scripting.ExtensionAttribute_assembly_version.patch
new file mode 100644
index 0000000..7e3fde1
--- /dev/null
+++ b/debian/patches/fix_Microsoft.Scripting.ExtensionAttribute_assembly_version.patch
@@ -0,0 +1,11 @@
+--- git.orig/ndp/fx/src/Core/Microsoft/Scripting/Properties/ExtensionAssemblyInfo.cs
++++ git/ndp/fx/src/Core/Microsoft/Scripting/Properties/ExtensionAssemblyInfo.cs
+@@ -55,7 +55,7 @@
+ [assembly: System.Resources.NeutralResourcesLanguage("en-US")]
+ 
+ #if !SILVERLIGHT
+-[assembly: AssemblyVersion("2.0.0.0")]  // shouldn't change, this assembly is unchanged.  This is the version it originally shipped as.
++[assembly: AssemblyVersion("0.9.6.20")]  // shouldn't change, this assembly is unchanged.  This is the version it originally shipped as.
+ [assembly: AssemblyFileVersion("1.0.0.00")]
+ [assembly: AssemblyInformationalVersion("1.0")]
+ [assembly: AllowPartiallyTrustedCallers]
diff --git a/debian/patches/series b/debian/patches/series
index 26a8f1d..a54b59a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 fix_foreground_color.patch
 enable_ironpython_build.patch
+fix_Microsoft.Scripting.ExtensionAttribute_assembly_version.patch
+sign_dlr_assemblies.patch
diff --git a/debian/patches/sign_dlr_assemblies.patch b/debian/patches/sign_dlr_assemblies.patch
new file mode 100644
index 0000000..9250ea6
--- /dev/null
+++ b/debian/patches/sign_dlr_assemblies.patch
@@ -0,0 +1,44 @@
+--- git.orig/Merlin/Main/Debugging/Microsoft.Scripting.Debugging/AssemblyInfo.cs
++++ git/Merlin/Main/Debugging/Microsoft.Scripting.Debugging/AssemblyInfo.cs
+@@ -57,7 +57,7 @@
+ #if SIGNED
+ [assembly: InternalsVisibleTo("Microsoft.Scripting.Debugging.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
+ #else
+-[assembly: InternalsVisibleTo("TestInternalDLR")]
++//[assembly: InternalsVisibleTo("TestInternalDLR")]
+ #endif
+ 
+ #if !SILVERLIGHT
+@@ -65,5 +65,6 @@
+ [assembly: AssemblyFileVersion("1.0.0.00")]
+ [assembly: AssemblyInformationalVersion("1.0")]
+ [assembly: AllowPartiallyTrustedCallers]
++[assembly: AssemblyKeyFile("/usr/share/cli-common/keys/mono.snk")]
+ #endif
+ 
+--- git.orig/ndp/fx/src/Core/Microsoft/Scripting/Properties/AssemblyInfo.cs
++++ git/ndp/fx/src/Core/Microsoft/Scripting/Properties/AssemblyInfo.cs
+@@ -59,4 +59,5 @@
+ [assembly: AssemblyFileVersion("1.0.0.00")]
+ [assembly: AssemblyInformationalVersion("1.0")]
+ [assembly: AllowPartiallyTrustedCallers]
++[assembly: AssemblyKeyFile("/usr/share/cli-common/keys/mono.snk")]
+ #endif
+--- git.orig/ndp/fx/src/Core/Microsoft/Scripting/Properties/ExtensionAssemblyInfo.cs
++++ git/ndp/fx/src/Core/Microsoft/Scripting/Properties/ExtensionAssemblyInfo.cs
+@@ -59,4 +59,5 @@
+ [assembly: AssemblyFileVersion("1.0.0.00")]
+ [assembly: AssemblyInformationalVersion("1.0")]
+ [assembly: AllowPartiallyTrustedCallers]
++[assembly: AssemblyKeyFile("/usr/share/cli-common/keys/mono.snk")]
+ #endif
+--- git.orig/ndp/fx/src/Dynamic/System/Dynamic/Properties/AssemblyInfo.cs
++++ git/ndp/fx/src/Dynamic/System/Dynamic/Properties/AssemblyInfo.cs
+@@ -55,6 +55,7 @@
+ [assembly: AssemblyFileVersion("1.0.0.00")]
+ [assembly: AssemblyInformationalVersion("1.0")]
+ [assembly: AllowPartiallyTrustedCallers]
++[assembly: AssemblyKeyFile("/usr/share/cli-common/keys/mono.snk")]
+ #else
+ 
+ [assembly: InternalsVisibleTo("Microsoft.CSharp, PublicKey =" +

-- 
ironruby