[Debian-islamic-commits] [SCM] Packaging for Zekr branch, master, updated. debian/0.7.5+repack-2-16-g7374a6f

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

The following commit has been merged in the master branch:
commit bc80c1ba1a785a451beba383a50150f198900e87
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Mon Jun 28 17:49:02 2010 +0300

    Remove xulrunner-1.9 (<< 1.9~b3) from Conflicts

diff --git a/debian/control b/debian/control
index 0170de8..26b2ab7 100644
--- a/debian/control
+++ b/debian/control
@@ -79,7 +79,7 @@ Replaces:
  zekr-quran-recitation-online-huzaifi (<< 0.7.0~beta2-1),
  zekr-quran-recitation-online-shatri (<< 0.7.0~beta2-1),
  zekr-quran-recitation-online-shuraim (<< 0.7.0~beta2-1)
-Conflicts: xulrunner-1.9 (<< 1.9~b3),
+Conflicts:
  zekr-quran-translation-extras (<< 0.12),
  zekr-quran-recitation-online-minshawi (<< 0.7.0~beta2-1),
  zekr-quran-recitation-online-ghamdi (<< 0.7.0~beta2-1),

-- 
Packaging for Zekr