[Debian-islamic-commits] [SCM] Packaging for Monajat branch, master, updated. 12a5851ec43645c2598d6e641f40beafd1d51dda

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

The following commit has been merged in the master branch:
commit 12a5851ec43645c2598d6e641f40beafd1d51dda
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Thu Jan 14 09:06:21 2010 +0200

    Added Conflicts/Replaces: monajat (<= 2) to provide successful upgrade
    from monajat 1.x

diff --git a/debian/control b/debian/control
index bf90d6c..4beff07 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,8 @@ Architecture: all
 XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends}, ${python:Depends}, python-monajat, python-gtk2, python-notify, python-eggtrayicon
 Recommends: python-dbus, islamic-menus
+Conflicts: monajat (<= 2)
+Replaces: monajat (<= 2)
 Description: Islamic supplications tray applet
  Monajat is a small application that displays Islamic supplications (azkar) at
  predetermined times.

-- 
Packaging for Monajat