[DRE-commits] [SCM] tdiary.git branch, master, updated. debian/3.0.1-2-5-g911318e

[Taku YASUI]

The following commit has been merged in the master branch:
commit 8eb4da89798a69f783468a2fca9a617f1a14b46e
Author: Taku YASUI <tach at debian.org>
Date:   Fri May 4 21:32:31 2012 +0900

    Use debian-pkg-add-load-path-item at tdiary-mode

diff --git a/debian/changelog b/debian/changelog
index 37d5bf3..d257f85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ tdiary (3.0.1-3) unstable; urgency=low
   * Commit debian source to git.debian.org.
     - git://git.debian.org/pkg-ruby-extras/tdiary.git
     - Add Vcs metadata to debian/control.
+  * Use debian-pkg-add-load-path-item at tdiary-mode (closes: #664814)
 
- -- Taku YASUI <tach at debian.org>  Fri, 04 May 2012 20:51:08 +0900
+ -- Taku YASUI <tach at debian.org>  Fri, 04 May 2012 21:30:16 +0900
 
 tdiary (3.0.1-2) unstable; urgency=low
 
diff --git a/debian/tdiary-mode.emacsen-startup b/debian/tdiary-mode.emacsen-startup
index d0b4492..46d32aa 100644
--- a/debian/tdiary-mode.emacsen-startup
+++ b/debian/tdiary-mode.emacsen-startup
@@ -1,25 +1,24 @@
-;; -*-emacs-lisp-*-
-;;
-;; Emacs startup file for the Debian tdiary-mode 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>
+;;; 50tdiary-mode.el --- Debian tdiary-mode startup file  -*-mode: emacs-lisp;-*-
 
-;; The tdiary-mode 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:
-(let ((package-dir (concat "/usr/share/"
-                           (symbol-name flavor)
-                           "/site-lisp/tdiary-mode")))
-  (when (file-directory-p package-dir)
-        (setq load-path (cons package-dir load-path))))
+(let* ((pkg "tdiary-mode")
+       (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 'tdiary-mode "tdiary-mode" nil t)
+    (autoload 'tdiary-new "tdiary-mode" nil t)
+    (autoload 'tdiary-new-diary "tdiary-mode" nil t)
+    (autoload 'tdiary-replace "tdiary-mode" nil t)
+    (add-to-list 'auto-mode-alist
+		 '("\\.td\\'" . tdiary-mode))
+    ;;
+    ))
 
-(autoload 'tdiary-mode "tdiary-mode" nil t)
-(autoload 'tdiary-new "tdiary-mode" nil t)
-(autoload 'tdiary-new-diary "tdiary-mode" nil t)
-(autoload 'tdiary-replace "tdiary-mode" nil t)
-(add-to-list 'auto-mode-alist
-	     '("\\.td\\'" . tdiary-mode))
+;;; 50tdiary-mode.el ends here

-- 
tdiary.git