[Pkg-cli-apps-commits] [keepass2] 01/02: Build with 4.5 classlib (Closes: #809578)

Sun Jan 3 14:53:29 UTC 2016

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to annotated tag debian/2.30+dfsg-2
in repository keepass2.

commit d19d930ec99bd68f8baafef2156cfc9876789fe5
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Jan 3 14:48:23 2016 +0000

    Build with 4.5 classlib (Closes: #809578)
---
 debian/patches/force_toolsversion_4          | 87 ++++++++++++++++++++++++++++
 debian/patches/remove-ToolsVersion-3.5.patch | 20 -------
 debian/patches/series                        |  2 +-
 3 files changed, 88 insertions(+), 21 deletions(-)

diff --git a/debian/patches/force_toolsversion_4 b/debian/patches/force_toolsversion_4
new file mode 100644
index 0000000..190b989
--- /dev/null
+++ b/debian/patches/force_toolsversion_4
@@ -0,0 +1,87 @@
+Index: keepass2/KeePass/KeePass.csproj
+===================================================================
+--- keepass2.orig/KeePass/KeePass.csproj
++++ keepass2/KeePass/KeePass.csproj
+@@ -1,4 +1,4 @@
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+   <PropertyGroup>
+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+@@ -1315,4 +1315,4 @@
+   <Target Name="AfterBuild">
+   </Target>
+   -->
+-</Project>
+\ No newline at end of file
++</Project>
+Index: keepass2/KeePassLib/KeePassLib.csproj
+===================================================================
+--- keepass2.orig/KeePassLib/KeePassLib.csproj
++++ keepass2/KeePassLib/KeePassLib.csproj
+@@ -1,4 +1,4 @@
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+   <PropertyGroup>
+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+@@ -144,4 +144,4 @@
+   <Target Name="AfterBuild">
+   </Target>
+   -->
+-</Project>
+\ No newline at end of file
++</Project>
+Index: keepass2/KeePassLibSD/KeePassLibSD.csproj
+===================================================================
+--- keepass2.orig/KeePassLibSD/KeePassLibSD.csproj
++++ keepass2/KeePassLibSD/KeePassLibSD.csproj
+@@ -1,4 +1,4 @@
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+   <PropertyGroup>
+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+@@ -14,7 +14,7 @@
+     <PlatformID>3C41C503-53EF-4c2a-8DD4-A8217CAD115E</PlatformID>
+     <OSVersion>4.20</OSVersion>
+     <DeployDirSuffix>KeePassLibSD</DeployDirSuffix>
+-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
++    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+     <FormFactorID>
+     </FormFactorID>
+     <SignAssembly>true</SignAssembly>
+@@ -382,4 +382,4 @@
+   </Target>
+   -->
+   <Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
+-</Project>
+\ No newline at end of file
++</Project>
+Index: keepass2/Translation/TrlUtil/TrlUtil.csproj
+===================================================================
+--- keepass2.orig/Translation/TrlUtil/TrlUtil.csproj
++++ keepass2/Translation/TrlUtil/TrlUtil.csproj
+@@ -1,4 +1,4 @@
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+   <PropertyGroup>
+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+@@ -131,4 +131,4 @@
+   <Target Name="AfterBuild">
+   </Target>
+   -->
+-</Project>
+\ No newline at end of file
++</Project>
+Index: keepass2/KeePass.sln
+===================================================================
+--- keepass2.orig/KeePass.sln
++++ keepass2/KeePass.sln
+@@ -1,4 +1,4 @@
+-Microsoft Visual Studio Solution File, Format Version 10.00
++Microsoft Visual Studio Solution File, Format Version 12.00
+ # Visual Studio 2008
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}"
+ EndProject
diff --git a/debian/patches/remove-ToolsVersion-3.5.patch b/debian/patches/remove-ToolsVersion-3.5.patch
deleted file mode 100644
index 76a2f34..0000000
--- a/debian/patches/remove-ToolsVersion-3.5.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Mon, 25 Apr 2011 14:07:05 +0200
-Subject: remove ToolsVersion="3.5"
-
-use debians default
-Forwarded: not-needed
----
- KeePass/KeePass.csproj | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: keepass2/KeePass/KeePass.csproj
-===================================================================
---- keepass2.orig/KeePass/KeePass.csproj
-+++ keepass2/KeePass/KeePass.csproj
-@@ -1,4 +1,4 @@
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   <PropertyGroup>
-     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
diff --git a/debian/patches/series b/debian/patches/series
index f2fef72..575a03e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,6 @@ use-installed-ico-files.patch
 do-not-use-the-non-free-icons.patch
 skip-sgen-run-during-build.patch
 fix-XSL-search-path.patch
-remove-ToolsVersion-3.5.patch
 enable-local-help.patch
 disable-autoupdate-dialog.patch
+force_toolsversion_4

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/keepass2.git

