r81 - in trunk: . patches

[Ludovic Rousseau]

Author: rousseau
Date: 2005-10-15 14:32:23 +0000 (Sat, 15 Oct 2005)
New Revision: 81

Added:
   trunk/patches/08_fix_bins-edit-gui_encoding.dpatch
Modified:
   trunk/changelog
   trunk/patches/00list
Log:
Closes: #322938 "bins-edit-gui mishandles locale settings"


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2005-10-15 13:30:24 UTC (rev 80)
+++ trunk/changelog	2005-10-15 14:32:23 UTC (rev 81)
@@ -2,6 +2,8 @@
 
   [ Ludovic Rousseau ]
   * debian/control: Standards-Version: 3.6.1 -> 3.6.2: no changes
+  * debian/patches/08_fix_bins-edit-gui_encoding.dpatch: Closes: #322938
+    "bins-edit-gui mishandles locale settings"
 
  -- Ludovic Rousseau <rousseau at debian.org>  Sat, 15 Oct 2005 15:27:56 +0200
 

Modified: trunk/patches/00list
===================================================================
--- trunk/patches/00list	2005-10-15 13:30:24 UTC (rev 80)
+++ trunk/patches/00list	2005-10-15 14:32:23 UTC (rev 81)
@@ -2,3 +2,4 @@
 05_share-man
 06_doc_bins.sgml
 07_fix_share
+08_fix_bins-edit-gui_encoding

Added: trunk/patches/08_fix_bins-edit-gui_encoding.dpatch
===================================================================
--- trunk/patches/08_fix_bins-edit-gui_encoding.dpatch	2005-10-15 13:30:24 UTC (rev 80)
+++ trunk/patches/08_fix_bins-edit-gui_encoding.dpatch	2005-10-15 14:32:23 UTC (rev 81)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_fix_bins-edit-gui_encoding.dpatch by  <rousseau at acer.maison.bogus>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bins-1.1.29~/bins-edit-gui bins-1.1.29/bins-edit-gui
+--- bins-1.1.29~/bins-edit-gui	2005-08-25 00:07:05.000000000 +0200
++++ bins-1.1.29/bins-edit-gui	2005-10-15 16:29:14.000000000 +0200
+@@ -121,10 +121,10 @@
+ # Solaris refers to ISO 646 as "646" but that is not a valid codeset
+ if (!$@ && $codeset && $codeset ne "ANSI_X3.4-1968" && $codeset ne "646") {
+   $localEncoding = $codeset;
+-  print "Forcing encoding to $codeset";
++  print "Forcing encoding to $codeset\n";
+ }
+ 
+-chop($localEncoding);
++chomp($localEncoding);
+ if (! $localEncoding) {
+   $localEncoding = "LATIN1";
+ }


Property changes on: trunk/patches/08_fix_bins-edit-gui_encoding.dpatch
___________________________________________________________________
Name: svn:executable
   + *