diff -Nru textstat-0.0.20100102/debian/changelog textstat-0.0.20100102/debian/changelog --- textstat-0.0.20100102/debian/changelog 2011-05-09 01:04:57.000000000 +0000 +++ textstat-0.0.20100102/debian/changelog 2011-05-09 02:35:20.000000000 +0000 @@ -1,4 +1,4 @@ -textstat (0.0.20100102-0miry1) maverick; urgency=low +textstat (0.0.20100102-0miry2) maverick; urgency=low * Initial release. diff -Nru textstat-0.0.20100102/debian/patches/auto-lang.patch textstat-0.0.20100102/debian/patches/auto-lang.patch --- textstat-0.0.20100102/debian/patches/auto-lang.patch 2011-05-09 00:37:48.000000000 +0000 +++ textstat-0.0.20100102/debian/patches/auto-lang.patch 2011-05-09 02:45:43.000000000 +0000 @@ -1,5 +1,5 @@ ---- TextSTAT2-source-20100102.orig/TextSTAT.pyw -+++ TextSTAT2-source-20100102/TextSTAT.pyw +--- textstat-0.0.20100102.orig/TextSTAT.pyw ++++ textstat-0.0.20100102/TextSTAT.pyw @@ -7,6 +7,7 @@ import StatusBar, ToolBar, ProgressBar import TabPage, MultiListBox @@ -8,18 +8,71 @@ from xdg.BaseDirectory import * try: from win32com.client import Dispatch -@@ -37,7 +38,13 @@ +@@ -37,7 +38,7 @@ f.close() except: cfg = {} - cfg['Benutzersprache'] = 'en' # Optionen: de | nl | en | pt | fr | gl | fi -+ # os.getenv('LANG') -+ defLang = locale.getdefaultlocale()[0][0:2] -+ availableLangs = ['de', 'en', 'nl', 'pt', 'es', 'fr', 'gl', 'fi', 'po'] -+ if (defLang in availableLangs): -+ cfg['Benutzersprache'] = defLang -+ else: -+ cfg['Benutzersprache'] = 'en' ++ cfg['Benutzersprache'] = 'auto' cfg['KorpDir'] = SkriptDir cfg['FileDir'] = SkriptDir cfg['freqMin'] = '0' +@@ -51,25 +52,31 @@ + + + # Sprache +-if cfg['Benutzersprache'] == 'en': ++if cfg['Benutzersprache'] == 'auto' or cfg['Benutzersprache'] == 'Auto': ++ Lang = locale.getdefaultlocale()[0][0:2] ++else: ++ Lang = cfg['Benutzersprache'] ++ ++if Lang == 'en': + s = LangOpt.english +-elif cfg['Benutzersprache'] == 'nl': ++elif Lang == 'nl': + s = LangOpt.nederlands +-elif cfg['Benutzersprache'] == 'pt': ++elif Lang == 'pt': + s = LangOpt.portuguese +-elif cfg['Benutzersprache'] == 'es': ++elif Lang == 'es': + s = LangOpt.espanol +-elif cfg['Benutzersprache'] == 'fr': ++elif Lang == 'fr': + s = LangOpt.francais +-elif cfg['Benutzersprache'] == 'gl': ++elif Lang == 'gl': + s = LangOpt.galician +-elif cfg['Benutzersprache'] == 'fi': ++elif Lang == 'fi': + s = LangOpt.suomi +-elif cfg['Benutzersprache'] == 'po': ++elif Lang == 'po': + s = LangOpt.polski +-else: ++elif Lang == 'de': + s = LangOpt.deutsch +- ++else: ++ s = LangOpt.english + + ############### + # GUI +@@ -155,6 +162,7 @@ + self.sprache_aendern = StringVar() + self.sprache_aendern.set(cfg['Benutzersprache']) + oberflaechensprachen = [ ++ ['Auto', 'auto'], + ['Deutsch', 'de'], + ['English', 'en'], + ['Nederlands', 'nl'], +@@ -249,7 +257,7 @@ + + # Beim ersten Start: Sprache festlegen + if not os.path.exists(cfgFile): +- self.info('TextSTAT language', 'Welcome to TextSTAT! \n\nYou can change the language of TextSTAT (Menu > Language) \nAvailable Languages are: English, German, Dutch, French, Potuguese, Spanish, Galician, Finnish and Polish') ++ #self.info('TextSTAT language', 'Welcome to TextSTAT! \n\nYou can change the language of TextSTAT (Menu > Language) \nAvailable Languages are: English, German, Dutch, French, Potuguese, Spanish, Galician, Finnish and Polish') + self.optionen_speichern() + + diff -Nru textstat-0.0.20100102/debian/patches/home-dir.patch textstat-0.0.20100102/debian/patches/home-dir.patch --- textstat-0.0.20100102/debian/patches/home-dir.patch 2011-05-09 01:03:15.000000000 +0000 +++ textstat-0.0.20100102/debian/patches/home-dir.patch 2011-05-09 02:44:01.000000000 +0000 @@ -1,9 +1,9 @@ ---- TextSTAT2-source-20100102.orig/TextSTAT.pyw -+++ TextSTAT2-source-20100102/TextSTAT.pyw -@@ -45,8 +45,8 @@ - cfg['Benutzersprache'] = defLang - else: - cfg['Benutzersprache'] = 'en' +--- textstat-0.0.20100102.orig/TextSTAT.pyw ++++ textstat-0.0.20100102/TextSTAT.pyw +@@ -39,8 +39,8 @@ + except: + cfg = {} + cfg['Benutzersprache'] = 'auto' - cfg['KorpDir'] = SkriptDir - cfg['FileDir'] = SkriptDir + cfg['KorpDir'] = os.path.expanduser("~") diff -Nru textstat-0.0.20100102/debian/patches/series textstat-0.0.20100102/debian/patches/series --- textstat-0.0.20100102/debian/patches/series 2011-05-09 01:01:12.000000000 +0000 +++ textstat-0.0.20100102/debian/patches/series 2011-05-09 02:34:20.000000000 +0000 @@ -1,3 +1,4 @@ xdg-basedir.patch auto-lang.patch home-dir.patch +utf8.patch diff -Nru textstat-0.0.20100102/debian/patches/utf8.patch textstat-0.0.20100102/debian/patches/utf8.patch --- textstat-0.0.20100102/debian/patches/utf8.patch 1970-01-01 00:00:00.000000000 +0000 +++ textstat-0.0.20100102/debian/patches/utf8.patch 2011-05-09 02:35:07.000000000 +0000 @@ -0,0 +1,11 @@ +--- textstat-0.0.20100102.orig/TextSTAT.pyw ++++ textstat-0.0.20100102/TextSTAT.pyw +@@ -47,7 +47,7 @@ + cfg['konkContextR'] = '40' + cfg['zitContextL'] = '350' + cfg['zitContextR'] = '350' +- cfg['FileKodierung'] = 'iso8859_1' # wird momentan negiert... ++ cfg['FileKodierung'] = 'utf_8' # wird momentan negiert... + cfg['fenster'] = '700x580+10+10' # d.i.: Breite x Höhe + xOffset + yOffset + + diff -Nru textstat-0.0.20100102/debian/rules textstat-0.0.20100102/debian/rules --- textstat-0.0.20100102/debian/rules 2011-05-09 00:12:15.000000000 +0000 +++ textstat-0.0.20100102/debian/rules 2011-05-09 02:37:13.000000000 +0000 @@ -41,7 +41,7 @@ # dh_installmenu dh_installman dh_link - dh_compress + dh_compress --exclude=.pdf dh_fixperms [ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo dh_installdeb diff -Nru textstat-0.0.20100102/debian/textstat.install textstat-0.0.20100102/debian/textstat.install --- textstat-0.0.20100102/debian/textstat.install 2011-05-09 00:40:05.000000000 +0000 +++ textstat-0.0.20100102/debian/textstat.install 2011-05-09 02:36:18.000000000 +0000 @@ -3,3 +3,4 @@ debian/*.png usr/share/pixmaps/ debian/*.xpm usr/share/pixmaps/ debian/*.desktop usr/share/applications/ +debian/doc/* usr/share/doc/textstat/