[Pkg-cli-apps-commits] [SCM] pinta branch, master, updated. upstream/0.2-10-gcafc07e

Iain Lane laney at ubuntu.com
Sun Mar 14 15:09:58 UTC 2010 

The following commit has been merged in the master branch:
commit cafc07e181bcabe048142965d1392a854b722e32
Author: Iain Lane <laney at ubuntu.com>
Date:   Sun Mar 14 14:48:56 2010 +0000

    Add patch to have source files always treated as unicode
    
    * debian/patches/force_unicode: Patch upstream .csproj files to
      unconditionally treat source files as unicode, otherwise this is dependent
      on build locale. As some of the source files contain unicode characters,
      allowing this behaviour meant that some strings in the application did not
      display correctly.

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..5dde0bf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,58 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+                break
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
diff --git a/debian/changelog b/debian/changelog
index db5f742..59a61f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 pinta (0.2-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #569171)
+  * debian/patches/force_unicode: Patch upstream .csproj files to
+    unconditionally treat source files as unicode, otherwise this is dependent
+    on build locale. As some of the source files contain unicode characters,
+    allowing this behaviour meant that some strings in the application did not
+    display correctly.
 
  -- Iain Lane <laney at ubuntu.com>  Fri, 19 Feb 2010 15:36:37 +0000
diff --git a/debian/control b/debian/control
index 7a08126..7d54475 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: cli-mono
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Iain Lane <laney at ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50~), cli-common-dev (>= 0.5.7)
+Build-Depends: debhelper (>= 7.0.50~), cli-common-dev (>= 0.5.7), quilt (>= 0.46-7~)
 Build-Depends-Indep: mono-devel (>= 2.4.3),
                      mono-xbuild (>= 2.4.3),
                      libgtk2.0-cil-dev
diff --git a/debian/patches/force_unicode b/debian/patches/force_unicode
new file mode 100644
index 0000000..7bafcd8
--- /dev/null
+++ b/debian/patches/force_unicode
@@ -0,0 +1,67 @@
+Description: Force source files to be treated as unicode
+Origin: vendor, Debian
+Author: Iain Lane <laney at ubuntu.com>
+Last-Updated: 2010-03-14
+
+Index: pinta.git/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj
+===================================================================
+--- pinta.git.orig/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj	2010-03-13 18:20:01.547274363 +0000
++++ pinta.git/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj	2010-03-14 14:42:45.086023080 +0000
+@@ -10,6 +10,7 @@
+     <RootNamespace>Pinta.Gui.Widgets</RootNamespace>
+     <AssemblyName>Pinta.Gui.Widgets</AssemblyName>
+     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
++    <CodePage>65001</CodePage>
+   </PropertyGroup>
+   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+     <DebugSymbols>true</DebugSymbols>
+@@ -55,4 +56,4 @@
+     <Compile Include="Dialogs\SimpleEffectDialog.cs" />
+   </ItemGroup>
+   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+-</Project>
+\ No newline at end of file
++</Project>
+Index: pinta.git/Pinta/Pinta.csproj
+===================================================================
+--- pinta.git.orig/Pinta/Pinta.csproj	2010-03-13 18:20:01.557272951 +0000
++++ pinta.git/Pinta/Pinta.csproj	2010-03-14 14:42:45.086023080 +0000
+@@ -10,6 +10,7 @@
+     <RootNamespace>Pinta</RootNamespace>
+     <AssemblyName>Pinta</AssemblyName>
+     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
++    <CodePage>65001</CodePage>
+   </PropertyGroup>
+   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+     <DebugSymbols>true</DebugSymbols>
+Index: pinta.git/Pinta.Resources/Pinta.Resources.csproj
+===================================================================
+--- pinta.git.orig/Pinta.Resources/Pinta.Resources.csproj	2010-03-13 18:20:01.547274363 +0000
++++ pinta.git/Pinta.Resources/Pinta.Resources.csproj	2010-03-14 14:42:45.086023080 +0000
+@@ -10,6 +10,7 @@
+     <RootNamespace>Pinta.Resources</RootNamespace>
+     <AssemblyName>Pinta.Resources</AssemblyName>
+     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
++    <CodePage>65001</CodePage>
+   </PropertyGroup>
+   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+     <DebugSymbols>true</DebugSymbols>
+@@ -325,4 +326,4 @@
+     </EmbeddedResource>
+   </ItemGroup>
+   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+-</Project>
+\ No newline at end of file
++</Project>
+Index: pinta.git/Pinta.Core/Pinta.Core.csproj
+===================================================================
+--- pinta.git.orig/Pinta.Core/Pinta.Core.csproj	2010-03-14 14:42:50.747273667 +0000
++++ pinta.git/Pinta.Core/Pinta.Core.csproj	2010-03-14 14:42:54.436023126 +0000
+@@ -10,6 +10,7 @@
+     <RootNamespace>Pinta.Core</RootNamespace>
+     <AssemblyName>Pinta.Core</AssemblyName>
+     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
++    <CodePage>65001</CodePage>
+   </PropertyGroup>
+   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+     <DebugSymbols>true</DebugSymbols>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d81f15c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+force_unicode
diff --git a/debian/rules b/debian/rules
index 2b5ee35..9a4d1ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cli-common/cli.make
+include /usr/share/quilt/quilt.make
 
 override_dh_auto_build:
 	xbuild $(CURDIR)/Pinta.sln
@@ -17,4 +18,4 @@ override_dh_auto_clean:
 	$(CURDIR)/bin/
 
 %:
-	dh $@
+	dh --with quilt $@

-- 
pinta

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