diff -Nru libexttextcat-3.3.1/ChangeLog libexttextcat-3.4.0/ChangeLog
--- libexttextcat-3.3.1/ChangeLog	2012-05-30 12:55:01.000000000 +0000
+++ libexttextcat-3.4.0/ChangeLog	2012-11-05 14:14:47.000000000 +0000
@@ -1,3 +1,6 @@
+Mon Nov 05 2012 Caolán McNamara (caolanm@redhat.com)
+	* fix up the Polish LM
+
 Wed May 30 2012 Caolán McNamara (caolanm@redhat.com)
 	* add a pile of new fingerprints
 	* bump the .pc file
diff -Nru libexttextcat-3.3.1/Makefile.in libexttextcat-3.4.0/Makefile.in
--- libexttextcat-3.3.1/Makefile.in	2012-05-30 12:58:49.000000000 +0000
+++ libexttextcat-3.4.0/Makefile.in	2012-11-05 14:19:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -64,6 +81,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -317,8 +339,11 @@
 	-rm -f libtool config.lt
 install-pkgconfDATA: $(pkgconf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfdir)"
 	@list='$(pkgconf_DATA)'; test -n "$(pkgconfdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -335,8 +360,11 @@
 	dir='$(DESTDIR)$(pkgconfdir)'; $(am__uninstall_files_from_dir)
 install-vapiDATA: $(vapi_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(vapidir)" || $(MKDIR_P) "$(DESTDIR)$(vapidir)"
 	@list='$(vapi_DATA)'; test -n "$(vapidir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(vapidir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(vapidir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -521,13 +549,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -613,7 +638,7 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
diff -Nru libexttextcat-3.3.1/aclocal.m4 libexttextcat-3.4.0/aclocal.m4
--- libexttextcat-3.3.1/aclocal.m4	2012-05-30 12:58:48.000000000 +0000
+++ libexttextcat-3.4.0/aclocal.m4	2012-11-05 14:19:13.000000000 +0000
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -8629,7 +8629,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.3], [],
+m4_if([$1], [1.11.6], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -8645,7 +8645,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.3])dnl
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff -Nru libexttextcat-3.3.1/configure libexttextcat-3.4.0/configure
--- libexttextcat-3.3.1/configure	2012-05-30 12:58:50.000000000 +0000
+++ libexttextcat-3.4.0/configure	2012-06-28 08:17:56.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libexttextcat 3.3.1.
+# Generated by GNU Autoconf 2.68 for libexttextcat 3.4.0.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@
 # Identity of this package.
 PACKAGE_NAME='libexttextcat'
 PACKAGE_TARNAME='libexttextcat'
