From 8b7e07fd8c799e7494c2c461417122268fe1e685 Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@debian.org>
Date: Mon, 2 May 2011 00:52:57 +0200
Subject: Refresh patches using -ab, no timestamps, no index.

---
 .../01-fix-typo-on-mowgli-url.hg219e1937b9f5.diff  |   6 +-
 debian/patches/02-use-proper-format-string.diff    |   6 +-
 debian/patches/05-fix-dfa.hg57d6709f5ff5.diff      |  19 +-
 debian/patches/06-run-tests.diff                   | 220 ++++++---------------
 debian/patches/07-fix-libguess.h.diff              |   3 +-
 5 files changed, 70 insertions(+), 184 deletions(-)

diff --git a/debian/patches/01-fix-typo-on-mowgli-url.hg219e1937b9f5.diff b/debian/patches/01-fix-typo-on-mowgli-url.hg219e1937b9f5.diff
index a213d8f..fc0242d 100644
--- a/debian/patches/01-fix-typo-on-mowgli-url.hg219e1937b9f5.diff
+++ b/debian/patches/01-fix-typo-on-mowgli-url.hg219e1937b9f5.diff
@@ -4,9 +4,9 @@ Bug: http://jira.atheme.org/browse/LG-1
 Origin: upstream, http://hg.atheme.org/libguess/libguess/rev/219e1937b9f5
 Author: William Pitcock <nenolod@atheme.org>
 
