[Pkg-cli-libs-commits] [nrefactory] 01/02: Stop using Mono's private cecil. It shouldn't be used.
Jo Shields
directhex at moszumanska.debian.org
Tue Nov 15 15:34:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
directhex pushed a commit to annotated tag debian/5.3.0+20130718.73b6d0f-4
in repository nrefactory.
commit da195be622c2faf718ebbd10b42cc410df084768
Author: Jo Shields <jo.shields at xamarin.com>
Date: Tue Nov 15 15:27:34 2016 +0000
Stop using Mono's private cecil. It shouldn't be used.
---
.../libicsharpcode-nrefactory-cecil5.0-cil.install | 1 +
debian/patches/use_system_cecil.patch | 57 +++++++++++++---------
2 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/debian/libicsharpcode-nrefactory-cecil5.0-cil.install b/debian/libicsharpcode-nrefactory-cecil5.0-cil.install
index bedc9a6..c9a4927 100644
--- a/debian/libicsharpcode-nrefactory-cecil5.0-cil.install
+++ b/debian/libicsharpcode-nrefactory-cecil5.0-cil.install
@@ -1 +1,2 @@
bin/Debug/ICSharpCode.NRefactory.Cecil.dll* /usr/lib/cli/ICSharpCode.NRefactory.Cecil-5.0/
+bin/Debug/Mono.Cecil.dll* /usr/lib/cli/ICSharpCode.NRefactory.Cecil-5.0/
diff --git a/debian/patches/use_system_cecil.patch b/debian/patches/use_system_cecil.patch
index 1ff5ff9..7a21354 100644
--- a/debian/patches/use_system_cecil.patch
+++ b/debian/patches/use_system_cecil.patch
@@ -1,16 +1,19 @@
-Index: NRefactory/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
+Index: nrefactory/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
===================================================================
---- NRefactory.orig/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj 2013-11-12 11:59:38.073311754 +0000
-+++ NRefactory/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj 2013-11-12 12:04:13.549302538 +0000
-@@ -33,6 +33,7 @@
+--- nrefactory.orig/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
++++ nrefactory/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
+@@ -33,6 +33,10 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
-+ <Reference Include="Mono.Cecil" />
++ <Reference Include="Mono.Cecil">
++ <HintPath>/usr/lib/mono-cecil/</HintPath>
++ <Private>True</Private>
++ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
-@@ -47,9 +48,5 @@
+@@ -47,9 +51,5 @@
<Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
<Name>ICSharpCode.NRefactory</Name>
</ProjectReference>
@@ -22,19 +25,22 @@ Index: NRefactory/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.cspr
-</Project>
\ No newline at end of file
+</Project>
-Index: NRefactory/ICSharpCode.NRefactory.GtkDemo/ICSharpCode.NRefactory.GtkDemo.csproj
+Index: nrefactory/ICSharpCode.NRefactory.GtkDemo/ICSharpCode.NRefactory.GtkDemo.csproj
===================================================================
---- NRefactory.orig/ICSharpCode.NRefactory.GtkDemo/ICSharpCode.NRefactory.GtkDemo.csproj 2013-11-12 11:59:38.077311754 +0000
-+++ NRefactory/ICSharpCode.NRefactory.GtkDemo/ICSharpCode.NRefactory.GtkDemo.csproj 2013-11-12 12:04:41.097301616 +0000
-@@ -58,6 +58,7 @@
+--- nrefactory.orig/ICSharpCode.NRefactory.GtkDemo/ICSharpCode.NRefactory.GtkDemo.csproj
++++ nrefactory/ICSharpCode.NRefactory.GtkDemo/ICSharpCode.NRefactory.GtkDemo.csproj
+@@ -58,6 +58,10 @@
<Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="Mono.Posix" />
<Reference Include="System.Core" />
-+ <Reference Include="Mono.Cecil" />
++ <Reference Include="Mono.Cecil">
++ <HintPath>/usr/lib/mono-cecil/</HintPath>
++ <Private>True</Private>
++ </Reference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="gtk-gui\gui.stetic">
-@@ -103,10 +104,6 @@
+@@ -103,10 +107,6 @@
<Project>{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}</Project>
<Name>ICSharpCode.NRefactory.Cecil</Name>
</ProjectReference>
@@ -45,26 +51,29 @@ Index: NRefactory/ICSharpCode.NRefactory.GtkDemo/ICSharpCode.NRefactory.GtkDemo.
</ItemGroup>
<ItemGroup>
<None Include="CSharpDemo.cs">
-@@ -116,4 +113,4 @@
+@@ -116,4 +116,4 @@
<ItemGroup>
<Folder Include="pixbuf\" />
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
-Index: NRefactory/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj
+Index: nrefactory/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj
===================================================================
---- NRefactory.orig/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj 2013-11-12 11:59:38.085311754 +0000
-+++ NRefactory/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj 2013-11-12 12:05:06.501300766 +0000
-@@ -85,6 +85,7 @@
+--- nrefactory.orig/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj
++++ nrefactory/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj
+@@ -85,6 +85,10 @@
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
-+ <Reference Include="Mono.Cecil" />
++ <Reference Include="Mono.Cecil">
++ <HintPath>/usr/lib/mono-cecil/</HintPath>
++ <Private>True</Private>
++ </Reference>
<Reference Include="nunit.framework">
<HintPath>..\..\cecil\Test\libs\nunit-2.5.10\nunit.framework.dll</HintPath>
</Reference>
-@@ -437,11 +438,6 @@
+@@ -437,11 +441,6 @@
<Compile Include="CSharp\CodeCompletion\FormatItemTests.cs" />
</ItemGroup>
<ItemGroup>
@@ -76,18 +85,18 @@ Index: NRefactory/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.cspr
<ProjectReference Include="..\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
<Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
<Name>ICSharpCode.NRefactory.CSharp</Name>
-@@ -473,4 +469,4 @@
+@@ -473,4 +472,4 @@
</Properties>
</MonoDevelop>
</ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
-Index: NRefactory/NRefactory.sln
+Index: nrefactory/NRefactory.sln
===================================================================
---- NRefactory.orig/NRefactory.sln 2013-11-12 11:59:38.101311753 +0000
-+++ NRefactory/NRefactory.sln 2013-11-12 12:03:38.357303715 +0000
-@@ -14,8 +14,6 @@
+--- nrefactory.orig/NRefactory.sln
++++ nrefactory/NRefactory.sln
+@@ -14,8 +14,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Tests", "ICSharpCode.NRefactory.Tests\ICSharpCode.NRefactory.Tests.csproj", "{63D3B27A-D966-4902-90B3-30290E1692F1}"
EndProject
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/nrefactory.git
More information about the Pkg-cli-libs-commits
mailing list