[Debian-islamic-commits] [SCM] Packaging for Monajat branch, master, updated. upstream/2.3.1-31-g22ec7cd

[أحمد المحمودي (Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit f2e969c693895ca47e206edfdcdb37ebe6acb2bd
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Thu Jun 17 23:54:10 2010 +0300

    Remove desktop.diff & scripts.diff patches as they got applied upstream.

diff --git a/debian/patches/desktop.diff b/debian/patches/desktop.diff
deleted file mode 100644
index 57cebea..0000000
--- a/debian/patches/desktop.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Description:
- * Remove Encoding field.
- * Add X-Islamic-Software category.
- * Replace irrevelant categories with Utility.
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
---- a/monajat-autostart.desktop
-+++ b/monajat-autostart.desktop
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Monajat Applet for supplications
- Name[ar]=بريمج مناجاة للأذكار
- Comment=Monajat in system tray icon
-@@ -10,5 +9,5 @@
- Icon=monajat
- X-KDE-autostart-after=panel
- StartupNotify=false
--Categories=GTK;Monitor;System;X-Red-Hat-Base;
-+Categories=X-Islamic-Software;Utility;
- 
diff --git a/debian/patches/scripts.diff b/debian/patches/scripts.diff
deleted file mode 100644
index 1ea2329..0000000
--- a/debian/patches/scripts.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Install monajat-applet & monajat-mod as scripts
-Forwarded: http://git.ojuba.org/cgit/monajat/commit/?id=4f96cf2df5f7a9bbc97d4b5274503a359424bea1
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
-
-diff --git a/setup.py b/setup.py
-index 3390de2..32672dd 100644
---- a/setup.py
-+++ b/setup.py
-@@ -18,7 +18,6 @@ locales=map(lambda i: ('share/'+i,[''+i+'/monajat.mo',]),glob('locale/*/LC_MESSA
- # data files
- data_files=[
-   ('share/monajat', ['monajat-data/data.db', 'monajat-data/monajat.svg'] ),
--  ('bin',['monajat-applet','monajat-mod'] ),
-   ('/etc/xdg/autostart',['monajat-autostart.desktop']),
- ]
- data_files.extend(locales)
-@@ -31,6 +30,7 @@ setup (name='monajat', version='2.3.0',
-       url='http://git.ojuba.org/cgit/monajat/about/',
-       license='GPLv2',
-       packages=['monajat'],
-+      scripts=['monajat-applet', 'monajat-mod'],
-       data_files=data_files
- 
- )
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 25c414b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-desktop.diff
-scripts.diff

-- 
Packaging for Monajat