---- libguess-1.0.orig/configure.ac
-+++ libguess-1.0/configure.ac
-@@ -40,7 +40,7 @@ AC_CHECK_FUNCS([memset setlocale strcase
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,7 +40,7 @@
  AC_CHECK_FUNCS([printf sprintf snprintf vsnprintf gettimeofday strndup strlcpy strlcat])
  AC_FUNC_STAT
  
diff --git a/debian/patches/02-use-proper-format-string.diff b/debian/patches/02-use-proper-format-string.diff
index 6b3c9da..8ac565d 100644
--- a/debian/patches/02-use-proper-format-string.diff
+++ b/debian/patches/02-use-proper-format-string.diff
@@ -4,9 +4,9 @@ Description: Use the proper format string
 Author: Andrew O. Shadoura <bugzilla@tut.by>
 Bug: http://jira.atheme.org/browse/LG-2
 
---- libguess-1.0.orig/src/tests/harness.c
-+++ libguess-1.0/src/tests/harness.c
-@@ -20,7 +20,7 @@ int main(int argc, char **argv)
+--- a/src/tests/harness.c
++++ b/src/tests/harness.c
+@@ -20,7 +20,7 @@
  
      while (fgets(buf, 1024 * 1024 - 1, fp))
      {
diff --git a/debian/patches/05-fix-dfa.hg57d6709f5ff5.diff b/debian/patches/05-fix-dfa.hg57d6709f5ff5.diff
index 36a3818..9bbf82e 100644
--- a/debian/patches/05-fix-dfa.hg57d6709f5ff5.diff
+++ b/debian/patches/05-fix-dfa.hg57d6709f5ff5.diff
@@ -2,9 +2,8 @@ Description: fix the UTF-8 DFA (as per Björn Höhrmann's article)
  http://bjoern.hoehrmann.de/utf-8/decoder/dfa for details.
 Origin: upstream, http://hg.atheme.org/libguess/libguess/raw-rev/57d6709f5ff5
 
-diff -r d1648a36da65 -r 57d6709f5ff5 src/libguess/guess.scm
---- a/src/libguess/guess.scm	Sat Mar 19 17:03:57 2011 -0500
-+++ b/src/libguess/guess.scm	Sat Mar 26 00:12:42 2011 +0200
+--- a/src/libguess/guess.scm
++++ b/src/libguess/guess.scm
 @@ -227,20 +227,27 @@
    (init
     (((#x00 #x7f)) init         1.0)
@@ -44,9 +43,8 @@ diff -r d1648a36da65 -r 57d6709f5ff5 src/libguess/guess.scm
  
  ;;;
  ;;; UCS-2LE
-diff -r d1648a36da65 -r 57d6709f5ff5 src/libguess/guess_tab.c
---- a/src/libguess/guess_tab.c	Sat Mar 19 17:03:57 2011 -0500
-+++ b/src/libguess/guess_tab.c	Sat Mar 26 00:12:42 2011 +0200
+--- a/src/libguess/guess_tab.c
++++ b/src/libguess/guess_tab.c
 @@ -152,8 +152,8 @@
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
   -1, -1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
@@ -58,7 +56,7 @@ diff -r d1648a36da65 -r 57d6709f5ff5 src/libguess/guess_tab.c
   },
   { /* state 1byte_more */
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-@@ -164,16 +164,16 @@
+@@ -164,16 +164,18 @@
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -77,10 +75,12 @@ diff -r d1648a36da65 -r 57d6709f5ff5 src/libguess/guess_tab.c
   },
 - { /* state 2byte_more */
 + { /* state 2byte_more1 */
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-@@ -182,16 +182,16 @@
+@@ -182,16 +184,14 @@
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -88,8 +88,6 @@ diff -r d1648a36da65 -r 57d6709f5ff5 src/libguess/guess_tab.c
 -  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
 -  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
 -  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
 + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -226,4 +224,3 @@ diff -r d1648a36da65 -r 57d6709f5ff5 src/libguess/guess_tab.c
  };
  
  static signed char guess_ucs2le_st[][256] = {
-
diff --git a/debian/patches/06-run-tests.diff b/debian/patches/06-run-tests.diff
index 16df5b6..bff0d39 100644
--- a/debian/patches/06-run-tests.diff
+++ b/debian/patches/06-run-tests.diff
@@ -1,7 +1,7 @@
 Description: run tests for Baltics too, add tests for the most of the languages
 Author: Andrew O. Shadoura <bugzilla@tut.by>
 Origin: upstream
-diff --git a/src/tests/harness.c b/src/tests/harness.c
+
 --- a/src/tests/harness.c
 +++ b/src/tests/harness.c
 @@ -31,6 +31,7 @@
@@ -12,8 +12,6 @@ diff --git a/src/tests/harness.c b/src/tests/harness.c
      }
      fclose(fp);
  
-diff --git a/src/tests/testbench/Makefile b/src/tests/testbench/Makefile
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/Makefile
 @@ -0,0 +1,33 @@
@@ -50,327 +48,219 @@ new file mode 100644
 +		echo Fail: $${t%.test}; \
 +		false; \
 +	fi
-diff --git a/src/tests/testbench/ar/cp1256.out b/src/tests/testbench/ar/cp1256.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ar/cp1256.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +ar = CP1256
-diff --git a/src/tests/testbench/ar/cp1256.test b/src/tests/testbench/ar/cp1256.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ar/cp1256.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +�� ���� �� �� ���� ��� ��� ���� ����� ��� ��� ���� ����� ���� ���� 
-diff --git a/src/tests/testbench/ar/iso-8859-6.out b/src/tests/testbench/ar/iso-8859-6.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ar/iso-8859-6.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +ar = ISO-8859-6
-diff --git a/src/tests/testbench/ar/iso-8859-6.test b/src/tests/testbench/ar/iso-8859-6.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ar/iso-8859-6.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +�� ���� �� �� ���� ��� ��� ���� ����� ��� ��� ���� ����� ���� ���� 
-diff --git a/src/tests/testbench/ar/utf-8.out b/src/tests/testbench/ar/utf-8.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ar/utf-8.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +ar = UTF-8
-diff --git a/src/tests/testbench/ar/utf-8.test b/src/tests/testbench/ar/utf-8.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ar/utf-8.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +نص حكيم له سر قاطع وذو شأن عظيم مكتوب على ثوب أخضر ومغلف بجلد أزرق 
-diff --git a/src/tests/testbench/bl/cp1257.out b/src/tests/testbench/bl/cp1257.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/bl/cp1257.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +bl = CP1257
-diff --git a/src/tests/testbench/bl/cp1257.test b/src/tests/testbench/bl/cp1257.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/bl/cp1257.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +�linkdama fechtuotojo �paga sublyk�iojusi pragr��� apval� arb�z�. Mu��a hipiji turpat br�vi m��ina nogar�ot celof�na ��audz�j��sku. See v�ike m�lder j�uab rongile h�pata.
-diff --git a/src/tests/testbench/bl/iso-8859-13.out b/src/tests/testbench/bl/iso-8859-13.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/bl/iso-8859-13.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +bl = CP1257
-diff --git a/src/tests/testbench/bl/iso-8859-13.test b/src/tests/testbench/bl/iso-8859-13.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/bl/iso-8859-13.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +�linkdama fechtuotojo �paga sublyk�iojusi pragr��� apval� arb�z�. Mu��a hipiji turpat br�vi m��ina nogar�ot celof�na ��audz�j��sku. See v�ike m�lder j�uab rongile h�pata.
-diff --git a/src/tests/testbench/bl/utf-8.out b/src/tests/testbench/bl/utf-8.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/bl/utf-8.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +bl = UTF-8
-diff --git a/src/tests/testbench/bl/utf-8.test b/src/tests/testbench/bl/utf-8.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/bl/utf-8.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +Įlinkdama fechtuotojo špaga sublykčiojusi pragręžė apvalų arbūzą. Muļķa hipiji turpat brīvi mēģina nogaršot celofāna žņaudzējčūsku. See väike mölder jõuab rongile hüpata.
-diff --git a/src/tests/testbench/gr/cp1253.out b/src/tests/testbench/gr/cp1253.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/gr/cp1253.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +gr = ISO-8859-7
-diff --git a/src/tests/testbench/gr/cp1253.test b/src/tests/testbench/gr/cp1253.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/gr/cp1253.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +������� ������ ����� ������ ��, ����������� ���� ������ �����.
-diff --git a/src/tests/testbench/gr/iso-8859-7.out b/src/tests/testbench/gr/iso-8859-7.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/gr/iso-8859-7.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +gr = ISO-8859-7
-diff --git a/src/tests/testbench/gr/iso-8859-7.test b/src/tests/testbench/gr/iso-8859-7.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/gr/iso-8859-7.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +������� ������ ����� ������ ��, ����������� ���� ������ �����.
-diff --git a/src/tests/testbench/gr/utf-8.out b/src/tests/testbench/gr/utf-8.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/gr/utf-8.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +gr = UTF-8
-diff --git a/src/tests/testbench/gr/utf-8.test b/src/tests/testbench/gr/utf-8.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/gr/utf-8.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +Τάχιστη αλώπηξ βαφής ψημένη γη, δρασκελίζει υπέρ νωθρού κυνός.
-diff --git a/src/tests/testbench/hw/cp1255.out b/src/tests/testbench/hw/cp1255.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/hw/cp1255.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +hw = ISO-8859-8-I
-diff --git a/src/tests/testbench/hw/cp1255.test b/src/tests/testbench/hw/cp1255.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/hw/cp1255.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +�� ���� �� ��� ������ ����� ��� ���� 
-diff --git a/src/tests/testbench/hw/iso-8859-8.out b/src/tests/testbench/hw/iso-8859-8.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/hw/iso-8859-8.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +hw = ISO-8859-8-I
-diff --git a/src/tests/testbench/hw/iso-8859-8.test b/src/tests/testbench/hw/iso-8859-8.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/hw/iso-8859-8.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +�� ���� �� ��� ������ ����� ��� ���� 
-diff --git a/src/tests/testbench/hw/utf-8.out b/src/tests/testbench/hw/utf-8.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/hw/utf-8.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +hw = UTF-8
-diff --git a/src/tests/testbench/hw/utf-8.test b/src/tests/testbench/hw/utf-8.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/hw/utf-8.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +דג סקרן שט בים מאוכזב ולפתע מצא חברה 
-diff --git a/src/tests/testbench/jp/euc-jp.out b/src/tests/testbench/jp/euc-jp.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/jp/euc-jp.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +jp = EUC-JP
-diff --git a/src/tests/testbench/jp/euc-jp.test b/src/tests/testbench/jp/euc-jp.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/jp/euc-jp.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +�Ȥ�ʤ����񤹡���ᤵ�ޤ����ߤ褢���錄�롡�Ҥ󤫤��򡡤��餤���Ϥ��ơ������Ĥؤˡ��ۤդͤ���̡����Τ���
-diff --git a/src/tests/testbench/jp/sjis.out b/src/tests/testbench/jp/sjis.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/jp/sjis.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +jp = SJIS
-diff --git a/src/tests/testbench/jp/sjis.test b/src/tests/testbench/jp/sjis.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/jp/sjis.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +�Ƃ�Ȃ�����@��߂��܂��@�݂悠���킽��@�Ђ񂩂����@���炢��͂��ā@�����‚ւɁ@�قӂ˂ނ��ʁ@����̂���
-diff --git a/src/tests/testbench/jp/utf-8.out b/src/tests/testbench/jp/utf-8.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/jp/utf-8.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +jp = UTF-8
-diff --git a/src/tests/testbench/jp/utf-8.test b/src/tests/testbench/jp/utf-8.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/jp/utf-8.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +とりなくこゑす　ゆめさませ　みよあけわたる　ひんかしを　そらいろはえて　おきつへに　ほふねむれゐぬ　もやのうち
-diff --git a/src/tests/testbench/pl/cp1250.out b/src/tests/testbench/pl/cp1250.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/pl/cp1250.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +pl = CP1250
-diff --git a/src/tests/testbench/pl/cp1250.test b/src/tests/testbench/pl/cp1250.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/pl/cp1250.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +Pchn�� w t� ��d� je�a lub o�m skrzy� fig.
-diff --git a/src/tests/testbench/pl/iso8859-2.out b/src/tests/testbench/pl/iso8859-2.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/pl/iso8859-2.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +pl = ISO-8859-2
-diff --git a/src/tests/testbench/pl/iso8859-2.test b/src/tests/testbench/pl/iso8859-2.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/pl/iso8859-2.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +Pchn�� w t� ��d� je�a lub o�m skrzy� fig.
-diff --git a/src/tests/testbench/pl/utf-8.out b/src/tests/testbench/pl/utf-8.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/pl/utf-8.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +pl = UTF-8
-diff --git a/src/tests/testbench/pl/utf-8.test b/src/tests/testbench/pl/utf-8.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/pl/utf-8.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +Pchnąć w tę łódź jeża lub ośm skrzyń fig.
-diff --git a/src/tests/testbench/ru/cp1251.out b/src/tests/testbench/ru/cp1251.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ru/cp1251.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +ru = CP1251
-diff --git a/src/tests/testbench/ru/cp1251.test b/src/tests/testbench/ru/cp1251.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ru/cp1251.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +���-����? ���� �����. ���� ������ ��� ����!
-diff --git a/src/tests/testbench/ru/cp866.out b/src/tests/testbench/ru/cp866.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ru/cp866.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +ru = CP866
-diff --git a/src/tests/testbench/ru/cp866.test b/src/tests/testbench/ru/cp866.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ru/cp866.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +���-���? ���� �����. ��� �㦤� 業 墮�!
-diff --git a/src/tests/testbench/ru/iso8859-5.out b/src/tests/testbench/ru/iso8859-5.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ru/iso8859-5.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +ru = ISO-8859-5
-diff --git a/src/tests/testbench/ru/iso8859-5.test b/src/tests/testbench/ru/iso8859-5.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ru/iso8859-5.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +���-����? ���� �����. ���� ������ ��� ����!
-diff --git a/src/tests/testbench/ru/koi8-r.out b/src/tests/testbench/ru/koi8-r.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ru/koi8-r.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +ru = CP1251
-diff --git a/src/tests/testbench/ru/koi8-r.test b/src/tests/testbench/ru/koi8-r.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ru/koi8-r.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +���-����? ���� �����. �أ� ������ ��� ����!
-diff --git a/src/tests/testbench/ru/koi8-u.out b/src/tests/testbench/ru/koi8-u.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ru/koi8-u.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +ru = CP1251
-diff --git a/src/tests/testbench/ru/koi8-u.test b/src/tests/testbench/ru/koi8-u.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ru/koi8-u.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +���-����? ���� �����. �أ� ������ ��� ����!
-diff --git a/src/tests/testbench/ru/utf-8.out b/src/tests/testbench/ru/utf-8.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ru/utf-8.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +ru = UTF-8
-diff --git a/src/tests/testbench/ru/utf-8.test b/src/tests/testbench/ru/utf-8.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/ru/utf-8.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +Экс-граф? Плюш изъят. Бьём чуждый цен хвощ!
-diff --git a/src/tests/testbench/tr/cp1254.out b/src/tests/testbench/tr/cp1254.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/tr/cp1254.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +tr = ISO-8859-9
-diff --git a/src/tests/testbench/tr/cp1254.test b/src/tests/testbench/tr/cp1254.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/tr/cp1254.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +Pijamal� hasta ya��z �of�re �abucak g�vendi.
-diff --git a/src/tests/testbench/tr/iso-8859-9.out b/src/tests/testbench/tr/iso-8859-9.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/tr/iso-8859-9.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +tr = ISO-8859-9
-diff --git a/src/tests/testbench/tr/iso-8859-9.test b/src/tests/testbench/tr/iso-8859-9.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/tr/iso-8859-9.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +Pijamal� hasta ya��z �of�re �abucak g�vendi.
-diff --git a/src/tests/testbench/tr/utf-8.out b/src/tests/testbench/tr/utf-8.out
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/tr/utf-8.out
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +tr = UTF-8
-diff --git a/src/tests/testbench/tr/utf-8.test b/src/tests/testbench/tr/utf-8.test
-new file mode 100644
 --- /dev/null
 +++ b/src/tests/testbench/tr/utf-8.test
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +Pijamalı hasta yağız şoföre çabucak güvendi.
diff --git a/debian/patches/07-fix-libguess.h.diff b/debian/patches/07-fix-libguess.h.diff
index 6f14463..dc23ae1 100644
--- a/debian/patches/07-fix-libguess.h.diff
+++ b/debian/patches/07-fix-libguess.h.diff
@@ -4,7 +4,7 @@ Description: our users don't need to depend on mowgli.h
     depended on unistd.h
 Author: Andrew O. Shadoura <bugzilla@tut.by>
 Bug: http://jira.atheme.org/browse/LG-5
-diff --git a/src/libguess/libguess.h b/src/libguess/libguess.h
+
 --- a/src/libguess/libguess.h
 +++ b/src/libguess/libguess.h
 @@ -40,11 +40,12 @@
@@ -21,7 +21,6 @@ diff --git a/src/libguess/libguess.h b/src/libguess/libguess.h
  #include "autoconf.h"
  
  const char *guess_jp(const char *buf, int buflen);
-diff --git a/src/examples/guessconv/guessconv.c b/src/examples/guessconv/guessconv.c
 --- a/src/examples/guessconv/guessconv.c
 +++ b/src/examples/guessconv/guessconv.c
 @@ -34,6 +34,7 @@
-- 
cgit v1.2.3