[Debian-islamic-commits] [SCM] Packaging for Monajat branch, master, updated. debian/2.6.1-3-5-g776357a

[أحمد المحمو =?UTF-8?Q?=D8=AF=D9=8A=20?=(Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit 4d9879366f40dc444f2b0030340ead27e3362a7a
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Sat Oct 22 08:52:29 2011 +0200

    Removed patches applied upstream: fix-lang-selection.diff, remove-timeout-to-fix-lp-844680.patch

diff --git a/debian/patches/fix-lang-selection.diff b/debian/patches/fix-lang-selection.diff
deleted file mode 100644
index cd47e2d..0000000
--- a/debian/patches/fix-lang-selection.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Fix language selections
-Origin: http://git.ojuba.org/cgit/monajat/commit/?id=e24c17ab572e5c56c14c8f3af465382ede61091b
-Author: Muayyad Alsadi مؤيد السعدي <alsadi at ojuba.org>
-
-
---- a/monajat/applet.py
-+++ b/monajat/applet.py
-@@ -4,6 +4,7 @@
- from monajat import Monajat
- from utils import init_dbus
- import locale, gettext
-+import re
- 
- import glib
- import gtk
-@@ -45,7 +46,7 @@
-     
-   def on_message(self, bus, message):
-     t = message.type
--    print t
-+    # print t
-     if t == gst.MESSAGE_EOS:
-       if self.change_play_status: self.change_play_status()
-       self.gst_player.set_state(gst.STATE_NULL)
-@@ -233,6 +234,7 @@
-     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
-@@ -244,7 +246,7 @@
-     self.prayer_items=[]
-     kw=self.conf_to_prayer_args()
-     self.prayer=itl.PrayerTimes(**kw)
--    l=filter(lambda i: i.startswith('ar_') and "_" in i and '.' not in i, locale.locale_alias.keys())
-+    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"
diff --git a/debian/patches/remove-timeout-to-fix-lp-844680.patch b/debian/patches/remove-timeout-to-fix-lp-844680.patch
deleted file mode 100644
index f70a473..0000000
--- a/debian/patches/remove-timeout-to-fix-lp-844680.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: remove timeout to fix lp#844680
-Author: Muayyad Alsadi مؤيد السعدي <alsadi at ojuba.org>
-Origin: http://git.ojuba.org/cgit/monajat/commit/?id=f28edd92935a6adb57b04ae5608b684b3fb56cfc
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/monajat/+bug/844680
-
----
- monajat/applet.py |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/monajat/applet.py b/monajat/applet.py
-index 7c5c689..68ed03e 100644
---- a/monajat/applet.py
-+++ b/monajat/applet.py
-@@ -280,7 +280,8 @@ class applet(object):
-       self.notify.add_action("previous", _("previous"), self.notify_cb)
-       self.notify.add_action("next", _("next"), self.notify_cb)
-       self.notify.add_action("copy", _("copy"), self.notify_cb)
--    self.notify.set_timeout(5000)
-+    # FIXME: maybe we should have notify object per notification
-+    #self.notify.set_timeout(5000) # FIXME: commented out to fix https://bugs.launchpad.net/ubuntu/+source/monajat/+bug/844680
-     #self.notify.set_urgency(pynotify.URGENCY_LOW)
-     self.notify.set_hint('resident', True)
-     #self.notify.set_hint('transient', True)
--- 
-1.7.5.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3c6e766..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-fix-lang-selection.diff
-remove-timeout-to-fix-lp-844680.patch

-- 
Packaging for Monajat