Mercurial > bins
annotate debian/patches/13_locale_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 |
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 ## 13_locale_encoding.dpatch by J?r?me Sautret |
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 ## DP: convert latin-1 output to locale [#308111] |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
5 |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
6 @DPATCH@ |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
7 |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
8 --- bins-1.1.29.orig/bins |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
9 +++ bins-1.1.29/bins |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
10 @@ -952,13 +952,23 @@ |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
11 |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
12 sub write_htaccess; |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
13 |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
14 -print "\nBINS Photo Album 1.1.29 (http://bins.sautret.org/)\n"; |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
15 -print "Copyright ? 2001-2004 J?r?me Sautret (Jerome\@Sautret.org)\n"; |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
16 -print "Some parts of code:\n"; |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
17 -print "Copyright ? 2000 Brendan McMahan (mcmahahb\@whitman.edu)\n"; |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
18 -print "Copyright ? John Moose (moosejc\@muohio.edu)\n\n"; |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
19 -print "This is free software with ABSOLUTELY NO WARRANTY.\n"; |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
20 -print "See COPYING file for details.\n\n"; |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
21 +my $copyright=<<END; |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
22 +BINS Photo Album 1.1.29 (http://bins.sautret.org/) |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
23 +Copyright ? 2001-2004 J?r?me Sautret (Jerome\@Sautret.org) |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
24 +Some parts of code: |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
25 +Copyright ? 2000 Brendan McMahan (mcmahahb\@whitman.edu) |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
26 +Copyright ? John Moose (moosejc\@muohio.edu) |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
27 + |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
28 +This is free software with ABSOLUTELY NO WARRANTY. |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
29 +See COPYING file for details. |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
30 + |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
31 +END |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
32 + |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
33 +my $latin2localConverter; |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
34 +$latin2localConverter = Text::Iconv->new('latin1', |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
35 +$defaultConfig{defaultEncoding}); |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
36 +$copyright = $latin2localConverter->convert($copyright); |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
37 +print $copyright; |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
38 |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
39 # EVG (Evil Global Variables) |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
40 # Some on them should be moved to the config hash so they can be |