[Pkg-cli-apps-commits] [SCM] pinta branch, master, updated. debian/0.7-1-21-gd3e08c4
Iain Lane
laney at ubuntu.com
Thu Apr 28 23:23:54 UTC 2011
The following commit has been merged in the master branch:
commit 8895480c5151c149a5432ad4decf031d5b9b6a80
Author: Iain Lane <laney at ubuntu.com>
Date: Thu Apr 28 22:43:16 2011 +0100
Don't patch System... to 4.0, it doesn't exist any more (woohoo!)
Git-Dch: Ignore
diff --git a/debian/patches/targetframeworkversion-4.0 b/debian/patches/targetframeworkversion-4.0
index 51971d8..d14f67f 100644
--- a/debian/patches/targetframeworkversion-4.0
+++ b/debian/patches/targetframeworkversion-4.0
@@ -76,16 +76,3 @@ Index: pinta.git/Pinta.Tools/Pinta.Tools.csproj
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
-Index: pinta.git/System.ComponentModel.Composition/System.ComponentModel.Composition.csproj
-===================================================================
---- pinta.git.orig/System.ComponentModel.Composition/System.ComponentModel.Composition.csproj 2011-04-27 10:10:18.502726202 +0100
-+++ pinta.git/System.ComponentModel.Composition/System.ComponentModel.Composition.csproj 2011-04-27 10:09:50.863800392 +0100
-@@ -9,7 +9,7 @@
- <OutputType>Library</OutputType>
- <RootNamespace>Microsoft.Internal</RootNamespace>
- <AssemblyName>System.ComponentModel.Composition</AssemblyName>
-- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <NoStdLib>true</NoStdLib>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
--
pinta
More information about the Pkg-cli-apps-commits
mailing list