[Pkg-cli-apps-commits] [SCM] pinta branch, master, updated. debian/0.7-1-21-gd3e08c4

[Iain Lane]

The following commit has been merged in the master branch:
commit bd83f4f6760c57951fa043f5e250a45b7d0de3bb
Author: Iain Lane <laney at ubuntu.com>
Date:   Thu Apr 28 23:54:56 2011 +0100

    Add patch to use 4.0 libs, FTBFS due to conflicting 2.0/4.0 compilation otherwise

diff --git a/debian/patches/series b/debian/patches/series
index fcf6834..031e993 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 targetframeworkversion-4.0
+use-4.0-libs
diff --git a/debian/patches/use-4.0-libs b/debian/patches/use-4.0-libs
new file mode 100644
index 0000000..4e38db9
--- /dev/null
+++ b/debian/patches/use-4.0-libs
@@ -0,0 +1,28 @@
+Index: pinta.git/Pinta.Effects/Pinta.Effects.csproj
+===================================================================
+--- pinta.git.orig/Pinta.Effects/Pinta.Effects.csproj	2011-04-28 23:53:24.269685511 +0100
++++ pinta.git/Pinta.Effects/Pinta.Effects.csproj	2011-04-28 23:53:37.279176774 +0100
+@@ -1,4 +1,4 @@
+-<?xml version="1.0" encoding="utf-8"?>
++<?xml version="1.0" encoding="utf-8"?>
+ <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+   <PropertyGroup>
+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+@@ -58,8 +58,8 @@
+     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+-    <Reference Include="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
+-    <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
++    <Reference Include="Mono.Cairo, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
++    <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
+     <Reference Include="System" />
+     <Reference Include="System.Core">
+       <RequiredTargetFramework>3.5</RequiredTargetFramework>
+@@ -160,4 +160,4 @@
+       <Install>true</Install>
+     </BootstrapperPackage>
+   </ItemGroup>
+-</Project>
+\ No newline at end of file
++</Project>

-- 
pinta