[Pkg-haskell-commits] [SCM] Packaging for Agda branch, master, updated. debian/2.2.4+dfsg-1-9-g5832734

[Iain Lane]

The following commit has been merged in the master branch:
commit 64a23cfb5f87a38973eac5d0fe2fe4bdb69c3123
Author: Iain Lane <laney at ubuntu.com>
Date:   Tue Jan 5 21:47:02 2010 +0000

    Do not load file on XEmacs — agda-mode is not compatible with XEmacs.

diff --git a/debian/50agda.el b/debian/50agda.el
index dc115ae..c41a290 100644
--- a/debian/50agda.el
+++ b/debian/50agda.el
@@ -1 +1,5 @@
-(load-file "/usr/share/emacs/site-lisp/agda/agda2.el")
\ No newline at end of file
+;; This conffile is left around if the package is removed but not purged.
+;; agda-mode is also not compatible with XEmacs so let's case against loading there
+(if (and (file-exists-p "/usr/share/emacs/site-lisp/agda/agda2.el") (not (string-match "XEmacs" emacs-version)))
+    (load-file "/usr/share/emacs/site-lisp/agda/agda2.el")
+)
diff --git a/debian/changelog b/debian/changelog
index 4ab56a5..f54a8aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ agda (2.2.6-1) UNRELEASED; urgency=low
     + Only load file if it exists, prevents a non-intrusive emacs warning
       where 50agda.el is left on system when package is removed. 
       (Closes: #559197). 
+    + Do not load file on XEmacs — agda-mode is not compatible with XEmacs.
 
- -- Iain Lane <laney at ubuntu.com>  Tue, 05 Jan 2010 20:18:52 +0000
+ -- Iain Lane <laney at ubuntu.com>  Tue, 05 Jan 2010 20:52:52 +0000
 
 agda (2.2.4+dfsg-1) unstable; urgency=low
 

-- 
Packaging for Agda