annotate debian/patches/08_fix_bins-edit-gui_encoding @ 6:3021deef1599

Encoding related fixes * chomp encoding string * reformat else (seems someone hacked it in) * debug print encoding * do not use :utf8 binmode ("re-encode") on written file if the input is _already_ UTF-8
author Peter Gervai <grin@grin.hu>
date Thu, 16 Oct 2008 00:02:14 +0200
parents c5749e43b1d7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
1 #! /bin/sh /usr/share/dpatch/dpatch-run
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
2 ## 08_fix_bins-edit-gui_encoding.dpatch by <rousseau@acer.maison.bogus>
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
3 ##
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
4 ## All lines beginning with `## DP:' are a description of the patch.
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
5 ## DP: No description.
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
6
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
7 @DPATCH@
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
8 --- bins-1.1.29.orig/bins-edit-gui
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
9 +++ bins-1.1.29/bins-edit-gui
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
10 @@ -121,10 +121,10 @@
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
11 # Solaris refers to ISO 646 as "646" but that is not a valid codeset
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
12 if (!$@ && $codeset && $codeset ne "ANSI_X3.4-1968" && $codeset ne "646") {
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
13 $localEncoding = $codeset;
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
14 - print "Forcing encoding to $codeset";
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
15 + print "Forcing encoding to $codeset\n";
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
16 }
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
17
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
18 -chop($localEncoding);
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
19 +chomp($localEncoding);
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
20 if (! $localEncoding) {
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
21 $localEncoding = "LATIN1";
c5749e43b1d7 Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff changeset
22 }