The following commit has been merged in the master branch:
commit eebeb839e1d97b2b83fae433495512ba231d4b14
Author: Andreas Rönnquist <[email protected]>
Date: Tue Apr 3 02:36:32 2012 +0200
Update the endianness patch
diff --git a/debian/patches/fix_endianness_spelling.patch
b/debian/patches/fix_endianness_spelling.patch
index abd127e..7fad766 100644
--- a/debian/patches/fix_endianness_spelling.patch
+++ b/debian/patches/fix_endianness_spelling.patch
@@ -1,9 +1,18 @@
Author: Andreas Rönnquist
Description: Fix spelling of endianness in the textconv binary
-Index: allegro-4.4.2/tools/textconv.c
-===================================================================
---- allegro-4.4.2.orig/tools/textconv.c 2005-04-28 10:53:38.000000000
+0200
-+++ allegro-4.4.2/tools/textconv.c 2012-03-28 01:51:09.009722675 +0200
+--- a/tools/textconv.c
++++ b/tools/textconv.c
+@@ -62,8 +62,8 @@
+ printf("\ta - 8 bit ASCII (Latin-1 codepage)\n");
+ printf("\tb - 7 bit bare ASCII or codepage loaded via -f\n");
+ printf("\tu - UTF-8 encoding\n");
+- printf("\tw - 16 bit Unicode (current machine endianess)\n");
+- printf("\tW - 16 bit Unicode (flip endianess)\n");
++ printf("\tw - 16 bit Unicode (current machine endianness)\n");
++ printf("\tW - 16 bit Unicode (flip endianness)\n");
+ printf("\n");
+ printf("Option flags:\n");
+ printf("\t-f{file} = load alternate codepage file\n");
@@ -71,7 +71,7 @@
printf("\t-h = output data in hex format (default is binary)\n");
printf("\t-d = output line breaks in DOS (CR/LF) format\n");
@@ -13,3 +22,43 @@ Index: allegro-4.4.2/tools/textconv.c
printf("\t-v = verbose output\n");
printf("\n");
printf("If filenames are not specified, stdin and stdout will be used\n");
+@@ -99,12 +99,12 @@
+ return _find_utype(U_UTF8);
+
+ case 'w':
+- *desc = "Unicode (default endianess)";
++ *desc = "Unicode (default endianness)";
+ *flip = FALSE;
+ return _find_utype(U_UNICODE);
+
+ case 'W':
+- *desc = "Unicode (flip endianess)";
++ *desc = "Unicode (flip endianness)";
+ *flip = TRUE;
+ return _find_utype(U_UNICODE);
+ }
+@@ -430,7 +430,7 @@
+
+ if (flag_watermark) {
+ if (flag_verbose)
+- printf("Adding Unicode endianess watermark\n");
++ printf("Adding Unicode endianness watermark\n");
+ write_output(out_file, 0xFEFF);
+ }
+
+@@ -452,13 +452,13 @@
+
+ case 0xFEFF:
+ if (flag_verbose)
+- printf("Endianess watermark ok\n");
++ printf("Endianness watermark ok\n");
+ was_cr = FALSE;
+ continue;
+
+ case 0xFFFE:
+ if (flag_verbose)
+- printf("Bad endianess watermark! Toggling input format...\n");
++ printf("Bad endianness watermark! Toggling input format...\n");
+ in_flip = !in_flip;
+ was_cr = FALSE;
+ continue;
--
Debian packaging of allegro4.4
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
