[Pkg-cli-apps-commits] [SCM] smuxi branch, master, updated. debian/0.8.9.2-2-5-g1d30b64

Mirco Bauer meebey at meebey.net
Sat Jun 30 15:22:53 UTC 2012 

The following commit has been merged in the master branch:
commit e5c10274e10a6115be145484e704a93c5b1cded1
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Jun 30 16:16:52 2012 +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 fbb74ac..6485a88 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	2011-06-26 02:31:01.000000000 +0200
-+++ smuxi/lib/Newtonsoft.Json/Src/Newtonsoft.Json/Newtonsoft.Json.csproj	2011-06-26 02:31:33.000000000 +0200
-@@ -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">
+--- 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
+@@ -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>
-@@ -40,7 +40,6 @@
-     <IsWebBootstrapper>false</IsWebBootstrapper>
-     <UseApplicationTrust>false</UseApplicationTrust>
-     <BootstrapperEnabled>true</BootstrapperEnabled>
--    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-   </PropertyGroup>
-   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-     <DebugSymbols>true</DebugSymbols>
+@@ -243,4 +243,4 @@
+     <EmbeddedResource Include="Dynamic.snk" />
+   </ItemGroup>
+   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+-</Project>
+\ No newline at end of file
++</Project>
diff --git a/debian/patches/build_Twitterizer2_with_default_compiler.patch b/debian/patches/build_Twitterizer2_with_default_compiler.patch
index a82e304..8245580 100644
--- a/debian/patches/build_Twitterizer2_with_default_compiler.patch
+++ b/debian/patches/build_Twitterizer2_with_default_compiler.patch
@@ -1,19 +1,11 @@
 Index: smuxi/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj
 ===================================================================
---- smuxi.orig/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj	2011-12-19 07:51:13.000000000 +0100
-+++ smuxi/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj	2011-12-21 08:13:11.000000000 +0100
+--- 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
 @@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.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>
-@@ -15,7 +15,6 @@
-     <FileUpgradeFlags>
-     </FileUpgradeFlags>
-     <OldToolsVersion>3.5</OldToolsVersion>
--    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-     <UpgradeBackupLocation />
-     <IsWebBootstrapper>false</IsWebBootstrapper>
-     <TargetFrameworkProfile>
diff --git a/debian/patches/build_db4o_with_default_compiler.patch b/debian/patches/build_db4o_with_default_compiler.patch
index 991bb48..de7cd4a 100644
--- a/debian/patches/build_db4o_with_default_compiler.patch
+++ b/debian/patches/build_db4o_with_default_compiler.patch
@@ -1,7 +1,7 @@
 Index: smuxi/lib/db4o-net/Db4objects.Db4o/Db4objects.Db4o-2008.csproj
 ===================================================================
---- smuxi.orig/lib/db4o-net/Db4objects.Db4o/Db4objects.Db4o-2008.csproj	2011-12-21 11:11:59.000000000 +0100
-+++ smuxi/lib/db4o-net/Db4objects.Db4o/Db4objects.Db4o-2008.csproj	2011-12-21 16:14:48.000000000 +0100
+--- smuxi.orig/lib/db4o-net/Db4objects.Db4o/Db4objects.Db4o-2008.csproj	2012-02-09 22:33:28.000000000 +0100
++++ smuxi/lib/db4o-net/Db4objects.Db4o/Db4objects.Db4o-2008.csproj	2012-06-30 16:12:13.000000000 +0200
 @@ -1,5 +1,5 @@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="3.5">
diff --git a/debian/patches/build_jabber-net_with_default_compiler.patch b/debian/patches/build_jabber-net_with_default_compiler.patch
index 28fa5ac..ebcd09a 100644
--- a/debian/patches/build_jabber-net_with_default_compiler.patch
+++ b/debian/patches/build_jabber-net_with_default_compiler.patch
@@ -1,18 +1,11 @@
 Index: smuxi/lib/jabber-net/2005-jabber-net.csproj
 ===================================================================
---- smuxi.orig/lib/jabber-net/2005-jabber-net.csproj	2011-12-19 08:02:59.000000000 +0100
-+++ smuxi/lib/jabber-net/2005-jabber-net.csproj	2011-12-21 08:16:36.000000000 +0100
-@@ -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">
+--- smuxi.orig/lib/jabber-net/2005-jabber-net.csproj	2012-06-30 16:06:14.000000000 +0200
++++ smuxi/lib/jabber-net/2005-jabber-net.csproj	2012-06-30 16:13:21.000000000 +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>
      <ProjectType>Local</ProjectType>
      <ProductVersion>8.0.50727</ProductVersion>
-@@ -27,7 +27,6 @@
-     <UpgradeBackupLocation>
-     </UpgradeBackupLocation>
-     <SignAssembly>true</SignAssembly>
--    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-   </PropertyGroup>
-   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-     <OutputPath>bin5\Debug\</OutputPath>
diff --git a/debian/patches/debian_default_settings.patch b/debian/patches/debian_default_settings.patch
index 0821799..4da88e1 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	2012-01-03 09:06:46.000000000 +0100
-+++ smuxi/src/Engine/Config/Config.cs	2012-01-03 09:06:55.000000000 +0100
-@@ -323,6 +323,7 @@
+--- smuxi.orig/src/Engine/Config/Config.cs	2012-06-30 16:06:14.000000000 +0200
++++ smuxi/src/Engine/Config/Config.cs	2012-06-30 16:13:36.000000000 +0200
+@@ -325,6 +325,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 28944ef..560b21a 100644
--- a/debian/patches/ubuntu_default_settings.patch
+++ b/debian/patches/ubuntu_default_settings.patch
@@ -1,8 +1,8 @@
-Index: git/src/Engine/Config/Config.cs
+Index: smuxi/src/Engine/Config/Config.cs
 ===================================================================
---- git.orig/src/Engine/Config/Config.cs	2011-03-20 16:25:10.000000000 +0100
-+++ git/src/Engine/Config/Config.cs	2011-03-20 16:25:10.000000000 +0100
-@@ -354,6 +354,12 @@
+--- smuxi.orig/src/Engine/Config/Config.cs	2012-06-30 16:14:04.000000000 +0200
++++ smuxi/src/Engine/Config/Config.cs	2012-06-30 16:16:33.000000000 +0200
+@@ -363,6 +363,12 @@
              Get(prefix + "Password", String.Empty);
              Get(prefix + "UseEncryption", false);
              Get(prefix + "ValidateServerCertificate", false);

-- 
smuxi

More information about the Pkg-cli-apps-commits mailing list