-PACKAGE_VERSION='3.3.1'
-PACKAGE_STRING='libexttextcat 3.3.1'
+PACKAGE_VERSION='3.4.0'
+PACKAGE_STRING='libexttextcat 3.4.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1297,7 +1297,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libexttextcat 3.3.1 to adapt to many kinds of systems.
+\`configure' configures libexttextcat 3.4.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1367,7 +1367,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libexttextcat 3.3.1:";;
+     short | recursive ) echo "Configuration of libexttextcat 3.4.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1473,7 +1473,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libexttextcat configure 3.3.1
+libexttextcat configure 3.4.0
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1892,7 +1892,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libexttextcat $as_me 3.3.1, which was
+It was created by libexttextcat $as_me 3.4.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2715,7 +2715,7 @@
 
 # Define the identity of the package.
  PACKAGE='libexttextcat'
- VERSION='3.3.1'
+ VERSION='3.4.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11774,11 +11774,11 @@
 
 EXTTEXTCAT_MAJOR_VERSION=3
 
-EXTTEXTCAT_MINOR_VERSION=3
+EXTTEXTCAT_MINOR_VERSION=4
 
-EXTTEXTCAT_MICRO_VERSION=1
+EXTTEXTCAT_MICRO_VERSION=0
 
-EXTTEXTCAT_VERSION=3.3.1
+EXTTEXTCAT_VERSION=3.4.0
 
 
 ac_config_files="$ac_config_files libexttextcat.pc Makefile langclass/Makefile langclass/LM/Makefile langclass/ShortTexts/Makefile src/Makefile src/exttextcat-version.h src/test-primary.sh src/test-secondary.sh"
@@ -12321,7 +12321,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libexttextcat $as_me 3.3.1, which was
+This file was extended by libexttextcat $as_me 3.4.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12387,7 +12387,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libexttextcat config.status 3.3.1
+libexttextcat config.status 3.4.0
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff -Nru libexttextcat-3.3.1/configure.ac libexttextcat-3.4.0/configure.ac
--- libexttextcat-3.3.1/configure.ac	2012-05-30 12:52:00.000000000 +0000
+++ libexttextcat-3.4.0/configure.ac	2012-06-28 07:45:12.000000000 +0000
@@ -1,6 +1,6 @@
 m4_define([exttextcat_version_major],[3])
-m4_define([exttextcat_version_minor],[3])
-m4_define([exttextcat_version_micro],[1])
+m4_define([exttextcat_version_minor],[4])
+m4_define([exttextcat_version_micro],[0])
 m4_define([exttextcat_version],[exttextcat_version_major.exttextcat_version_minor.exttextcat_version_micro])
 
 AC_PREREQ([2.68])
diff -Nru libexttextcat-3.3.1/debian/changelog libexttextcat-3.4.0/debian/changelog
--- libexttextcat-3.3.1/debian/changelog	2012-09-01 07:59:21.000000000 +0000
+++ libexttextcat-3.4.0/debian/changelog	2012-12-06 21:40:45.000000000 +0000
@@ -1,8 +1,15 @@
-libexttextcat (3.3.1-2~precise1) precise; urgency=low
+libexttextcat (3.4.0-1~precise1) precise; urgency=low
 
-  * Copied from quantal
+  * Copied from raring
 
- -- Rico Tzschichholz <ricotz@ubuntu.com>  Sat, 01 Sep 2012 09:59:21 +0200
+ -- Rico Tzschichholz <ricotz@ubuntu.com>  Thu, 06 Dec 2012 22:40:13 +0100
+
+libexttextcat (3.4.0-1) experimental; urgency=low
+
+  * New upstream release
+    - fixes polish LM (closes: #692241, #692242)
+
+ -- Rene Engelhard <rene@debian.org>  Mon, 05 Nov 2012 21:56:04 +0100
 
 libexttextcat (3.3.1-2) experimental; urgency=low
 
diff -Nru libexttextcat-3.3.1/debian/control libexttextcat-3.4.0/debian/control
--- libexttextcat-3.3.1/debian/control	2012-05-30 12:45:21.000000000 +0000
+++ libexttextcat-3.4.0/debian/control	2012-11-05 20:39:40.000000000 +0000
@@ -6,7 +6,7 @@
 Standards-Version: 3.7.2
 Homepage: http://software.wise-guys.nl/libtextcat/
 
-Package: libexttextcat-1.0-0
+Package: libexttextcat-2.0-0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libexttextcat-data (= ${source:Version})
@@ -19,7 +19,7 @@
 Package: libexttextcat-dev
 Section: libdevel
 Architecture: any
-Depends: libexttextcat-1.0-0 (= ${binary:Version}), ${misc:Depends}
+Depends: libexttextcat-2.0-0 (= ${binary:Version}), ${misc:Depends}
 Description: Language detection library - development files
  Libexttextcat is a library with functions that implement the classification
  technic described in Cavnar & Trenkle, "N-Gram-Based Text Categorization".
diff -Nru libexttextcat-3.3.1/debian/libexttextcat-1.0-0.install libexttextcat-3.4.0/debian/libexttextcat-1.0-0.install
--- libexttextcat-3.3.1/debian/libexttextcat-1.0-0.install	2012-05-30 12:49:13.000000000 +0000
+++ libexttextcat-3.4.0/debian/libexttextcat-1.0-0.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/libexttextcat-1.0.so.0.0.0
-debian/tmp/usr/lib/libexttextcat-1.0.so.0
diff -Nru libexttextcat-3.3.1/debian/libexttextcat-1.0-0.lintian-overrides libexttextcat-3.4.0/debian/libexttextcat-1.0-0.lintian-overrides
--- libexttextcat-3.3.1/debian/libexttextcat-1.0-0.lintian-overrides	2012-05-30 12:50:21.000000000 +0000
+++ libexttextcat-3.4.0/debian/libexttextcat-1.0-0.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-libexttextcat-1.0-0: symbols-file-contains-debian-revision on symbol charcopy@Base and 3 others
-libexttextcat-1.0-0: symbols-file-contains-current-version-with-debian-revision on symbol charcopy@Base and 4 others
diff -Nru libexttextcat-3.3.1/debian/libexttextcat-1.0-0.symbols libexttextcat-3.4.0/debian/libexttextcat-1.0-0.symbols
--- libexttextcat-3.3.1/debian/libexttextcat-1.0-0.symbols	2012-05-30 13:05:25.000000000 +0000
+++ libexttextcat-3.4.0/debian/libexttextcat-1.0-0.symbols	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-libexttextcat-1.0.so.0 libexttextcat-1.0-0 #MINVER#
- fp_Compare@Base 2.2
- fp_Create@Base 2.2
- fp_Debug@Base 2.2
- fp_Done@Base 2.2
- fp_Init@Base 2.2
- fp_Name@Base 2.2
- fp_Print@Base 2.2
- fp_Read@Base 2.2
- fp_SetProperty@Base 3.3.0
- special_textcat_Init@Base 2.2-8
- textcat_Classify@Base 2.2
- textcat_ClassifyFull@Base 3.3.0
- textcat_Done@Base 2.2
- textcat_GetClassifyFullOutput@Base 3.3.0
- textcat_Init@Base 2.2
- textcat_ReleaseClassifyFullOutput@Base 3.3.0
- textcat_SetProperty@Base 3.3.0
- textcat_Version@Base 2.2
- utf8_charcopy@Base 3.3.0
- utf8_issame@Base 3.3.0
- utf8_next_char@Base 3.1.1
- utf8_strlen@Base 3.3.0
- wg_getline@Base 2.2
- wg_split@Base 2.2
- wg_strgmov@Base 2.2
- wg_trim@Base 2.2
- wgmempool_Done@Base 2.2
- wgmempool_Init@Base 2.2
- wgmempool_Reset@Base 2.2
- wgmempool_alloc@Base 2.2
- wgmempool_getline@Base 2.2
- wgmempool_strdup@Base 2.2
diff -Nru libexttextcat-3.3.1/debian/libexttextcat-2.0-0.install libexttextcat-3.4.0/debian/libexttextcat-2.0-0.install
--- libexttextcat-3.3.1/debian/libexttextcat-2.0-0.install	1970-01-01 00:00:00.000000000 +0000
+++ libexttextcat-3.4.0/debian/libexttextcat-2.0-0.install	2012-11-05 20:40:15.000000000 +0000
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libexttextcat-2.0.so.0.0.0
+debian/tmp/usr/lib/libexttextcat-2.0.so.0
diff -Nru libexttextcat-3.3.1/debian/libexttextcat-2.0-0.lintian-overrides libexttextcat-3.4.0/debian/libexttextcat-2.0-0.lintian-overrides
--- libexttextcat-3.3.1/debian/libexttextcat-2.0-0.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ libexttextcat-3.4.0/debian/libexttextcat-2.0-0.lintian-overrides	2012-11-05 21:00:52.000000000 +0000
@@ -0,0 +1,3 @@
+libexttextcat-2.0-0: symbols-file-contains-debian-revision on symbol charcopy@Base and 3 others
+libexttextcat-2.0-0: symbols-file-contains-current-version-with-debian-revision on symbol charcopy@Base and 4 others
+libexttextcat-2.0-0: symbols-file-contains-debian-revision on symbol special_textcat_Init@Base
diff -Nru libexttextcat-3.3.1/debian/libexttextcat-2.0-0.symbols libexttextcat-3.4.0/debian/libexttextcat-2.0-0.symbols
--- libexttextcat-3.3.1/debian/libexttextcat-2.0-0.symbols	1970-01-01 00:00:00.000000000 +0000
+++ libexttextcat-3.4.0/debian/libexttextcat-2.0-0.symbols	2012-11-05 20:44:32.000000000 +0000
@@ -0,0 +1,31 @@
+libexttextcat-2.0.so.0 libexttextcat-2.0-0 #MINVER#
+ fp_Compare@Base 2.2
+ fp_Create@Base 2.2
+ fp_Done@Base 2.2
+ fp_Init@Base 2.2
+ fp_Name@Base 2.2
+ fp_Print@Base 2.2
+ fp_Read@Base 2.2
+ fp_SetProperty@Base 3.3.0
+ special_textcat_Init@Base 2.2-8
+ textcat_Classify@Base 2.2
+ textcat_ClassifyFull@Base 3.3.0
+ textcat_Done@Base 2.2
+ textcat_GetClassifyFullOutput@Base 3.3.0
+ textcat_Init@Base 2.2
+ textcat_ReleaseClassifyFullOutput@Base 3.3.0
+ textcat_SetProperty@Base 3.3.0
+ textcat_Version@Base 2.2
+ utf8_charcopy@Base 3.3.0
+ utf8_issame@Base 3.3.0
+ utf8_next_char@Base 3.1.1
+ utf8_strlen@Base 3.3.0
+ wg_getline@Base 2.2
+ wg_split@Base 2.2
+ wg_strgmov@Base 2.2
+ wg_trim@Base 2.2
+ wgmempool_Done@Base 2.2
+ wgmempool_Init@Base 2.2
+ wgmempool_Reset@Base 2.2
+ wgmempool_alloc@Base 2.2
+ wgmempool_strdup@Base 2.2
diff -Nru libexttextcat-3.3.1/debian/libexttextcat-dev.install libexttextcat-3.4.0/debian/libexttextcat-dev.install
--- libexttextcat-3.3.1/debian/libexttextcat-dev.install	2012-05-30 12:50:43.000000000 +0000
+++ libexttextcat-3.4.0/debian/libexttextcat-dev.install	2012-11-05 20:41:14.000000000 +0000
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libexttextcat-1.0.a
-debian/tmp/usr/lib/libexttextcat-1.0.so
+debian/tmp/usr/lib/libexttextcat-2.0.a
+debian/tmp/usr/lib/libexttextcat-2.0.so
 debian/tmp/usr/include/libexttextcat
 debian/tmp/usr/lib/pkgconfig
diff -Nru libexttextcat-3.3.1/debian/libexttextcat-dev.links libexttextcat-3.4.0/debian/libexttextcat-dev.links
--- libexttextcat-3.3.1/debian/libexttextcat-dev.links	2012-05-30 22:42:35.000000000 +0000
+++ libexttextcat-3.4.0/debian/libexttextcat-dev.links	2012-11-05 20:55:59.000000000 +0000
@@ -1,3 +1,3 @@
-usr/lib/libexttextcat-1.0.a usr/lib/libexttextcat.a
-usr/lib/libexttextcat-1.0.so usr/lib/libexttextcat.so
+usr/lib/libexttextcat-2.0.a usr/lib/libexttextcat.a
+usr/lib/libexttextcat-2.0.so usr/lib/libexttextcat.so
 
diff -Nru libexttextcat-3.3.1/langclass/LM/Makefile libexttextcat-3.4.0/langclass/LM/Makefile
--- libexttextcat-3.3.1/langclass/LM/Makefile	2012-05-30 12:58:54.000000000 +0000
+++ libexttextcat-3.4.0/langclass/LM/Makefile	2012-11-05 14:19:29.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # langclass/LM/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
 
 
 
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/libexttextcat
 pkgincludedir = $(includedir)/libexttextcat
 pkglibdir = $(libdir)/libexttextcat
@@ -52,6 +69,11 @@
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -92,7 +114,7 @@
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -O2 -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -Wunused-result -Werror -Wall -pedantic
+CFLAGS = -g -O2 -Werror -Wall -pedantic
 CPP = gcc -E
 CPPFLAGS = 
 CYGPATH_W = echo
@@ -104,20 +126,20 @@
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = /usr/bin/grep -E
+EGREP = /bin/grep -E
 EXEEXT = 
 EXTTEXTCAT_MAJOR_VERSION = 3
-EXTTEXTCAT_MICRO_VERSION = 1
-EXTTEXTCAT_MINOR_VERSION = 3
-EXTTEXTCAT_VERSION = 3.3.1
-FGREP = /usr/bin/grep -F
-GREP = /usr/bin/grep
-INSTALL = /usr/bin/install -c
+EXTTEXTCAT_MICRO_VERSION = 0
+EXTTEXTCAT_MINOR_VERSION = 4
+EXTTEXTCAT_VERSION = 3.4.0
+FGREP = /bin/grep -F
+GREP = /bin/grep
+INSTALL = /bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
+LD = /bin/ld -m elf_x86_64
 LDFLAGS = 
 LIBOBJS = 
 LIBS = 
@@ -128,8 +150,8 @@
 MAINT = #
 MAKEINFO = ${SHELL} /home/caolan/libexttextcat/missing --run makeinfo
 MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
-NM = /usr/bin/nm -B
+MKDIR_P = /bin/mkdir -p
+NM = /bin/nm -B
 NMEDIT = 
 OBJDUMP = objdump
 OBJEXT = o
@@ -138,17 +160,17 @@
 PACKAGE = libexttextcat
 PACKAGE_BUGREPORT = 
 PACKAGE_NAME = libexttextcat
-PACKAGE_STRING = libexttextcat 3.3.1
+PACKAGE_STRING = libexttextcat 3.4.0
 PACKAGE_TARNAME = libexttextcat
 PACKAGE_URL = 
-PACKAGE_VERSION = 3.3.1
+PACKAGE_VERSION = 3.4.0
 PATH_SEPARATOR = :
 RANLIB = ranlib
-SED = /usr/bin/sed
+SED = /bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 3.3.1
+VERSION = 3.4.0
 abs_builddir = /home/caolan/libexttextcat/langclass/LM
 abs_srcdir = /home/caolan/libexttextcat/langclass/LM
 abs_top_builddir = /home/caolan/libexttextcat
@@ -187,7 +209,7 @@
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
 mandir = ${datarootdir}/man
-mkdir_p = /usr/bin/mkdir -p
+mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
 prefix = /usr/local
@@ -244,8 +266,11 @@
 	-rm -rf .libs _libs
 install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru libexttextcat-3.3.1/langclass/LM/Makefile.in libexttextcat-3.4.0/langclass/LM/Makefile.in
--- libexttextcat-3.3.1/langclass/LM/Makefile.in	2012-05-30 12:58:49.000000000 +0000
+++ libexttextcat-3.4.0/langclass/LM/Makefile.in	2012-11-05 14:19:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,6 +69,11 @@
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -244,8 +266,11 @@
 	-rm -rf .libs _libs
 install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru libexttextcat-3.3.1/langclass/LM/pl.lm libexttextcat-3.4.0/langclass/LM/pl.lm
--- libexttextcat-3.3.1/langclass/LM/pl.lm	2011-09-19 20:22:54.000000000 +0000
+++ libexttextcat-3.4.0/langclass/LM/pl.lm	2012-11-05 13:58:53.000000000 +0000
@@ -22,7 +22,7 @@
 ni	 1930
 e_	 1746
 _p	 1712
-³	 1649
+ł	 1649
 a_	 1496
 o_	 1431
 ,	 1368
@@ -41,7 +41,7 @@
 rz	 952
 h	 950
 _z	 933
-ê	 918
+ę	 918
 ow	 911
 ie_	 902
 y_	 899
@@ -51,8 +51,8 @@
 pr	 863
 wi	 851
 st	 847
-¿	 835
-±	 832
+ż	 835
+ą	 832
 an	 814
 ó	 800
 ra	 778
@@ -64,7 +64,7 @@
 ro	 692
 _d	 683
 _pr	 675
-¶	 661
+ś	 661
 w_	 658
 sz	 652
 _po	 649
@@ -87,7 +87,7 @@
 em	 532
 od	 525
 yc	 520
-a³	 511
+ał	 511
 rze	 508
 do	 504
 eg	 503
@@ -98,8 +98,8 @@
 _ni	 467
 h_	 466
 ch_	 466
-æ	 465
-iê	 461
+ć	 465
+ię	 461
 _b	 458
 on	 458
 u_	 458
@@ -111,7 +111,7 @@
 wy	 444
 te	 437
 ak	 434
-ê_	 431
+ę_	 431
 _j	 429
 je	 429
 z_	 427
@@ -125,7 +125,7 @@
 prz	 412
 _r	 410
 al	 407
-³a	 405
+ła	 405
 "	 405
 re	 405
 es	 401
@@ -138,7 +138,7 @@
 ad	 367
 ej_	 364
 le	 359
-æ_	 358
+ć_	 358
 ed	 354
 ych	 346
 _za	 346
@@ -149,7 +149,7 @@
 _i_	 342
 no	 339
 or	 337
-³o	 336
+ło	 336
 tr	 334
 P	 330
 os	 329
@@ -157,14 +157,14 @@
 da	 328
 ec	 327
 ol	 325
-±_	 325
+ą_	 325
 by	 322
 ego_	 321
 at	 321
-¿e	 319
+że	 319
 ym	 317
 wie	 314
-³_	 312
+ł_	 312
 -	 310
 na_	 309
 _si	 303
@@ -172,18 +172,18 @@
 as	 301
 wo	 300
 pa	 299
-siê	 295
+się	 295
 nia	 293
 owa	 292
-o¶	 286
+oś	 286
 _P	 283
 el	 282
-_siê	 279
+_się	 279
 ja	 278
 rzy	 276
 prze	 276
 _wy	 275
-iê_	 269
+ię_	 269
 in	 267
 _-	 267
 de	 267
@@ -195,12 +195,12 @@
 -_	 258
 ez	 257
 _-_	 256
-¶c	 255
+śc	 255
 ws	 255
-¶ci	 254
+ści	 254
 em_	 253
-_siê_	 253
-siê_	 253
+_się_	 253
+się_	 253
 _nie_	 253
 kt	 252
 ski	 252
@@ -212,8 +212,8 @@
 _je	 248
 aj	 247
 _a	 247
-¿e_	 246
-_¿	 244
+że_	 246
+_ż	 244
 ia_	 243
 eni	 241
 om	 240
@@ -225,7 +225,7 @@
 is	 231
 cze	 231
 _z_	 230
-ñ	 228
+ń	 228
 nt	 227
 ce	 224
 sta	 221
@@ -248,8 +248,8 @@
 czn	 201
 ys	 200
 nia_	 199
-j±	 198
-_¿e	 196
+ją	 198
+_że	 196
 oz	 194
 N	 192
 zo	 191
@@ -258,7 +258,7 @@
 ów_	 189
 czy	 189
 _mi	 188
-_¿e_	 187
+_że_	 187
 mie	 186
 do_	 186
 iej	 185
@@ -266,7 +266,7 @@
 _do_	 184
 cy	 184
 _pa	 183
-y³	 182
+ył	 182
 _na_	 181
 zy_	 181
 ew	 180
@@ -275,7 +275,7 @@
 _by	 178
 ru	 177
 to_	 175
-±c	 175
+ąc	 175
 _wi	 175
 ln	 174
 _K	 171
@@ -299,13 +299,13 @@
 _od	 160
 ba	 160
 oj	 159
-o¶c	 158
-i³	 158
+ośc	 158
+ił	 158
 _ro	 158
 og	 158
 mu	 158
 A	 158
-o¶ci	 158
+ości	 158
 d_	 157
 tw	 156
 io	 155
@@ -314,8 +314,8 @@
 _N	 155
 _to	 155
 us	 155
-¿_	 154
-aæ	 154
+ż_	 154
+ać	 154
 ach	 154
 yd	 153
 _kt	 153
@@ -325,7 +325,7 @@
 yt	 150
 kr	 149
 _S	 149
-a³_	 149
+ał_	 149
 ak_	 149
 li_	 148
 T	 148
@@ -344,14 +344,14 @@
 praw	 143
 wn	 142
 tór	 142
-i±	 141
-³y	 141
+ią	 141
+ły	 141
 zu	 141
 dni	 140
 im	 139
 icz	 139
 ró	 139
-³e	 138
+łe	 138
 któr	 137
 my	 137
 est	 136
@@ -367,23 +367,23 @@
 _przy	 130
 _ja	 129
 szy	 127
-ia³	 127
+iał	 127
 Po	 127
 ania	 127
 M	 126
 ze_	 125
 ne_	 125
-ñs	 124
+ńs	 124
 _ty	 124
 sze	 124
-a¿	 124
+aż	 124
 nn	 124
 pod	 124
-aæ_	 122
+ać_	 122
 B	 122
 za_	 122
 cza	 122
-³o_	 122
+ło_	 122
 Z	 122
 _to_	 121
 iu	 120
@@ -394,7 +394,7 @@
 _ka	 117
 so	 117
 trz	 117
-o¿	 116
+oż	 116
 ieg	 116
 nik	 116
 ga	 116
diff -Nru libexttextcat-3.3.1/langclass/Makefile libexttextcat-3.4.0/langclass/Makefile
--- libexttextcat-3.3.1/langclass/Makefile	2012-05-30 12:58:54.000000000 +0000
+++ libexttextcat-3.4.0/langclass/Makefile	2012-11-05 14:19:29.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # langclass/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
 
 
 
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/libexttextcat
 pkgincludedir = $(includedir)/libexttextcat
 pkglibdir = $(libdir)/libexttextcat
@@ -59,6 +76,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -132,7 +154,7 @@
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -O2 -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -Wunused-result -Werror -Wall -pedantic
+CFLAGS = -g -O2 -Werror -Wall -pedantic
 CPP = gcc -E
 CPPFLAGS = 
 CYGPATH_W = echo
@@ -144,20 +166,20 @@
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = /usr/bin/grep -E
+EGREP = /bin/grep -E
 EXEEXT = 
 EXTTEXTCAT_MAJOR_VERSION = 3
-EXTTEXTCAT_MICRO_VERSION = 1
-EXTTEXTCAT_MINOR_VERSION = 3
-EXTTEXTCAT_VERSION = 3.3.1
-FGREP = /usr/bin/grep -F
-GREP = /usr/bin/grep
-INSTALL = /usr/bin/install -c
+EXTTEXTCAT_MICRO_VERSION = 0
+EXTTEXTCAT_MINOR_VERSION = 4
+EXTTEXTCAT_VERSION = 3.4.0
+FGREP = /bin/grep -F
+GREP = /bin/grep
+INSTALL = /bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
+LD = /bin/ld -m elf_x86_64
 LDFLAGS = 
 LIBOBJS = 
 LIBS = 
@@ -168,8 +190,8 @@
 MAINT = #
 MAKEINFO = ${SHELL} /home/caolan/libexttextcat/missing --run makeinfo
 MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
-NM = /usr/bin/nm -B
+MKDIR_P = /bin/mkdir -p
+NM = /bin/nm -B
 NMEDIT = 
 OBJDUMP = objdump
 OBJEXT = o
@@ -178,17 +200,17 @@
 PACKAGE = libexttextcat
 PACKAGE_BUGREPORT = 
 PACKAGE_NAME = libexttextcat
-PACKAGE_STRING = libexttextcat 3.3.1
+PACKAGE_STRING = libexttextcat 3.4.0
 PACKAGE_TARNAME = libexttextcat
 PACKAGE_URL = 
-PACKAGE_VERSION = 3.3.1
+PACKAGE_VERSION = 3.4.0
 PATH_SEPARATOR = :
 RANLIB = ranlib
-SED = /usr/bin/sed
+SED = /bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 3.3.1
+VERSION = 3.4.0
 abs_builddir = /home/caolan/libexttextcat/langclass
 abs_srcdir = /home/caolan/libexttextcat/langclass
 abs_top_builddir = /home/caolan/libexttextcat
@@ -227,7 +249,7 @@
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
 mandir = ${datarootdir}/man
-mkdir_p = /usr/bin/mkdir -p
+mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
 prefix = /usr/local
@@ -284,8 +306,11 @@
 	-rm -rf .libs _libs
 install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -468,13 +493,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -Nru libexttextcat-3.3.1/langclass/Makefile.in libexttextcat-3.4.0/langclass/Makefile.in
--- libexttextcat-3.3.1/langclass/Makefile.in	2012-05-30 12:58:49.000000000 +0000
+++ libexttextcat-3.4.0/langclass/Makefile.in	2012-11-05 14:19:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -59,6 +76,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -284,8 +306,11 @@
 	-rm -rf .libs _libs
 install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -468,13 +493,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -Nru libexttextcat-3.3.1/langclass/ShortTexts/Makefile libexttextcat-3.4.0/langclass/ShortTexts/Makefile
--- libexttextcat-3.3.1/langclass/ShortTexts/Makefile	2012-05-30 12:58:54.000000000 +0000
+++ libexttextcat-3.4.0/langclass/ShortTexts/Makefile	2012-11-05 14:19:29.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # langclass/ShortTexts/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,6 +15,23 @@
 
 
 
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/libexttextcat
 pkgincludedir = $(includedir)/libexttextcat
 pkglibdir = $(libdir)/libexttextcat
@@ -51,6 +68,11 @@
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = ${SHELL} /home/caolan/libexttextcat/missing --run aclocal-1.11
 AMTAR = $${TAR-tar}
@@ -62,7 +84,7 @@
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -O2 -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -Wunused-result -Werror -Wall -pedantic
+CFLAGS = -g -O2 -Werror -Wall -pedantic
 CPP = gcc -E
 CPPFLAGS = 
 CYGPATH_W = echo
@@ -74,20 +96,20 @@
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = /usr/bin/grep -E
+EGREP = /bin/grep -E
 EXEEXT = 
 EXTTEXTCAT_MAJOR_VERSION = 3
-EXTTEXTCAT_MICRO_VERSION = 1
-EXTTEXTCAT_MINOR_VERSION = 3
-EXTTEXTCAT_VERSION = 3.3.1
-FGREP = /usr/bin/grep -F
-GREP = /usr/bin/grep
-INSTALL = /usr/bin/install -c
+EXTTEXTCAT_MICRO_VERSION = 0
+EXTTEXTCAT_MINOR_VERSION = 4
+EXTTEXTCAT_VERSION = 3.4.0
+FGREP = /bin/grep -F
+GREP = /bin/grep
+INSTALL = /bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
+LD = /bin/ld -m elf_x86_64
 LDFLAGS = 
 LIBOBJS = 
 LIBS = 
@@ -98,8 +120,8 @@
 MAINT = #
 MAKEINFO = ${SHELL} /home/caolan/libexttextcat/missing --run makeinfo
 MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
-NM = /usr/bin/nm -B
+MKDIR_P = /bin/mkdir -p
+NM = /bin/nm -B
 NMEDIT = 
 OBJDUMP = objdump
 OBJEXT = o
@@ -108,17 +130,17 @@
 PACKAGE = libexttextcat
 PACKAGE_BUGREPORT = 
 PACKAGE_NAME = libexttextcat
-PACKAGE_STRING = libexttextcat 3.3.1
+PACKAGE_STRING = libexttextcat 3.4.0
 PACKAGE_TARNAME = libexttextcat
 PACKAGE_URL = 
-PACKAGE_VERSION = 3.3.1
+PACKAGE_VERSION = 3.4.0
 PATH_SEPARATOR = :
 RANLIB = ranlib
-SED = /usr/bin/sed
+SED = /bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 3.3.1
+VERSION = 3.4.0
 abs_builddir = /home/caolan/libexttextcat/langclass/ShortTexts
 abs_srcdir = /home/caolan/libexttextcat/langclass/ShortTexts
 abs_top_builddir = /home/caolan/libexttextcat
@@ -157,7 +179,7 @@
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
 mandir = ${datarootdir}/man
-mkdir_p = /usr/bin/mkdir -p
+mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
 prefix = /usr/local
diff -Nru libexttextcat-3.3.1/langclass/ShortTexts/Makefile.in libexttextcat-3.4.0/langclass/ShortTexts/Makefile.in
--- libexttextcat-3.3.1/langclass/ShortTexts/Makefile.in	2012-05-30 12:58:49.000000000 +0000
+++ libexttextcat-3.4.0/langclass/ShortTexts/Makefile.in	2012-11-05 14:19:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,6 +68,11 @@
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
diff -Nru libexttextcat-3.3.1/langclass/ShortTexts/pl.txt libexttextcat-3.4.0/langclass/ShortTexts/pl.txt
--- libexttextcat-3.3.1/langclass/ShortTexts/pl.txt	2011-09-27 09:27:28.000000000 +0000
+++ libexttextcat-3.4.0/langclass/ShortTexts/pl.txt	2012-11-05 13:44:38.000000000 +0000
@@ -53,7 +53,7 @@
 Każdy człowiek ma na warunkach całkowitej równości prawo, aby przy rozstrzyganiu o jego prawach i zobowiązaniach lub o zasadności wysuwanego przeciw niemu oskarżenia o popełnienie przestępstwa być słuchanym sprawiedliwie i publicznie przez niezależny i bezstronny sąd.
 Artykuł 11
 
-    Każdy człowiek oskarżony o popełnienie przestjpstwa ma prawo, aby uznawano go za niewinnego dopóty, dopóki nie udowodni mu się winy zgodnie z prawem podczas publicznego procesu, w którym zapewniono mu wszystkie konieczne środki obrony.
+    Każdy człowiek oskarżony o popełnienie przestępstwa ma prawo, aby uznawano go za niewinnego dopóty, dopóki nie udowodni mu się winy zgodnie z prawem podczas publicznego procesu, w którym zapewniono mu wszystkie konieczne środki obrony.
     Nikt nie może być skazany za przestępstwo z powodu działania lub zaniechania nie stanowiącego w chwili jego dokonania przestępstwa według prawa krajowego lub międzynarodowego. Nie wolno także wymierzać kary wyższej niż ta, która była przewidziana w chwili popełnienia przestępstwa.
 
 Artykuł 12
@@ -78,7 +78,7 @@
 
     Mężczyźni i kobiety bez względu na jakiekolwiek różnice rasy, narodowości lub wyznania mają prawo po osiągnięciu pełnoletności do zawarcia małżeństwa i założenia rodziny. Mają oni równe prawa w odniesieniu do zawierania małżeństwa, podczas jego trwania i po jego ustaniu.
     Małżeństwo może być zawarte jedynie za swobodnie wyrażoną pełną zgodą przyszłych małżonków.
-    Rodzina jest naturalną i podstawową komórką społeczeństwa i ma prawo do ochrony ze strony społeczeŃstwa i Państwa.
+    Rodzina jest naturalną i podstawową komórką społeczeństwa i ma prawo do ochrony ze strony społeczeństwa i Państwa.
 
 Artykuł 17
 
@@ -108,7 +108,7 @@
 Artykuł 23
 
     Każdy człowiek ma prawo do pracy, do swobodnego wyboru pracy, do odpowiednich i zadowalających warunków pracy oraz do ochrony przed bezrobociem.
-    Każdy człowiek, bez względu na jakiekolwiek różnice, ma prawo do równej płacy za równą pracj.
+    Każdy człowiek, bez względu na jakiekolwiek różnice, ma prawo do równej płacy za równą pracę.
     Każdy pracujący ma prawo do odpowiedniego i zadowalającego wynagrodzenia, zapewniającego jemu i jego rodzinie egzystencję odpowiadającą godności ludzkiej i uzupełnianego w razie potrzeby innymi środkami pomocy społecznej.
     Każdy człowiek ma prawo do tworzenia związków zawodowych i do przystępowania do związków zawodowych dla ochrony swych interesów.
 
@@ -117,14 +117,14 @@
 Każdy człowiek ma prawo do urlopu i wypoczynku, włączając w to rozsądne ograniczenie godzin pracy i okresowe płatne urlopy.
 Artykuł 25
 
-    Każdy człowiek ma prawo do stopy życiowej zapewniającej zdrowie i dobrobyt jego i jego rodziny, włączając w to wyżywienie, odzież, mieszkanie, opiekj lekarską i konieczne świadczenia socjalne, oraz prawo do ubezpieczenia na wypadek bezrobocia, choroby, niezdolności do pracy, wdowieństwa, starości lub utraty środków do życia w inny sposób od niego niezależny.
+    Każdy człowiek ma prawo do stopy życiowej zapewniającej zdrowie i dobrobyt jego i jego rodziny, włączając w to wyżywienie, odzież, mieszkanie, opiekę lekarską i konieczne świadczenia socjalne, oraz prawo do ubezpieczenia na wypadek bezrobocia, choroby, niezdolności do pracy, wdowieństwa, starości lub utraty środków do życia w inny sposób od niego niezależny.
     Matka i dziecko mają prawo do specjalnej opieki i pomocy. Wszystkie dzieci, zarówno małżeńskie jak i pozamałżeńskie, korzystają z jednakowej ochrony społecznej.
 
 Artykuł 26
 
     Każdy człowiek ma prawo do nauki. Nauka jest bezpłatna, przynajmniej na stopniu podstawowym. Nauka podstawowa jest obowiązkowa. Oświata techniczna i zawodowa jest powszechnie dostępna, a studia wyższe są dostępne dla wszystkich na zasadzie równości w zależności od zalet osobistych.
     Celem nauczania jest pełny rozwój osobowości ludzkiej i ugruntowanie poszanowania praw człowieka i podstawowych wolności. Krzewi ono zrozumienie, tolerancję i przyjaźń między wszystkimi narodami, grupami rasowymi lub religijnymi; popiera działalność Organizacji Narodów Zjednoczonych zmierzającą do utrzymania pokoju.
-    Rodzice mają prawo pierwszeństwa w wvborze nauczania, które ma być dane ich dzieciom.
+    Rodzice mają prawo pierwszeństwa w wyborze nauczania, które ma być dane ich dzieciom.
 
 Artykuł 27
 
diff -Nru libexttextcat-3.3.1/libexttextcat.pc.in libexttextcat-3.4.0/libexttextcat.pc.in
--- libexttextcat-3.3.1/libexttextcat.pc.in	2012-05-30 12:52:54.000000000 +0000
+++ libexttextcat-3.4.0/libexttextcat.pc.in	2012-06-28 08:15:52.000000000 +0000
@@ -10,6 +10,6 @@
 Description: Library implementing N-gram-based text categorization
 Version: @VERSION@
 Requires:
-Libs: -L${libdir} -lexttextcat-1.0
+Libs: -L${libdir} -lexttextcat-2.0
 Cflags: -I${includedir}/libexttextcat/
 
diff -Nru libexttextcat-3.3.1/src/Makefile.am libexttextcat-3.4.0/src/Makefile.am
--- libexttextcat-3.3.1/src/Makefile.am	2012-05-28 14:19:06.000000000 +0000
+++ libexttextcat-3.4.0/src/Makefile.am	2012-11-05 14:18:12.000000000 +0000
@@ -3,26 +3,25 @@
 noinst_HEADERS = \
 	common_impl.h wg_mempool.h
 
-libexttextcat_1_0_includedir = $(includedir)/libexttextcat
-libexttextcat_1_0_include_HEADERS = \
+libexttextcat_2_0_includedir = $(includedir)/libexttextcat
+libexttextcat_2_0_include_HEADERS = \
 	common.h constants.h fingerprint.h textcat.h utf8misc.h textcat_properties.h \
         $(builddir)/exttextcat-version.h
 
-lib_LTLIBRARIES =	libexttextcat-1.0.la
-libexttextcat_1_0_la_SOURCES = \
+lib_LTLIBRARIES =	libexttextcat-2.0.la
+libexttextcat_2_0_la_SOURCES = \
 	common.c fingerprint.c textcat.c wg_mempool.c utf8misc.c
-libexttextcat_1_0_la_LDFLAGS = -no-undefined
+libexttextcat_2_0_la_LDFLAGS = -no-undefined
 
 bin_PROGRAMS =		createfp
 createfp_SOURCES =	createfp.c
-createfp_LDADD =	libexttextcat-1.0.la
+createfp_LDADD =	libexttextcat-2.0.la
 
 check_PROGRAMS =	testtextcat
 testtextcat_SOURCES =	testtextcat.c
-testtextcat_LDADD =	libexttextcat-1.0.la
+testtextcat_LDADD =	libexttextcat-2.0.la
 
 EXTRA_DIST = libexttextcat.map \
-	makefile.mk \
 	test-primary.sh.in \
 	test-secondary.sh.in \
 	exttextcat-version.h  \
diff -Nru libexttextcat-3.3.1/src/Makefile.in libexttextcat-3.4.0/src/Makefile.in
--- libexttextcat-3.3.1/src/Makefile.in	2012-05-30 12:58:49.000000000 +0000
+++ libexttextcat-3.4.0/src/Makefile.in	2012-11-05 14:19:15.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,6 +18,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -39,7 +56,7 @@
 bin_PROGRAMS = createfp$(EXEEXT)
 check_PROGRAMS = testtextcat$(EXEEXT)
 subdir = src
-DIST_COMMON = $(libexttextcat_1_0_include_HEADERS) $(noinst_HEADERS) \
+DIST_COMMON = $(libexttextcat_2_0_include_HEADERS) $(noinst_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/config.h.in $(srcdir)/exttextcat-version.h.in \
 	$(srcdir)/test-primary.sh.in $(srcdir)/test-secondary.sh.in
@@ -80,26 +97,26 @@
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(libexttextcat_1_0_includedir)"
+	"$(DESTDIR)$(libexttextcat_2_0_includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libexttextcat_1_0_la_LIBADD =
-am_libexttextcat_1_0_la_OBJECTS = common.lo fingerprint.lo textcat.lo \
+libexttextcat_2_0_la_LIBADD =
+am_libexttextcat_2_0_la_OBJECTS = common.lo fingerprint.lo textcat.lo \
 	wg_mempool.lo utf8misc.lo
-libexttextcat_1_0_la_OBJECTS = $(am_libexttextcat_1_0_la_OBJECTS)
+libexttextcat_2_0_la_OBJECTS = $(am_libexttextcat_2_0_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
-libexttextcat_1_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+libexttextcat_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libexttextcat_1_0_la_LDFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS) $(libexttextcat_2_0_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
 PROGRAMS = $(bin_PROGRAMS)
 am_createfp_OBJECTS = createfp.$(OBJEXT)
 createfp_OBJECTS = $(am_createfp_OBJECTS)
-createfp_DEPENDENCIES = libexttextcat-1.0.la
+createfp_DEPENDENCIES = libexttextcat-2.0.la
 am_testtextcat_OBJECTS = testtextcat.$(OBJEXT)
 testtextcat_OBJECTS = $(am_testtextcat_OBJECTS)
-testtextcat_DEPENDENCIES = libexttextcat-1.0.la
+testtextcat_DEPENDENCIES = libexttextcat-2.0.la
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -126,11 +143,16 @@
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libexttextcat_1_0_la_SOURCES) $(createfp_SOURCES) \
+SOURCES = $(libexttextcat_2_0_la_SOURCES) $(createfp_SOURCES) \
 	$(testtextcat_SOURCES)
-DIST_SOURCES = $(libexttextcat_1_0_la_SOURCES) $(createfp_SOURCES) \
+DIST_SOURCES = $(libexttextcat_2_0_la_SOURCES) $(createfp_SOURCES) \
 	$(testtextcat_SOURCES)
-HEADERS = $(libexttextcat_1_0_include_HEADERS) $(noinst_HEADERS)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(libexttextcat_2_0_include_HEADERS) $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -257,22 +279,21 @@
 noinst_HEADERS = \
 	common_impl.h wg_mempool.h
 
-libexttextcat_1_0_includedir = $(includedir)/libexttextcat
-libexttextcat_1_0_include_HEADERS = \
+libexttextcat_2_0_includedir = $(includedir)/libexttextcat
+libexttextcat_2_0_include_HEADERS = \
 	common.h constants.h fingerprint.h textcat.h utf8misc.h textcat_properties.h \
         $(builddir)/exttextcat-version.h
 
-lib_LTLIBRARIES = libexttextcat-1.0.la
-libexttextcat_1_0_la_SOURCES = \
+lib_LTLIBRARIES = libexttextcat-2.0.la
+libexttextcat_2_0_la_SOURCES = \
 	common.c fingerprint.c textcat.c wg_mempool.c utf8misc.c
 
-libexttextcat_1_0_la_LDFLAGS = -no-undefined
+libexttextcat_2_0_la_LDFLAGS = -no-undefined
 createfp_SOURCES = createfp.c
-createfp_LDADD = libexttextcat-1.0.la
+createfp_LDADD = libexttextcat-2.0.la
 testtextcat_SOURCES = testtextcat.c
-testtextcat_LDADD = libexttextcat-1.0.la
+testtextcat_LDADD = libexttextcat-2.0.la
 EXTRA_DIST = libexttextcat.map \
-	makefile.mk \
 	test-primary.sh.in \
 	test-secondary.sh.in \
 	exttextcat-version.h  \
@@ -336,7 +357,6 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -344,6 +364,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -365,12 +387,15 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libexttextcat-1.0.la: $(libexttextcat_1_0_la_OBJECTS) $(libexttextcat_1_0_la_DEPENDENCIES) $(EXTRA_libexttextcat_1_0_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libexttextcat_1_0_la_LINK) -rpath $(libdir) $(libexttextcat_1_0_la_OBJECTS) $(libexttextcat_1_0_la_LIBADD) $(LIBS)
+libexttextcat-2.0.la: $(libexttextcat_2_0_la_OBJECTS) $(libexttextcat_2_0_la_DEPENDENCIES) $(EXTRA_libexttextcat_2_0_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libexttextcat_2_0_la_LINK) -rpath $(libdir) $(libexttextcat_2_0_la_OBJECTS) $(libexttextcat_2_0_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p || test -f $$p1; \
@@ -466,24 +491,27 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-libexttextcat_1_0_includeHEADERS: $(libexttextcat_1_0_include_HEADERS)
+install-libexttextcat_2_0_includeHEADERS: $(libexttextcat_2_0_include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexttextcat_1_0_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libexttextcat_1_0_includedir)"
-	@list='$(libexttextcat_1_0_include_HEADERS)'; test -n "$(libexttextcat_1_0_includedir)" || list=; \
+	@list='$(libexttextcat_2_0_include_HEADERS)'; test -n "$(libexttextcat_2_0_includedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libexttextcat_2_0_includedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libexttextcat_2_0_includedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libexttextcat_1_0_includedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libexttextcat_1_0_includedir)" || exit $$?; \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libexttextcat_2_0_includedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libexttextcat_2_0_includedir)" || exit $$?; \
 	done
 
-uninstall-libexttextcat_1_0_includeHEADERS:
+uninstall-libexttextcat_2_0_includeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexttextcat_1_0_include_HEADERS)'; test -n "$(libexttextcat_1_0_includedir)" || list=; \
+	@list='$(libexttextcat_2_0_include_HEADERS)'; test -n "$(libexttextcat_2_0_includedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(libexttextcat_1_0_includedir)'; $(am__uninstall_files_from_dir)
+	dir='$(DESTDIR)$(libexttextcat_2_0_includedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -574,7 +602,7 @@
 install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexttextcat_1_0_includedir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexttextcat_2_0_includedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -630,7 +658,7 @@
 
 info-am:
 
-install-data-am: install-libexttextcat_1_0_includeHEADERS
+install-data-am: install-libexttextcat_2_0_includeHEADERS
 
 install-dvi: install-dvi-am
 
@@ -677,7 +705,7 @@
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
-	uninstall-libexttextcat_1_0_includeHEADERS
+	uninstall-libexttextcat_2_0_includeHEADERS
 
 .MAKE: all check-am install-am install-strip
 
@@ -690,14 +718,14 @@
 	install-data-am install-dvi install-dvi-am install-exec \
 	install-exec-am install-html install-html-am install-info \
 	install-info-am install-libLTLIBRARIES \
-	install-libexttextcat_1_0_includeHEADERS install-man \
+	install-libexttextcat_2_0_includeHEADERS install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
-	uninstall-libexttextcat_1_0_includeHEADERS
+	uninstall-libexttextcat_2_0_includeHEADERS
 
 
 check:
diff -Nru libexttextcat-3.3.1/src/common.c libexttextcat-3.4.0/src/common.c
--- libexttextcat-3.3.1/src/common.c	2012-01-09 12:30:21.000000000 +0000
+++ libexttextcat-3.4.0/src/common.c	2012-06-28 08:03:55.000000000 +0000
@@ -128,15 +128,15 @@
             {
                 p++;
             }
-            state = 1;
 
-        case 1:
             /*** Start segment ***/
             result[cnt] = w;
             cnt++;
-            state = 2;
+            state = 1;
 
-        case 2:
+            /*** fall through **/
+
+        case 1:
             /*** Unquoted segment ***/
             while (*p)
             {
@@ -151,7 +151,7 @@
                 {
                     /*** Start quotation ***/
                     p++;
-                    state = 3;
+                    state = 2;
                     break;
                 }
                 else if (*p == '\\' && p[1])
@@ -167,7 +167,7 @@
             }
             break;
 
-        case 3:
+        case 2:
             /*** Inside quotes ***/
             while (*p)
             {
@@ -187,7 +187,7 @@
                     *w++ = *p++;
                 }
             }
-            state = 2;
+            state = 1;
             break;
 
         }
diff -Nru libexttextcat-3.3.1/src/createfp.c libexttextcat-3.4.0/src/createfp.c
--- libexttextcat-3.3.1/src/createfp.c	2012-01-13 21:02:54.000000000 +0000
+++ libexttextcat-3.4.0/src/createfp.c	2012-06-28 08:27:21.000000000 +0000
@@ -48,7 +48,7 @@
 
 char *myread(FILE * fp)
 {
-    char *buf;
+    char *buf, *newbuf;
     size_t size = 0;
     size_t maxsize = BLOCKSIZE * 2;
 
@@ -60,19 +60,27 @@
         if (size + BLOCKSIZE > maxsize)
         {
             maxsize *= 2;
-            buf = (char *)realloc(buf, maxsize);
+            newbuf = (char *)realloc(buf, maxsize);
+            if (!newbuf)
+                free(buf);
+            buf = newbuf;
         }
 
     }
-    while (!feof(stdin));
+    while (!feof(stdin) && buf);
 
-    buf[size] = '\0';
-    buf = (char *)realloc(buf, size + 1);
+    if (buf)
+    {
+        buf[size] = '\0';
+        newbuf = (char *)realloc(buf, size + 1);
+        if (!newbuf)
+            free(buf);
+        buf = newbuf;
+    }
 
     return buf;
 }
 
-
 int main(int argc, char **args)
 {
     void *h;
diff -Nru libexttextcat-3.3.1/src/exttextcat-version.h libexttextcat-3.4.0/src/exttextcat-version.h
--- libexttextcat-3.3.1/src/exttextcat-version.h	2012-05-30 12:58:54.000000000 +0000
+++ libexttextcat-3.4.0/src/exttextcat-version.h	2012-11-05 14:19:29.000000000 +0000
@@ -1,9 +1,9 @@
 #ifndef EXTTEXTCAT_VERSION_H
 #define EXTTEXTCAT_VERSION_H
 
-#define EXTTEXTCAT_VERSION "3.3.1"
+#define EXTTEXTCAT_VERSION "3.4.0"
 #define EXTTEXTCAT_VERSION_MAJOR 3
-#define EXTTEXTCAT_VERSION_MINOR 3
-#define EXTTEXTCAT_VERSION_MICRO 1
+#define EXTTEXTCAT_VERSION_MINOR 4
+#define EXTTEXTCAT_VERSION_MICRO 0
 
 #endif
diff -Nru libexttextcat-3.3.1/src/fingerprint.c libexttextcat-3.4.0/src/fingerprint.c
--- libexttextcat-3.3.1/src/fingerprint.c	2012-01-13 21:02:54.000000000 +0000
+++ libexttextcat-3.4.0/src/fingerprint.c	2012-06-28 08:12:25.000000000 +0000
@@ -654,19 +654,6 @@
     return 1;
 }
 
-extern void fp_Debug(void *handle)
-{
-    fp_t *h = (fp_t *) handle;
-    uint4 i;
-    printf("------ %s --------\n", h->name);
-    for (i = 0; i < h->size; i++)
-    {
-        printf("%3u: '%s' [%u]\n", i, h->fprint[i].str, h->fprint[i].rank);
-    }
-
-
-}
-
 extern int fp_Read(void *handle, const char *fname, int maxngrams)
 {
     fp_t *h = (fp_t *) handle;
diff -Nru libexttextcat-3.3.1/src/libexttextcat.map libexttextcat-3.4.0/src/libexttextcat.map
--- libexttextcat-3.3.1/src/libexttextcat.map	2012-01-13 21:02:54.000000000 +0000
+++ libexttextcat-3.4.0/src/libexttextcat.map	2012-06-28 08:16:38.000000000 +0000
@@ -7,7 +7,6 @@
 		wgmempool_Init
 		wgmempool_Reset
 		wgmempool_alloc
-		wgmempool_getline
 		wgmempool_strdup
 		special_textcat_Init
 		textcat_Classify
@@ -20,7 +19,6 @@
 		textcat_Version
 		fp_Compare
 		fp_Create
-		fp_Debug
 		fp_Done
 		fp_Init
 		fp_Name
diff -Nru libexttextcat-3.3.1/src/makefile.mk libexttextcat-3.4.0/src/makefile.mk
--- libexttextcat-3.3.1/src/makefile.mk	2012-05-25 12:28:36.000000000 +0000
+++ libexttextcat-3.4.0/src/makefile.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..$/..
-
-PRJNAME = libexttextcat
-TARGET  = libexttextcat
-CFLAGSCALL=gsd
-
-USE_DEFFILE=TRUE
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-VISIBILITY_HIDDEN=TRUE
-UWINAPILIB=
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-# !! not to be compiled because those belong to a stand alone programs: !!
-#        $(SLO)$/createfp.obj\
-#        $(SLO)$/testtextcat.obj
-
-SLOFILES=   \
-        $(SLO)$/common.obj\
-        $(SLO)$/fingerprint.obj\
-        $(SLO)$/textcat.obj\
-        $(SLO)$/wg_mempool.obj\
-        $(SLO)$/utf8misc.obj
-
-#SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
-SHL1TARGET= $(TARGET)
-
-SHL1STDLIBS=
-
-# build DLL
-SHL1LIBS=       $(SLB)$/$(TARGET).lib
-SHL1IMPLIB=     i$(TARGET)
-SHL1DEPN=       $(SHL1LIBS)
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-# build DEF file
-DEF1NAME=       $(SHL1TARGET)
-DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt
-
-SHL1VERSIONMAP= libexttextcat.map
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(MISC)$/$(SHL1TARGET).flt:  makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    @echo Imp>$@
-    @echo __CT>>$@
-    @echo _real>>$@
-    @echo unnamed>>$@
diff -Nru libexttextcat-3.3.1/src/testtextcat.c libexttextcat-3.4.0/src/testtextcat.c
--- libexttextcat-3.3.1/src/testtextcat.c	2012-01-13 21:02:54.000000000 +0000
+++ libexttextcat-3.4.0/src/testtextcat.c	2012-06-28 08:27:10.000000000 +0000
@@ -49,7 +49,7 @@
 
 char *myread(FILE * fp)
 {
-    char *buf;
+    char *buf, *newbuf;
     size_t size = 0;
     size_t maxsize = BLOCKSIZE * 2;
 
@@ -61,26 +61,34 @@
         if (size + BLOCKSIZE > maxsize)
         {
             maxsize *= 2;
-            buf = (char *)realloc(buf, maxsize);
+            newbuf = (char *)realloc(buf, maxsize);
+            if (!newbuf)
+                free(buf);
+            buf = newbuf;
         }
 
     }
-    while (!feof(stdin));
+    while (!feof(stdin) && buf);
 
-    buf[size] = '\0';
-    buf = (char *)realloc(buf, size + 1);
+    if (buf)
+    {
+        buf[size] = '\0';
+        newbuf = (char *)realloc(buf, size + 1);
+        if (!newbuf)
+            free(buf);
+        buf = newbuf;
+    }
 
     return buf;
 }
 
-
 int main(int argc, char **argv)
 {
     void *h;
     char *result;
     char *buf;
     const char *conf;
-    int utfaware = 1;
+    int utfaware = TC_TRUE;
 
     if ((argc > 3) && (!strcmp(argv[3], "--no-utf8")))
     {
@@ -98,14 +106,7 @@
         fprintf(stderr, "Unable to init using '%s', Aborting.\n", conf);
         exit(-1);
     }
-    if (utfaware)
-    {
-        textcat_SetProperty(h, TCPROP_UTF8AWARE, TC_TRUE);
-    }
-    else
-    {
-        textcat_SetProperty(h, TCPROP_UTF8AWARE, TC_TRUE);
-    }
+    textcat_SetProperty(h, TCPROP_UTF8AWARE, utfaware ? TC_TRUE : TC_FALSE);
 
     buf = myread(stdin);
 
diff -Nru libexttextcat-3.3.1/src/textcat.c libexttextcat-3.4.0/src/textcat.c
--- libexttextcat-3.3.1/src/textcat.c	2012-01-13 21:02:54.000000000 +0000
+++ libexttextcat-3.4.0/src/textcat.c	2012-11-01 14:40:35.000000000 +0000
@@ -174,14 +174,14 @@
     {
         char *p;
         char *segment[4];
-        int res;
 
         /*** Skip comments ***/
         if ((p = strchr(line, '#')))
         {
             *p = '\0';
         }
-        if ((res = wg_split(segment, line, line, 4)) < 2)
+
+        if (wg_split(segment, line, line, 4) < 2)
         {
             continue;
         }
@@ -212,8 +212,6 @@
                                 sizeof(char) * (tmp_size + 1));
             if (tmp == NULL)
             {
-                free(finger_print_file_name);
-                finger_print_file_name_size = 0;
                 goto BAILOUT;
             }
             else
@@ -226,10 +224,7 @@
         strcat(finger_print_file_name, segment[0]);
 
         if (fp_Read(h->fprint[h->size], finger_print_file_name, 400) == 0)
-        {
-            textcat_Done(h);
             goto BAILOUT;
-        }
         h->fprint_disable[h->size] = 0xF0;  /* 0xF0 is the code for enabled
                                                languages, 0x0F is for disabled 
                                              */
@@ -242,9 +237,10 @@
     return h;
 
   BAILOUT:
+    free(finger_print_file_name);
     fclose(fp);
+    textcat_Done(h);
     return NULL;
-
 }
 
 extern candidate_t *textcat_GetClassifyFullOutput(void *handle)
diff -Nru libexttextcat-3.3.1/src/wg_mempool.c libexttextcat-3.4.0/src/wg_mempool.c
--- libexttextcat-3.3.1/src/wg_mempool.c	2012-01-09 12:31:43.000000000 +0000
+++ libexttextcat-3.4.0/src/wg_mempool.c	2012-06-28 08:16:23.000000000 +0000
@@ -210,42 +210,4 @@
     return result;
 }
 
-
-extern char *wgmempool_getline(void *handle, size_t size, FILE * fp)
-{
-    char *result, *p;
-    mempool_t *h = (mempool_t *) handle;
-    memblock_t *block = h->first;
-
-    /*** Enough space? ***/
-    if (block->p + size > block->pend + h->maxallocsize)
-    {
-        addblock(h);
-        block = h->first;
-    }
-
-    result = (char *)block->p;
-    if (fgets(result, size, fp) == NULL)
-    {
-        return NULL;
-    }
-
-        /** end of stream? **/
-    if (feof(fp))
-    {
-        return NULL;
-    }
-
-        /** find end of line **/
-    p = result;
-    while (*p && *p != '\n' && *p != '\r')
-    {
-        p++;
-    }
-    *p++ = '\0';
-
-    block->p = p;
-    return result;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */