CVS debian/patches

[CVS User tbm]

Update of /cvsroot/pkg-bins/debian/patches
In directory haydn:/tmp/cvs-serv5950/patches

Modified Files:
	00list 
Added Files:
	12_codeset_warning.dpatch 
Log Message:
Surpress warnings when the locale name is not numeric.


--- /cvsroot/pkg-bins/debian/patches/00list	2005/08/04 23:15:17	1.8
+++ /cvsroot/pkg-bins/debian/patches/00list	2005/08/05 00:16:45	1.9
@@ -4,3 +4,4 @@
 08_bins
 10_bins
 11_bins.dpatch
+12_codeset_warning.dpatch

--- /cvsroot/pkg-bins/debian/patches/12_codeset_warning.dpatch	2005/08/05 00:16:45	NONE
+++ /cvsroot/pkg-bins/debian/patches/12_codeset_warning.dpatch	2005/08/05 00:16:45	1.1
#!/bin/sh -e
## Patch by Martin Michlmayr <tbm at cyrius.com>
##
## DP: surpress warning when locale contains strings

if [ $# -lt 1 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"

case "$1" in
       -patch) patch $patch_opts -p1 < $0;;
       -unpatch) patch $patch_opts -p1 -R < $0;;
        *)
                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
                exit 1;;
esac

exit 0

@DPATCH@
diff -urN bins-1.1.28~/bins bins-1.1.28/bins
--- bins-1.1.28~/bins	2005-08-05 01:11:41.718427320 +0100
+++ bins-1.1.28/bins	2005-08-05 01:12:02.902206896 +0100
@@ -390,7 +390,7 @@
 };
 # ANSI is unspeakably primitive, keep LATIN1 instead
 # Solaris refers to ISO 646 as "646" but that is not a valid codeset
-if (!$@ && $codeset && $codeset ne "ANSI_X3.4-1968" && $codeset != 646) {
+if (!$@ && $codeset && $codeset ne "ANSI_X3.4-1968" && $codeset ne "646") {
     $defaultConfig{defaultEncoding} = $codeset;
     beVerboseN("Forcing encoding to $codeset", 2);
 }
diff -urN bins-1.1.28~/bins-edit-gui bins-1.1.28/bins-edit-gui
--- bins-1.1.28~/bins-edit-gui	2005-08-05 01:11:41.719427168 +0100
+++ bins-1.1.28/bins-edit-gui	2005-08-05 01:12:15.356313584 +0100
@@ -119,7 +119,7 @@
 };
 # ANSI is unspeakably primitive, keep LATIN1 instead
 # Solaris refers to ISO 646 as "646" but that is not a valid codeset
-if (!$@ && $codeset && $codeset ne "ANSI_X3.4-1968" && $codeset != 646) {
+if (!$@ && $codeset && $codeset ne "ANSI_X3.4-1968" && $codeset ne "646") {
   $localEncoding = $codeset;
   print "Forcing encoding to $codeset";
 }