[Pkg-erlang-commits] r1424 - erlang/trunk/debian

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2012-03-11 06:45:48 +0000 (Sun, 11 Mar 2012)
New Revision: 1424

Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/control
   erlang/trunk/debian/erlang-mode.emacsen-startup
Log:
[erlang]
  * Use (debian-pkg-add-load-path-item <path>) instead of manipulating
    load-path directly in 50erlang-mode.el Emacs startup file as required
    by Debian Emacd policy (closes: #663408).


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2012-02-22 06:49:22 UTC (rev 1423)
+++ erlang/trunk/debian/changelog	2012-03-11 06:45:48 UTC (rev 1424)
@@ -1,8 +1,10 @@
 erlang (1:15.b-dfsg-3) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * Use (debian-pkg-add-load-path-item <path>) instead of manipulating
+    load-path directly in 50erlang-mode.el Emacs startup file as required
+    by Debian Emacd policy (closes: #663408).
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 13 Jan 2012 10:22:03 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sun, 11 Mar 2012 09:52:45 +0400
 
 erlang (1:15.b-dfsg-2) unstable; urgency=low
 

Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control	2012-02-22 06:49:22 UTC (rev 1423)
+++ erlang/trunk/debian/control	2012-03-11 06:45:48 UTC (rev 1424)
@@ -607,7 +607,7 @@
 
 Package: erlang-mode
 Architecture: all
-Depends: emacsen-common, ${misc:Depends}
+Depends: emacsen-common (>= 1.4.14), ${misc:Depends}
 Suggests: erlang, erlang-manpages, erlang-doc
 Replaces: erlang-base (<< 1:12.b.1-dfsg-2), erlang-base-hipe (<< 1:12.b.1-dfsg-2)
 Description: Erlang major editing mode for Emacs

Modified: erlang/trunk/debian/erlang-mode.emacsen-startup
===================================================================
--- erlang/trunk/debian/erlang-mode.emacsen-startup	2012-02-22 06:49:22 UTC (rev 1423)
+++ erlang/trunk/debian/erlang-mode.emacsen-startup	2012-03-11 06:45:48 UTC (rev 1424)
@@ -1,8 +1,8 @@
 ;; installed in a subdirectory of the respective site-lisp directory.
 ;; We have to add this to the load-path:
-(setq load-path (cons (concat "/usr/share/"
-		(symbol-name debian-emacs-flavor)
-		"/site-lisp/erlang") load-path))
+(debian-pkg-add-load-path-item (concat "/usr/share/"
+				       (symbol-name debian-emacs-flavor)
+				       "/site-lisp/erlang"))
 (setq erlang-root-dir "/usr/lib/erlang")
 (setq exec-path (cons "/usr/lib/erlang/bin" exec-path))
 (require 'erlang-start)