[Pkg-cli-libs-commits] [SCM] newtonsoft-json branch, master, updated. debian/4.5r6-1-16-gcaace87

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 4372b4032b683c1f3bf5a577b60517a729ee91ca
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Jul 14 19:32:20 2013 +0800

    Patch to bump AssemblyVersion to 5.0.0.0

diff --git a/debian/patches/Bump-AssemblyVersion-to-5.0.0.0.patch b/debian/patches/Bump-AssemblyVersion-to-5.0.0.0.patch
new file mode 100644
index 0000000..6f0db92
--- /dev/null
+++ b/debian/patches/Bump-AssemblyVersion-to-5.0.0.0.patch
@@ -0,0 +1,36 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Date: Sun, 14 Jul 2013 19:30:40 +0800
+Subject: Bump AssemblyVersion to 5.0.0.0
+
+Upstream has decided not to bump AssemblyVersion for this version upwards, but
+we cannot co-install multiple versions of the same binary into the GAC with the
+same AssemblyVersion.
+---
+ Source/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs | 2 +-
+ Source/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs       | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Source/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Source/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
+index 5560f08..9d84538 100644
+--- a/Source/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
++++ b/Source/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
+@@ -74,5 +74,5 @@ using System.Security;
+ //
+ // You can specify all the values or you can default the Revision and Build Numbers 
+ // by using the '*' as shown below:
+-[assembly: AssemblyVersion("4.5.0.0")]
++[assembly: AssemblyVersion("5.0.0.0")]
+ [assembly: AssemblyFileVersion("5.0.6.16206")]
+diff --git a/Source/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Source/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
+index 3fef6ff..74b8821 100644
+--- a/Source/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
++++ b/Source/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
+@@ -91,7 +91,7 @@ using System.Security;
+ //
+ // You can specify all the values or you can default the Revision and Build Numbers 
+ // by using the '*' as shown below:
+-[assembly: AssemblyVersion("4.5.0.0")]
++[assembly: AssemblyVersion("5.0.0.0")]
+ [assembly: AssemblyFileVersion("5.0.6.16206")]
+ 
+ [assembly: CLSCompliant(true)]
diff --git a/debian/patches/series b/debian/patches/series
index e1556a3..9ee6eb0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 Use-single-argument-BigInteger.Parse-calls.patch
 Drop-TargetFrameworkProfile-line-from-csproj.patch
+Bump-AssemblyVersion-to-5.0.0.0.patch

-- 
newtonsoft-json