[Pkg-cli-libs-commits] [SCM] monogame branch, master, updated. upstream/2.5.1+dfsg-25-g3a2dc0a

[Jo Shields]

The following commit has been merged in the master branch:
commit 1b994fd6aa04a1172efb87abc0e0fc146086c004
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Jun 18 20:02:25 2012 +0100

    Fix patch conflict.

diff --git a/debian/patches/build_xml_documentation b/debian/patches/build_xml_documentation
index 022f4a3..4b0c12e 100644
--- a/debian/patches/build_xml_documentation
+++ b/debian/patches/build_xml_documentation
@@ -1,15 +1,8 @@
 Index: monogame/MonoGame.Framework/MonoGame.Framework.Linux.csproj
 ===================================================================
---- monogame.orig/MonoGame.Framework/MonoGame.Framework.Linux.csproj	2012-06-18 17:56:55.473852517 +0100
-+++ monogame/MonoGame.Framework/MonoGame.Framework.Linux.csproj	2012-06-18 17:56:58.009870653 +0100
-@@ -9,12 +9,13 @@
-     <OutputType>Library</OutputType>
-     <RootNamespace>MonoGame.Framework.Linux</RootNamespace>
-     <AssemblyName>MonoGame.Framework.Linux</AssemblyName>
--    <ReleaseVersion>2.5.0.0</ReleaseVersion>
-+    <ReleaseVersion>2.5.0.0</ReleaseVersion>
-     <SynchReleaseVersion>false</SynchReleaseVersion>
-   </PropertyGroup>
+--- monogame.orig/MonoGame.Framework/MonoGame.Framework.Linux.csproj	2012-06-18 20:01:28.000000000 +0100
++++ monogame/MonoGame.Framework/MonoGame.Framework.Linux.csproj	2012-06-18 20:02:03.590759217 +0100
+@@ -16,6 +16,7 @@
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
      <DebugSymbols>true</DebugSymbols>
      <DebugType>full</DebugType>
@@ -19,8 +12,8 @@ Index: monogame/MonoGame.Framework/MonoGame.Framework.Linux.csproj
      <DefineConstants>DEBUG;LINUX</DefineConstants>
 Index: monogame/ThirdParty/Lidgren.Network/Lidgren.Network.Linux.csproj
 ===================================================================
---- monogame.orig/ThirdParty/Lidgren.Network/Lidgren.Network.Linux.csproj	2012-06-18 17:56:55.457852398 +0100
-+++ monogame/ThirdParty/Lidgren.Network/Lidgren.Network.Linux.csproj	2012-06-18 17:57:07.133935918 +0100
+--- monogame.orig/ThirdParty/Lidgren.Network/Lidgren.Network.Linux.csproj	2012-06-18 20:01:25.000000000 +0100
++++ monogame/ThirdParty/Lidgren.Network/Lidgren.Network.Linux.csproj	2012-06-18 20:01:33.594519858 +0100
 @@ -24,19 +24,19 @@
      </FileUpgradeFlags>
      <UpgradeBackupLocation>

-- 
monogame