r97 - in trunk: . patches

[Martin Michlmayr]

Author: tbm
Date: 2006-01-26 14:59:44 +0000 (Thu, 26 Jan 2006)
New Revision: 97

Modified:
   trunk/changelog
   trunk/patches/13_locale_encoding.dpatch
Log:
Replace the patch with one from upstream.  The previous one led to broken
HTML generation.  Closes: #349945.


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2005-12-30 16:02:05 UTC (rev 96)
+++ trunk/changelog	2006-01-26 14:59:44 UTC (rev 97)
@@ -1,6 +1,9 @@
-bins (1.1.29-5) UNRELEASED; urgency=low
+bins (1.1.29-5) UNRELEASED; urgency=medium
 
   [ Martin Michlmayr ]
+  * debian/patches/13_locale_encoding.dpatch: Replace the patch with one
+    from upstream.  The previous one led to broken HTML generation.
+    Closes: #349945.
   * debian/watch: Fix URL and upgrade to version 3.
 
  -- Martin Michlmayr <tbm at cyrius.com>  Fri, 30 Dec 2005 17:01:37 +0100

Modified: trunk/patches/13_locale_encoding.dpatch
===================================================================
--- trunk/patches/13_locale_encoding.dpatch	2005-12-30 16:02:05 UTC (rev 96)
+++ trunk/patches/13_locale_encoding.dpatch	2006-01-26 14:59:44 UTC (rev 97)
@@ -1,24 +1,14 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 13_locale_encoding.dpatch by Don Armstrong <don at donarmstrong.com>
+## 13_locale_encoding.dpatch by Jérôme Sautret
 ##
 ## DP: convert latin-1 output to locale [#308111]
 
 @DPATCH@
+
 --- bins-1.1.29.orig/bins
 +++ bins-1.1.29/bins
-@@ -86,6 +86,10 @@
- #use Data::Dumper;
- #use XML::SAX::Expat;
+@@ -952,13 +952,23 @@
  
-+# 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";
@@ -29,18 +19,23 @@
 -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/)
++print "\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:
++Some parts of 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.
++print "See COPYING file for details.
 +
 +END
-+$copyright = decode('iso8859-1',$copyright);
++
++my $latin2localConverter;
++$latin2localConverter = Text::Iconv->new('latin1',
++$defaultConfig{defaultEncoding});
++$copyright = $latin2localConverter->convert($copyright);
 +print $copyright;
  
  # EVG (Evil Global Variables)
  # Some on them should be moved to the config hash so they can be
+