[Pkg-cli-apps-commits] [SCM] pinta branch, master, updated. debian/1.0-1-4-g097fcff

Iain Lane laney at debian.org
Wed Jun 1 17:46:10 UTC 2011 

The following commit has been merged in the master branch:
commit 22d952c792b54eb76b2b081c480a54707de5c55c
Author: Iain Lane <laney at debian.org>
Date:   Wed Jun 1 17:52:08 2011 +0100

    Alter BDs and patches so we can build against both 2.0 and 4.0

diff --git a/debian/control b/debian/control
index 0261231..f3830d6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Iain Lane <laney at debian.org>, Maia Kozheva <sikon at ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50~), 
-               cli-common-dev (>= 0.8~),
-Build-Depends-Indep: mono-devel (>= 2.10),
-                     mono-xbuild (>= 2.10),
+               cli-common-dev (>= 0.5.7~),
+Build-Depends-Indep: mono-devel (>= 2.4.3),
+                     mono-xbuild (>= 2.4.3),
                      libgtk2.0-cil-dev,
                      libglade2.0-cil-dev,
 Standards-Version: 3.9.2
diff --git a/debian/patches/targetframeworkversion-4.0 b/debian/patches/remove-targetversion
similarity index 54%
rename from debian/patches/targetframeworkversion-4.0
rename to debian/patches/remove-targetversion
index d14f67f..444c8e7 100644
--- a/debian/patches/targetframeworkversion-4.0
+++ b/debian/patches/remove-targetversion
@@ -1,78 +1,72 @@
-Index: pinta.git/Pinta.Core/Pinta.Core.csproj
+Index: pinta/Pinta.Core/Pinta.Core.csproj
 ===================================================================
---- pinta.git.orig/Pinta.Core/Pinta.Core.csproj	2011-04-27 10:10:17.582761957 +0100
-+++ pinta.git/Pinta.Core/Pinta.Core.csproj	2011-04-27 10:09:50.803802723 +0100
-@@ -9,7 +9,7 @@
+--- pinta.orig/Pinta.Core/Pinta.Core.csproj	2011-06-01 17:43:26.488192395 +0100
++++ pinta/Pinta.Core/Pinta.Core.csproj	2011-06-01 17:45:35.103177074 +0100
+@@ -9,7 +9,6 @@
      <OutputType>Library</OutputType>
      <RootNamespace>Pinta.Core</RootNamespace>
      <AssemblyName>Pinta.Core</AssemblyName>
 -    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
      <CodePage>65001</CodePage>
      <FileUpgradeFlags>
      </FileUpgradeFlags>
-Index: pinta.git/Pinta.Effects/Pinta.Effects.csproj
+Index: pinta/Pinta.Effects/Pinta.Effects.csproj
 ===================================================================
---- pinta.git.orig/Pinta.Effects/Pinta.Effects.csproj	2011-04-27 10:10:14.152895261 +0100
-+++ pinta.git/Pinta.Effects/Pinta.Effects.csproj	2011-04-27 10:09:50.813802334 +0100
-@@ -10,7 +10,7 @@
+--- pinta.orig/Pinta.Effects/Pinta.Effects.csproj	2011-06-01 17:43:26.448193955 +0100
++++ pinta/Pinta.Effects/Pinta.Effects.csproj	2011-06-01 17:45:35.103177074 +0100
+@@ -10,7 +10,6 @@
      <AppDesignerFolder>Properties</AppDesignerFolder>
      <RootNamespace>Pinta.Effects</RootNamespace>
      <AssemblyName>Pinta.Effects</AssemblyName>
 -    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
      <FileAlignment>512</FileAlignment>
      <FileUpgradeFlags>
      </FileUpgradeFlags>
-Index: pinta.git/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj
+Index: pinta/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj
 ===================================================================
---- pinta.git.orig/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj	2011-04-27 10:10:14.412885156 +0100
-+++ pinta.git/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj	2011-04-27 10:09:50.843801168 +0100
-@@ -9,7 +9,7 @@
+--- pinta.orig/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj	2011-06-01 17:43:26.458193565 +0100
++++ pinta/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj	2011-06-01 17:45:35.103177074 +0100
+@@ -9,7 +9,6 @@
      <OutputType>Library</OutputType>
      <RootNamespace>Pinta.Gui.Widgets</RootNamespace>
      <AssemblyName>Pinta.Gui.Widgets</AssemblyName>
 -    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
      <CodePage>65001</CodePage>
      <FileUpgradeFlags>
      </FileUpgradeFlags>
-Index: pinta.git/Pinta/Pinta.csproj
+Index: pinta/Pinta/Pinta.csproj
 ===================================================================
