r91 - in trunk: . patches

[Martin Michlmayr]

Author: tbm
Date: 2005-11-04 21:07:29 +0000 (Fri, 04 Nov 2005)
New Revision: 91

Added:
   trunk/patches/13_locale_encoding.dpatch
Modified:
   trunk/changelog
   trunk/patches/00list
Log:
Don't simply output Latin-1 text but convert it to the locale; thanks to
Don Armstrong for the patch.  Closes: #308111.


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2005-11-04 19:03:14 UTC (rev 90)
+++ trunk/changelog	2005-11-04 21:07:29 UTC (rev 91)
@@ -14,6 +14,9 @@
   * debian/patches/12_optional_xml_elements.dpatch: Make XML elements
     optional and check whether the XML files are valid bins files.
     Closes: #308338.
+  * debian/patches/13_locale_encoding.dpatch: Don't simply output Latin-1
+    text but convert it to the locale; thanks to Don Armstrong for the
+    patch.  Closes: #308111.
 
  -- Martin Michlmayr <tbm at cyrius.com>  Sat, 15 Oct 2005 20:49:21 +0100
 

Modified: trunk/patches/00list
===================================================================
--- trunk/patches/00list	2005-11-04 19:03:14 UTC (rev 90)
+++ trunk/patches/00list	2005-11-04 21:07:29 UTC (rev 91)
@@ -7,3 +7,4 @@
 10_symlinks_movies
 11_check_template_style
 12_optional_xml_elements
+13_locale_encoding

Added: trunk/patches/13_locale_encoding.dpatch
===================================================================
--- trunk/patches/13_locale_encoding.dpatch	2005-11-04 19:03:14 UTC (rev 90)
+++ trunk/patches/13_locale_encoding.dpatch	2005-11-04 21:07:29 UTC (rev 91)
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_locale_encoding.dpatch by Don Armstrong <don at donarmstrong.com>
+##
+## DP: convert latin-1 output to locale [#308111]
+
+ at DPATCH@
+--- bins-1.1.29.orig/bins
++++ bins-1.1.29/bins
+@@ -86,6 +86,10 @@
+ #use Data::Dumper;
+ #use XML::SAX::Expat;
+ 
++# Encoding Handling
++use Encode;
++use open ':locale';
++
+ sub have_package;
+ sub _; # alias for Getext, if present
+ 
+@@ -952,13 +956,19 @@
+ 
+ sub write_htaccess;
+ 
+-print "\nBINS Photo Album 1.1.29 (http://bins.sautret.org/)\n";
+-print "Copyright © 2001-2004 Jérôme Sautret (Jerome\@Sautret.org)\n";
+-print "Some parts of code:\n";
+-print "Copyright © 2000 Brendan McMahan (mcmahahb\@whitman.edu)\n";
+-print "Copyright ©      John Moose (moosejc\@muohio.edu)\n\n";
+-print "This is free software with ABSOLUTELY NO WARRANTY.\n";
+-print "See COPYING file for details.\n\n";
++my $copyright=<<END;
++\nBINS Photo Album 1.1.29 (http://bins.sautret.org/)
++Copyright © 2001-2004 Jérôme Sautret (Jerome\@Sautret.org)
++Some parts of the code:
++Copyright © 2000 Brendan McMahan (mcmahahb\@whitman.edu)
++Copyright ©      John Moose (moosejc\@muohio.edu)
++
++This is free software with ABSOLUTELY NO WARRANTY.
++See COPYING file for details.
++
++END
++$copyright = decode('iso8859-1',$copyright);
++print $copyright;
+ 
+ # EVG (Evil Global Variables)
+ # Some on them should be moved to the config hash so they can be