diff -Nru monajat-2.6.2/debian/changelog monajat-2.6.3/debian/changelog --- monajat-2.6.2/debian/changelog 2011-10-26 06:14:41.000000000 +0000 +++ monajat-2.6.3/debian/changelog 2011-11-26 21:50:00.000000000 +0000 @@ -1,3 +1,13 @@ +monajat (2.6.3-1) unstable; urgency=low + + * New upstream release. + * Remove drop_cmp_to_key.diff as it is included in new upstream release. + * Updated fix_locale.diff to set language after several trials + * debian/control: Set monajat transitional package to be of priority extra + and in the oldlibs section + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Sat, 26 Nov 2011 23:49:32 +0200 + monajat (2.6.2-2) unstable; urgency=low * Added drop_cmp_to_key.diff patch to drop import of cmp_to_key, it isn't diff -Nru monajat-2.6.2/debian/control monajat-2.6.3/debian/control --- monajat-2.6.2/debian/control 2011-10-26 06:14:41.000000000 +0000 +++ monajat-2.6.3/debian/control 2011-11-26 21:50:00.000000000 +0000 @@ -44,6 +44,8 @@ This package contains the desktop tray applet. Package: monajat +Section: oldlibs +Priority: extra Architecture: all Depends: ${misc:Depends}, monajat-applet Description: Islamic supplications tray applet (transitional package) diff -Nru monajat-2.6.2/debian/patches/drop_cmp_to_key.diff monajat-2.6.3/debian/patches/drop_cmp_to_key.diff --- monajat-2.6.2/debian/patches/drop_cmp_to_key.diff 2011-10-26 06:14:41.000000000 +0000 +++ monajat-2.6.3/debian/patches/drop_cmp_to_key.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Do not import cmp_to_key, it isn't supported by Python 2.6 and - it's not used anyways -Origin: http://git.ojuba.org/cgit/monajat/commit/?id=35c1f7658f8b3d84302e56b2f69690d110612a54 -Bug-Debian: http://bugs.debian.org/646441 - -diff --git a/monajat/applet.py b/monajat/applet.py -index 68ed03e..fd9d122 100644 ---- a/monajat/applet.py -+++ b/monajat/applet.py -@@ -13,7 +13,6 @@ import cgi - import math - import json - import time --from functools import cmp_to_key - import gst - - # in gnome3 ['actions', 'action-icons', 'body', 'body-markup', 'icon-static', 'persistence'] diff -Nru monajat-2.6.2/debian/patches/fix_locale.diff monajat-2.6.3/debian/patches/fix_locale.diff --- monajat-2.6.2/debian/patches/fix_locale.diff 2011-10-26 06:14:41.000000000 +0000 +++ monajat-2.6.3/debian/patches/fix_locale.diff 2011-11-26 21:50:00.000000000 +0000 @@ -1,37 +1,52 @@ -Description: Simplify locale setting logic - Removed logic that tries to guess the appropriate locale for the - selected language, and leave that to setlocale. If successful, also the - LC_MESSAGES environment variable is also set to that locale, otherwise - just continue. -Origin: http://git.ojuba.org/cgit/monajat/commit/?id=2772f74cd4ecf5a1f613ea8ad10855f960621693 -Bug-Debian: http://bugs.debian.org/646483 +Description: Set language after several trials +Origin: http://git.ojuba.org/cgit/monajat/commit/?id=c013cce80553ef1b7749d7e1719f6a6862c84efb + +--- + monajat/applet.py | 23 +++++++++++++++++++---- + 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/monajat/applet.py b/monajat/applet.py -index fd9d122..048d9f0 100644 +index bb5e750..211b4cb 100644 --- a/monajat/applet.py +++ b/monajat/applet.py -@@ -241,7 +241,6 @@ class ConfigDlg(gtk.Dialog): +@@ -241,7 +241,25 @@ class ConfigDlg(gtk.Dialog): return gtk.Dialog.run(self, *a, **kw) class applet(object): -- locale_re=re.compile('^[a-z]+_[A-Z]+$', re.I) ++ locale_re=re.compile('^[a-z]+_[A-Z]+$', re.I) skip_auto_fn=os.path.expanduser('~/.monajat-applet-skip-auto') ++ ++ def _init_locale(self, lang): ++ try: l=locale.setlocale(locale.LC_MESSAGES, (lang, 'UTF-8')) ++ except: pass ++ else: ++ if l: os.environ['LC_MESSAGES']=l ++ return ++ for l in locale.locale_alias.keys(): ++ if not l.startswith(lang+'_') or not self.locale_re.match(l): continue ++ l,c=l.split('_',1) ++ l=l+"_"+c.upper()+".UTF-8" ++ try: locale.setlocale(locale.LC_MESSAGES, l) ++ except locale.Error: pass ++ else: ++ os.environ['LC_MESSAGES']=l ++ return ++ def __init__(self): self.conf_dlg=None -@@ -253,12 +252,10 @@ class applet(object): + self.chngbody=time.time() +@@ -252,10 +270,7 @@ class applet(object): self.prayer_items=[] kw=self.conf_to_prayer_args() self.prayer=itl.PrayerTimes(**kw) -- l=filter(lambda i: i.startswith(self.m.lang+'_') and self.locale_re.match(i), locale.locale_alias.keys()) -- if l: -- l,c=l[0].split('_',1) -- l=l+"_"+c.upper()+".UTF-8" -- os.environ['LC_MESSAGES']=l -- locale.setlocale(locale.LC_MESSAGES, l) -+ try: -+ l=locale.setlocale(locale.LC_MESSAGES, (self.m.lang, 'UTF-8')) -+ if l: os.environ['LC_MESSAGES']=l -+ except locale.Error: pass +- try: +- l=locale.setlocale(locale.LC_MESSAGES, (self.m.lang, 'UTF-8')) +- if l: os.environ['LC_MESSAGES']=l +- except locale.Error: pass ++ self._init_locale(self.m.lang) ld=os.path.join(self.m.get_prefix(),'..','locale') gettext.install('monajat', ld, unicode=0) self.ptnames=[_("Fajr"), _("Sunrise"), _("Dhuhr"), _("Asr"), _("Maghrib"), _("Isha'a")] +-- +1.7.7.2 + diff -Nru monajat-2.6.2/debian/patches/series monajat-2.6.3/debian/patches/series --- monajat-2.6.2/debian/patches/series 2011-10-26 06:14:41.000000000 +0000 +++ monajat-2.6.3/debian/patches/series 2011-11-26 21:50:00.000000000 +0000 @@ -1,2 +1 @@ -drop_cmp_to_key.diff fix_locale.diff diff -Nru monajat-2.6.2/monajat/applet.py monajat-2.6.3/monajat/applet.py --- monajat-2.6.2/monajat/applet.py 2011-10-19 20:11:53.000000000 +0000 +++ monajat-2.6.3/monajat/applet.py 2011-11-22 08:58:26.000000000 +0000 @@ -13,7 +13,6 @@ import math import json import time -from functools import cmp_to_key import gst # in gnome3 ['actions', 'action-icons', 'body', 'body-markup', 'icon-static', 'persistence'] @@ -242,7 +241,6 @@ return gtk.Dialog.run(self, *a, **kw) class applet(object): - locale_re=re.compile('^[a-z]+_[A-Z]+$', re.I) skip_auto_fn=os.path.expanduser('~/.monajat-applet-skip-auto') def __init__(self): self.conf_dlg=None @@ -254,12 +252,10 @@ self.prayer_items=[] kw=self.conf_to_prayer_args() self.prayer=itl.PrayerTimes(**kw) - l=filter(lambda i: i.startswith(self.m.lang+'_') and self.locale_re.match(i), locale.locale_alias.keys()) - if l: - l,c=l[0].split('_',1) - l=l+"_"+c.upper()+".UTF-8" - os.environ['LC_MESSAGES']=l - locale.setlocale(locale.LC_MESSAGES, l) + try: + l=locale.setlocale(locale.LC_MESSAGES, (self.m.lang, 'UTF-8')) + if l: os.environ['LC_MESSAGES']=l + except locale.Error: pass ld=os.path.join(self.m.get_prefix(),'..','locale') gettext.install('monajat', ld, unicode=0) self.ptnames=[_("Fajr"), _("Sunrise"), _("Dhuhr"), _("Asr"), _("Maghrib"), _("Isha'a")] @@ -332,7 +328,7 @@ if "alt" not in kw or not kw["alt"]: kw["alt"]=0.0 kw["tz"]=kw["utc"] # NOTE: get DST from machine local setting - kw["dst"]=time.daylight + kw["dst"]=time.localtime().tm_isdst # FIXME: dst should have the following 3 options # a. auto from system, b. auto from algorithm, c. specified to 0/1 by user #dst=kw["dst_id"] diff -Nru monajat-2.6.2/monajat.spec monajat-2.6.3/monajat.spec --- monajat-2.6.2/monajat.spec 2011-10-19 20:11:53.000000000 +0000 +++ monajat-2.6.3/monajat.spec 2011-11-22 08:58:26.000000000 +0000 @@ -1,7 +1,7 @@ Name: monajat Summary: Monajat Islamic Supplications URL: http://git.ojuba.org/cgit/monajat/about/ -Version: 2.6.2 +Version: 2.6.3 Release: 1%{?dist} Source0: http://git.ojuba.org/cgit/monajat/snapshot/%{name}-%{version}.tar.bz2 License: GPLv2