[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.12.1-2-10-gd7c3b39

[Hendrik Tews]

The following commit has been merged in the master branch:
commit d7c3b39d2d057c7bbd0fc8efb43c3bcba4b73a6e
Author: Hendrik Tews <hendrik at askra.de>
Date:   Fri May 11 17:43:56 2012 +0200

    drop pre-depends, use (fboundp 'debian-pkg-add-load-path-item)

diff --git a/debian/control b/debian/control
index 9cdfca9..cf7add4 100644
--- a/debian/control
+++ b/debian/control
@@ -263,8 +263,6 @@ Description: OCaml interpreter and standard libraries
 
 Package: ocaml-mode
 Architecture: all
-Pre-Depends:
- emacsen-common (>= 1.4.14)
 Depends:
  emacs23 | emacsen,
  ${shlibs:Depends},
diff --git a/debian/ocaml-mode.emacsen-install b/debian/ocaml-mode.emacsen-install
index 8aa5eb0..b93a9c7 100644
--- a/debian/ocaml-mode.emacsen-install
+++ b/debian/ocaml-mode.emacsen-install
@@ -51,7 +51,9 @@ for f in ${FILES} ; do
 done
 
 cat << EOF > path.el
-(debian-pkg-add-load-path-item ".")
+(if (fboundp 'debian-pkg-add-load-path-item)
+    (debian-pkg-add-load-path-item ".")
+  (setq load-path (cons "." load-path)))
 (setq byte-compile-warnings nil)
 EOF
 ${FLAVOR} ${FLAGS} ${FILES}
diff --git a/debian/ocaml-mode.emacsen-startup b/debian/ocaml-mode.emacsen-startup
index e6f01ba..dd22fe6 100644
--- a/debian/ocaml-mode.emacsen-startup
+++ b/debian/ocaml-mode.emacsen-startup
@@ -17,7 +17,9 @@
 ;; If package-dir does not exist, the #PACKAGE# package must have
 ;; removed but not purged, and we should skip the setup.
   (when (file-directory-p package-dir)
-    (debian-pkg-add-load-path-item package-dir)
+    (if (fboundp 'debian-pkg-add-load-path-item)
+	(debian-pkg-add-load-path-item package-dir)
+      (setq load-path (cons package-dir load-path)))
     (setq auto-mode-alist
           (cons '("\\.ml[iylp]?\\'" . caml-mode) auto-mode-alist))
     (autoload 'caml-mode "caml" "Major mode for editing Caml code." t)

-- 
OCaml packaging