[Pkg-cli-apps-commits] [SCM] smuxi branch, master, updated. debian/0.8-8-9-g7373915

Mirco Bauer meebey at meebey.net
Tue Jan 3 08:28:28 UTC 2012 

The following commit has been merged in the master branch:
commit 1d7d8635fffcf72d03d01c2b77cdf40733ed4c36
Author: Mirco Bauer <meebey at meebey.net>
Date:   Tue Jan 3 09:05:06 2012 +0100

    Updated patches to build with the system default compiler

diff --git a/debian/patches/build_Twitterizer2_with_default_compiler.patch b/debian/patches/build_Twitterizer2_with_default_compiler.patch
index 7396806..a82e304 100644
--- a/debian/patches/build_Twitterizer2_with_default_compiler.patch
+++ b/debian/patches/build_Twitterizer2_with_default_compiler.patch
@@ -1,12 +1,19 @@
 Index: smuxi/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj
 ===================================================================
---- smuxi.orig/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj	2011-06-26 03:02:29.000000000 +0200
-+++ smuxi/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj	2011-06-26 03:02:29.000000000 +0200
-@@ -10,7 +10,6 @@
-     <AppDesignerFolder>Properties</AppDesignerFolder>
-     <RootNamespace>Twitterizer</RootNamespace>
-     <AssemblyName>Twitterizer2</AssemblyName>
--    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-     <FileAlignment>512</FileAlignment>
-     <AssemblyOriginatorKeyFile>Twitterizer2.snk</AssemblyOriginatorKeyFile>
+--- 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
+@@ -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">
++<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
new file mode 100644
index 0000000..991bb48
--- /dev/null
+++ b/debian/patches/build_db4o_with_default_compiler.patch
@@ -0,0 +1,30 @@
+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
+@@ -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">
++<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+   <PropertyGroup>
+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+@@ -10,7 +10,6 @@
+     <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>Db4objects.Db4o</RootNamespace>
+     <AssemblyName>Db4objects.Db4o</AssemblyName>
+-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+     <FileAlignment>512</FileAlignment>
+     
+     
+@@ -61,9 +60,7 @@
+   </PropertyGroup>
+   <ItemGroup>
+     <Reference Include="System"/>
+-    <Reference Include="System.Core">
+-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+-    </Reference>
++    <Reference Include="System.Core" />
+     <Reference Include="System.Data"/>
+     <Reference Include="System.Xml"/>
+   </ItemGroup>
diff --git a/debian/patches/build_jabber-net_with_default_compiler.patch b/debian/patches/build_jabber-net_with_default_compiler.patch
new file mode 100644
index 0000000..28fa5ac
--- /dev/null
+++ b/debian/patches/build_jabber-net_with_default_compiler.patch
@@ -0,0 +1,18 @@
+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">
+   <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 74a5b2c..0821799 100644
--- a/debian/patches/debian_default_settings.patch
+++ b/debian/patches/debian_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:24:08.000000000 +0100
-+++ git/src/Engine/Config/Config.cs	2011-03-20 16:24:22.000000000 +0100
-@@ -315,6 +315,7 @@
+--- 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 @@
              Get(prefix + "OnConnectCommands",
                  new string[] {
                      "/join #smuxi",
diff --git a/debian/patches/series b/debian/patches/series
index 51775fd..b127b5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 build_Newtonsoft.Json_with_default_compiler.patch
 build_Twitterizer2_with_default_compiler.patch
+build_db4o_with_default_compiler.patch
+build_jabber-net_with_default_compiler.patch
 debian_default_settings.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 7ea5cbb..21225a5 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -1,3 +1,5 @@
 build_Newtonsoft.Json_with_default_compiler.patch
 build_Twitterizer2_with_default_compiler.patch
+build_db4o_with_default_compiler.patch
+build_jabber-net_with_default_compiler.patch
 ubuntu_default_settings.patch

-- 
smuxi

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