[Pkg-cli-apps-commits] [SCM] smuxi branch, master, updated. debian/0.8.10.2-1-8-gf658a59

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 6d2b95a458dceecdb3a76b1db90fa9fd666361f1
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat May 25 21:37:31 2013 +0200

    Refreshed patches

diff --git a/debian/patches/build_Newtonsoft.Json_with_default_compiler.patch b/debian/patches/build_Newtonsoft.Json_with_default_compiler.patch
index 6485a88..c31eafe 100644
--- a/debian/patches/build_Newtonsoft.Json_with_default_compiler.patch
+++ b/debian/patches/build_Newtonsoft.Json_with_default_compiler.patch
@@ -1,18 +1,18 @@
 Index: smuxi/lib/Newtonsoft.Json/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
 ===================================================================
---- smuxi.orig/lib/Newtonsoft.Json/Src/Newtonsoft.Json/Newtonsoft.Json.csproj	2012-06-30 16:06:14.000000000 +0200
-+++ smuxi/lib/Newtonsoft.Json/Src/Newtonsoft.Json/Newtonsoft.Json.csproj	2012-06-30 16:10:25.000000000 +0200
+--- smuxi.orig/lib/Newtonsoft.Json/Src/Newtonsoft.Json/Newtonsoft.Json.csproj	2013-05-25 21:34:12.041270721 +0200
++++ smuxi/lib/Newtonsoft.Json/Src/Newtonsoft.Json/Newtonsoft.Json.csproj	2013-05-25 21:34:46.601271455 +0200
 @@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   <PropertyGroup>
-     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -243,4 +243,4 @@
-     <EmbeddedResource Include="Dynamic.snk" />
-   </ItemGroup>
-   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <?xml version="1.0" encoding="utf-8"?>
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+   <PropertyGroup>
+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+@@ -274,4 +274,4 @@
+   </ItemGroup>
+   <ItemGroup />
+   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 -</Project>
 \ No newline at end of file
-+</Project>
++</Project>
diff --git a/debian/patches/build_Twitterizer2_with_default_compiler.patch b/debian/patches/build_Twitterizer2_with_default_compiler.patch
index 8245580..77e880d 100644
--- a/debian/patches/build_Twitterizer2_with_default_compiler.patch
+++ b/debian/patches/build_Twitterizer2_with_default_compiler.patch
@@ -1,11 +1,18 @@
 Index: smuxi/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj
 ===================================================================
---- smuxi.orig/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj	2012-06-30 16:06:14.000000000 +0200
-+++ smuxi/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj	2012-06-30 16:11:57.000000000 +0200
+--- smuxi.orig/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj	2013-05-25 21:35:17.405272110 +0200
++++ smuxi/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj	2013-05-25 21:35:30.945272398 +0200
 @@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+ <?xml version="1.0" encoding="utf-8"?>
+-<Project ToolsVersion="4.0" 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>
+@@ -362,4 +362,4 @@
+       <Name>Newtonsoft.Json</Name>
+     </ProjectReference>
+   </ItemGroup>
+-</Project>
+\ No newline at end of file
++</Project>
diff --git a/debian/patches/debian_default_settings.patch b/debian/patches/debian_default_settings.patch
index 727a201..2c12a0a 100644
--- a/debian/patches/debian_default_settings.patch
+++ b/debian/patches/debian_default_settings.patch
@@ -1,8 +1,8 @@
 Index: smuxi/src/Engine/Config/Config.cs
 ===================================================================
---- smuxi.orig/src/Engine/Config/Config.cs	2013-05-15 20:09:40.014101882 +0200
-+++ smuxi/src/Engine/Config/Config.cs	2013-05-15 20:09:40.010101882 +0200
-@@ -331,6 +331,7 @@
+--- smuxi.orig/src/Engine/Config/Config.cs	2013-05-25 21:35:40.073272592 +0200
++++ smuxi/src/Engine/Config/Config.cs	2013-05-25 21:35:40.069272592 +0200
+@@ -332,6 +332,7 @@
              Get(prefix + "OnConnectCommands",
                  new string[] {
                      "/join #smuxi",
diff --git a/debian/patches/ubuntu_default_settings.patch b/debian/patches/ubuntu_default_settings.patch
index 34245c8..3a39672 100644
--- a/debian/patches/ubuntu_default_settings.patch
+++ b/debian/patches/ubuntu_default_settings.patch
@@ -1,8 +1,8 @@
 Index: smuxi/src/Engine/Config/Config.cs
 ===================================================================
---- smuxi.orig/src/Engine/Config/Config.cs	2013-05-15 20:11:07.638103744 +0200
-+++ smuxi/src/Engine/Config/Config.cs	2013-05-15 20:11:07.634103744 +0200
-@@ -369,6 +369,12 @@
+--- smuxi.orig/src/Engine/Config/Config.cs	2013-05-25 21:37:09.157274485 +0200
++++ smuxi/src/Engine/Config/Config.cs	2013-05-25 21:37:09.157274485 +0200
+@@ -379,6 +379,12 @@
              Get(prefix + "Password", String.Empty);
              Get(prefix + "UseEncryption", false);
              Get(prefix + "ValidateServerCertificate", false);

-- 
smuxi