[Pkg-cli-apps-commits] [SCM] openmcdf branch, master, updated. 80cd4b83ae2333d5eb15ea7a99566e26d520557c

[Mathieu Malaterre]

The following commit has been merged in the master branch:
commit c55c1151a03ec8f17be163865f2b42bbbeeac589
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Date:   Fri May 4 10:01:40 2012 +0200

    Make sure to use default version

diff --git a/debian/changelog b/debian/changelog
index 5bd76d9..a575e7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ openmcdf (1.5.2-1) unstable; urgency=low
 
   * Initial release. (Closes: #647886)
 
- -- Mathieu Malaterre <malat at debian.org>  Thu, 03 May 2012 17:16:00 +0200
+ -- Mathieu Malaterre <malat at debian.org>  Fri, 04 May 2012 10:00:39 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5af60ee
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use_default_framework.patch
diff --git a/debian/patches/use_default_framework.patch b/debian/patches/use_default_framework.patch
new file mode 100644
index 0000000..ba2836c
--- /dev/null
+++ b/debian/patches/use_default_framework.patch
@@ -0,0 +1,103 @@
+Index: openmcdf/src/OLECompoundFileStorage/OpenMcdf.csproj
+===================================================================
+--- openmcdf.orig/src/OLECompoundFileStorage/OpenMcdf.csproj	2012-05-04 09:58:32.241541230 +0200
++++ openmcdf/src/OLECompoundFileStorage/OpenMcdf.csproj	2012-05-04 09:59:28.773539188 +0200
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="utf-8"?>
+-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+   <PropertyGroup>
+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+@@ -10,7 +10,6 @@
+     <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>OpenMcdf</RootNamespace>
+     <AssemblyName>OpenMcdf</AssemblyName>
+-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+     <FileAlignment>512</FileAlignment>
+   </PropertyGroup>
+   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+@@ -76,4 +75,4 @@
+   <Target Name="AfterBuild">
+   </Target>
+   -->
+-</Project>
+\ No newline at end of file
++</Project>
+Index: openmcdf/src/OleCfsMemoryTest/OpenMcdfMemTest.csproj
+===================================================================
+--- openmcdf.orig/src/OleCfsMemoryTest/OpenMcdfMemTest.csproj	2012-05-04 09:58:40.993540913 +0200
++++ openmcdf/src/OleCfsMemoryTest/OpenMcdfMemTest.csproj	2012-05-04 09:59:36.817538898 +0200
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="utf-8"?>
+-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+   <PropertyGroup>
+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+@@ -10,7 +10,6 @@
+     <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>OpenMcdfMemTest</RootNamespace>
+     <AssemblyName>OpenMcdfMemTest</AssemblyName>
+-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+     <FileAlignment>512</FileAlignment>
+   </PropertyGroup>
+   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+@@ -56,4 +55,4 @@
+   <Target Name="AfterBuild">
+   </Target>
+   -->
+-</Project>
+\ No newline at end of file
++</Project>
+Index: openmcdf/src/TESTOpenMCDF/StructuredStorageExplorer.csproj
+===================================================================
+--- openmcdf.orig/src/TESTOpenMCDF/StructuredStorageExplorer.csproj	2012-05-04 09:58:47.601540672 +0200
++++ openmcdf/src/TESTOpenMCDF/StructuredStorageExplorer.csproj	2012-05-04 09:59:45.097538597 +0200
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="utf-8"?>
+-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+   <PropertyGroup>
+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+@@ -10,7 +10,6 @@
+     <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>StructuredStorageExplorer</RootNamespace>
+     <AssemblyName>StucturedStorageExplorer</AssemblyName>
+-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+     <FileAlignment>512</FileAlignment>
+     <TargetFrameworkSubset>
+     </TargetFrameworkSubset>
+@@ -92,4 +91,4 @@
+   <Target Name="AfterBuild">
+   </Target>
+   -->
+-</Project>
+\ No newline at end of file
++</Project>
+Index: openmcdf/src/OLECFSTest/OpenMcdfTest.csproj
+===================================================================
+--- openmcdf.orig/src/OLECFSTest/OpenMcdfTest.csproj	2012-05-04 09:58:59.701540236 +0200
++++ openmcdf/src/OLECFSTest/OpenMcdfTest.csproj	2012-05-04 09:59:17.893539581 +0200
+@@ -1,4 +1,4 @@
+-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+   <PropertyGroup>
+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+@@ -9,7 +9,6 @@
+     <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>OpenMcdfTest</RootNamespace>
+     <AssemblyName>OpenMcdfTest</AssemblyName>
+-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+     <FileAlignment>512</FileAlignment>
+     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+   </PropertyGroup>
+@@ -64,4 +63,4 @@
+   <Target Name="AfterBuild">
+   </Target>
+   -->
+-</Project>
+\ No newline at end of file
++</Project>

-- 
openmcdf