[DRE-commits] [SCM] rdtool.git branch, master, updated. upstream/0.6.22-28-gf8749af

[Taku YASUI]

The following commit has been merged in the master branch:
commit 079d620599bae740b2c5c20602d5d88b55a9e05a
Author: Taku YASUI <tach at debian.org>
Date:   Sun May 6 02:26:23 2012 +0900

    Change rdtool-elisp startup file

diff --git a/debian/changelog b/debian/changelog
index 7ca5a3f..ced6ed1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,9 @@ rdtool (0.6.31-1) unstable; urgency=low
     - debian/patches/010_change_dot_rd2rc_path
   * Run any versions of ruby
     - debian/patches/020_use_any_versions_of_ruby
+  * Change rdtool-elisp startup file using debian-pkg-add-load-path-item
 
- -- Taku YASUI <tach at debian.org>  Sun, 06 May 2012 02:06:54 +0900
+ -- Taku YASUI <tach at debian.org>  Sun, 06 May 2012 02:26:10 +0900
 
 rdtool (0.6.22-1) unstable; urgency=low
 
diff --git a/debian/rdtool-elisp.emacsen-startup b/debian/rdtool-elisp.emacsen-startup
index 6ea4388..b8c8e5d 100644
--- a/debian/rdtool-elisp.emacsen-startup
+++ b/debian/rdtool-elisp.emacsen-startup
@@ -1,20 +1,21 @@
-;; -*-emacs-lisp-*-
-;;
-;; Emacs startup file for the Debian GNU/Linux ruby package
-;;
-;; Originally contributed by Nils Naumann <naumann at unileoben.ac.at>
-;; Modified by Dirk Eddelbuettel <edd at debian.org>
-;; Adapted for dh-make by Jim Van Zandt <jrv at vanzandt.mv.com>
+;;; 50rdtool-elisp.el --- Debian rd-mode startup file  -*-mode: emacs-lisp;-*-
 
-;; The ruby package follows the Debian/GNU Linux 'emacsen' policy and
-;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
-;; xemacs19, emacs20, xemacs20...).  The compiled code is then
-;; 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 flavor)
-			      "/site-lisp/rdtool-elisp") load-path))
+(let* ((pkg "rdtool-elisp")
+       (flavor-name (if (boundp 'debian-emacs-flavor)
+			(symbol-name debian-emacs-flavor)
+		      "emacs"))
+       (pkg-inst (concat "/usr/lib/emacsen-common/packages/install/" pkg))
+       (elc-dir (concat "/usr/share/" flavor-name "/site-lisp/" pkg)))
+  (when (and (file-exists-p elc-dir)
+	     (file-exists-p pkg-inst))
+    (if (fboundp 'debian-pkg-add-load-path-item)
+	(debian-pkg-add-load-path-item elc-dir)
+      (setq load-path (cons elc-dir load-path)))
+    ;;
+    (autoload 'rd-mode "rd-mode" "Major mode for RD editing" t)
+    (setq auto-mode-alist
+	  (cons '("\\.rd\\'" . rd-mode) auto-mode-alist))
+    ;;
+    ))
 
-(autoload 'rd-mode "rd-mode" "Major mode for RD editing" t)
-(setq auto-mode-alist
-      (cons '("\\.rd\\'" . rd-mode) auto-mode-alist))
+;;; 50rdtool-elisp.el ends here

-- 
rdtool.git