---- pinta.git.orig/Pinta/Pinta.csproj	2011-04-27 10:10:18.582723093 +0100
-+++ pinta.git/Pinta/Pinta.csproj	2011-04-27 10:09:50.793803112 +0100
-@@ -9,7 +9,7 @@
+--- pinta.orig/Pinta/Pinta.csproj	2011-06-01 17:43:26.518191225 +0100
++++ pinta/Pinta/Pinta.csproj	2011-06-01 17:45:35.103177074 +0100
+@@ -9,7 +9,6 @@
      <OutputType>WinExe</OutputType>
      <RootNamespace>Pinta</RootNamespace>
      <AssemblyName>Pinta</AssemblyName>
 -    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
      <CodePage>65001</CodePage>
      <StartupObject>
      </StartupObject>
-Index: pinta.git/Pinta.Resources/Pinta.Resources.csproj
+Index: pinta/Pinta.Resources/Pinta.Resources.csproj
 ===================================================================
---- pinta.git.orig/Pinta.Resources/Pinta.Resources.csproj	2011-04-27 10:10:17.812753019 +0100
-+++ pinta.git/Pinta.Resources/Pinta.Resources.csproj	2011-04-27 10:09:50.853800780 +0100
-@@ -9,7 +9,7 @@
+--- pinta.orig/Pinta.Resources/Pinta.Resources.csproj	2011-06-01 17:43:26.498192005 +0100
++++ pinta/Pinta.Resources/Pinta.Resources.csproj	2011-06-01 17:45:35.103177074 +0100
+@@ -9,7 +9,6 @@
      <OutputType>Library</OutputType>
      <RootNamespace>Pinta.Resources</RootNamespace>
      <AssemblyName>Pinta.Resources</AssemblyName>
 -    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
      <CodePage>65001</CodePage>
      <FileUpgradeFlags>
      </FileUpgradeFlags>
-Index: pinta.git/Pinta.Tools/Pinta.Tools.csproj
+Index: pinta/Pinta.Tools/Pinta.Tools.csproj
 ===================================================================
---- pinta.git.orig/Pinta.Tools/Pinta.Tools.csproj	2011-04-27 10:10:14.622876995 +0100
-+++ pinta.git/Pinta.Tools/Pinta.Tools.csproj	2011-04-27 10:09:50.863800392 +0100
-@@ -10,7 +10,7 @@
+--- pinta.orig/Pinta.Tools/Pinta.Tools.csproj	2011-06-01 17:43:26.468193175 +0100
++++ pinta/Pinta.Tools/Pinta.Tools.csproj	2011-06-01 17:45:35.103177074 +0100
+@@ -10,7 +10,6 @@
      <AppDesignerFolder>Properties</AppDesignerFolder>
      <RootNamespace>Pinta.Tools</RootNamespace>
      <AssemblyName>Pinta.Tools</AssemblyName>
 -    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
      <FileAlignment>512</FileAlignment>
      <FileUpgradeFlags>
      </FileUpgradeFlags>
diff --git a/debian/patches/series b/debian/patches/series
index 031e993..f22554b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-targetframeworkversion-4.0
-use-4.0-libs
+remove-targetversion
+unversion-lib-references
diff --git a/debian/patches/use-4.0-libs b/debian/patches/unversion-lib-references
similarity index 69%
rename from debian/patches/use-4.0-libs
rename to debian/patches/unversion-lib-references
index 4e38db9..996abe7 100644
--- a/debian/patches/use-4.0-libs
+++ b/debian/patches/unversion-lib-references
@@ -1,25 +1,25 @@
-Index: pinta.git/Pinta.Effects/Pinta.Effects.csproj
+Index: pinta/Pinta.Effects/Pinta.Effects.csproj
 ===================================================================
---- pinta.git.orig/Pinta.Effects/Pinta.Effects.csproj	2011-04-28 23:53:24.269685511 +0100
-+++ pinta.git/Pinta.Effects/Pinta.Effects.csproj	2011-04-28 23:53:37.279176774 +0100
+--- pinta.orig/Pinta.Effects/Pinta.Effects.csproj	2011-06-01 17:50:56.060661764 +0100
++++ pinta/Pinta.Effects/Pinta.Effects.csproj	2011-06-01 17:50:56.080660984 +0100
 @@ -1,4 +1,4 @@
 -<?xml version="1.0" encoding="utf-8"?>
 +<?xml version="1.0" encoding="utf-8"?>
  <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <PropertyGroup>
      <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-@@ -58,8 +58,8 @@
+@@ -57,8 +57,8 @@
      <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
      <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
      <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
 -    <Reference Include="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
 -    <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-+    <Reference Include="Mono.Cairo, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-+    <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
++    <Reference Include="Mono.Cairo" />
++    <Reference Include="Mono.Posix" />
      <Reference Include="System" />
      <Reference Include="System.Core">
        <RequiredTargetFramework>3.5</RequiredTargetFramework>
-@@ -160,4 +160,4 @@
+@@ -159,4 +159,4 @@
        <Install>true</Install>
      </BootstrapperPackage>
    </ItemGroup>

-- 
pinta

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