[Pkg-cli-libs-commits] [SCM] db4o branch, master, updated. debian/7.4.121.14026+dfsg-3-22-g8e3de09

[Jo Shields]

The following commit has been merged in the master branch:
commit e73beb49e7732ae6b09f7b46f0772f28bdddc0f8
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Aug 14 19:30:35 2011 +0100

    Refresh Mono.Options patch due to changes in the related csproj file.

diff --git a/debian/patches/port_options_code_to_Mono.Options.patch b/debian/patches/port_options_code_to_Mono.Options.patch
index 6eb4a75..106ac2c 100644
--- a/debian/patches/port_options_code_to_Mono.Options.patch
+++ b/debian/patches/port_options_code_to_Mono.Options.patch
@@ -1,7 +1,7 @@
 Index: db4o/src/Db4oTool/Db4oTool/ProgramOptions.cs
 ===================================================================
---- db4o.orig/src/Db4oTool/Db4oTool/ProgramOptions.cs	2011-08-14 17:29:05.000000000 +0100
-+++ db4o/src/Db4oTool/Db4oTool/ProgramOptions.cs	2011-08-14 17:30:09.000000000 +0100
+--- db4o.orig/src/Db4oTool/Db4oTool/ProgramOptions.cs	2011-08-14 18:40:21.000000000 +0100
++++ db4o/src/Db4oTool/Db4oTool/ProgramOptions.cs	2011-08-14 19:29:51.000000000 +0100
 @@ -13,152 +13,98 @@
  
  You should have received a copy of the GNU General Public License along
@@ -253,8 +253,8 @@ Index: db4o/src/Db4oTool/Db4oTool/ProgramOptions.cs
 +}
 Index: db4o/src/Db4oTool/Db4oTool/Properties/AssemblyInfo.cs
 ===================================================================
---- db4o.orig/src/Db4oTool/Db4oTool/Properties/AssemblyInfo.cs	2011-08-14 17:29:05.000000000 +0100
-+++ db4o/src/Db4oTool/Db4oTool/Properties/AssemblyInfo.cs	2011-08-14 17:30:09.000000000 +0100
+--- db4o.orig/src/Db4oTool/Db4oTool/Properties/AssemblyInfo.cs	2011-08-14 18:40:21.000000000 +0100
++++ db4o/src/Db4oTool/Db4oTool/Properties/AssemblyInfo.cs	2011-08-14 19:29:51.000000000 +0100
 @@ -15,7 +15,7 @@
  with this program.  If not, see http://www.gnu.org/licenses/. */
  using System.Reflection;
@@ -285,11 +285,11 @@ Index: db4o/src/Db4oTool/Db4oTool/Properties/AssemblyInfo.cs
 +#endif
 Index: db4o/src/Db4oTool/Db4oTool/Db4oTool-2010.csproj
 ===================================================================
---- db4o.orig/src/Db4oTool/Db4oTool/Db4oTool-2010.csproj	2011-08-14 17:30:27.000000000 +0100
-+++ db4o/src/Db4oTool/Db4oTool/Db4oTool-2010.csproj	2011-08-14 17:31:03.000000000 +0100
+--- db4o.orig/src/Db4oTool/Db4oTool/Db4oTool-2010.csproj	2011-08-14 19:29:46.000000000 +0100
++++ db4o/src/Db4oTool/Db4oTool/Db4oTool-2010.csproj	2011-08-14 19:29:51.000000000 +0100
 @@ -88,10 +88,6 @@
        <SpecificVersion>False</SpecificVersion>
-       <HintPath>..\..\Libs\net-2.0\Mono.Cecil.Pdb.dll</HintPath>
+       <HintPath>/usr/lib/mono-cecil/Mono.Cecil.Pdb.dll</HintPath>
      </Reference>
 -    <Reference Include="Mono.GetOptions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
 -      <SpecificVersion>False</SpecificVersion>
@@ -306,21 +306,3 @@ Index: db4o/src/Db4oTool/Db4oTool/Db4oTool-2010.csproj
      <Compile Include="Core\AbstractAssemblyInstrumentation.cs"/>
      <Compile Include="Core\ByAttributeFilter.cs"/>
      <Compile Include="Core\ByNameFilter.cs"/>
-@@ -189,11 +186,11 @@
-     </ProjectReference>
-   </ItemGroup>
-   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets"/>
--  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--       Other similar extension points exist, see Microsoft.Common.targets.
--  <Target Name="BeforeBuild">
--  </Target>
--  <Target Name="AfterBuild">
--  </Target>
-+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-+       Other similar extension points exist, see Microsoft.Common.targets.
-+  <Target Name="BeforeBuild">
-+  </Target>
-+  <Target Name="AfterBuild">
-+  </Target>
-   -->
- </Project>

-- 
db4o