From: Stephane Glondu Date: Thu, 11 Jul 2019 09:25:22 +0000 (+0200) Subject: ocaml-mode is now an independent project X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~2^2~17^2~51 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=63ebd8123948372bc62139e1a82df29f70cf7e1f;p=ocaml.git ocaml-mode is now an independent project --- diff --git a/debian/control b/debian/control index 7d7d2e42..8e8c504d 100644 --- a/debian/control +++ b/debian/control @@ -81,7 +81,7 @@ Provides: libnums-ocaml-dev Suggests: ocaml-doc, - tuareg-mode | ocaml-mode + tuareg-mode Recommends: file Replaces: ocaml-interp (<< 3.11.1-3), ocaml-native-compilers (<< 4.04.0-1) @@ -193,24 +193,3 @@ Description: OCaml interpreter and standard libraries This package contains several modules used internally by the OCaml compilers. They are not needed for normal OCaml development, but may be helpful in the development of certain applications. - -Package: ocaml-mode -Architecture: all -Depends: - emacs | emacsen, emacsen-common (>= 2.0.8), - ${misc:Depends} -Suggests: ocaml -Description: major mode for editing Objective Caml in Emacs - Objective (OCaml) is an implementation of the ML language, based on - the Caml Light dialect extended with a complete class-based object system - and a powerful module system in the style of Standard ML. - . - This package provides support for editing both Objective Caml and - Caml Light programs with Emacs and XEmacs. - . - Caml-mode supports: - - indentation - - compilation and error retrieving - - interaction with the toplevel - - font-lock - - imenu diff --git a/debian/ocaml-mode.README.Debian b/debian/ocaml-mode.README.Debian deleted file mode 100644 index 3dd76634..00000000 --- a/debian/ocaml-mode.README.Debian +++ /dev/null @@ -1,14 +0,0 @@ -ocaml-mode for Debian ---------------------- - - WARNING: tuareg-mode may be installed on your system. Since it - has a higher priority than ocaml-mode, it will be used for - every OCaml file loaded into (X)Emacs. - - If you absolutely want to override those default settings and - use ocaml-mode instead of tuareg-mode, you only need to add the - following line to your .emacs: - - (load-file "/etc/emacs/site-start.d/50ocaml-mode.el") - - -- Jerome Marant , Sat Sep 3 11:41:37 2005 diff --git a/debian/ocaml-mode.dirs b/debian/ocaml-mode.dirs deleted file mode 100644 index e12d94c6..00000000 --- a/debian/ocaml-mode.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/share/emacs/site-lisp/ocaml-mode diff --git a/debian/ocaml-mode.emacsen-compat b/debian/ocaml-mode.emacsen-compat deleted file mode 100644 index 45a4fb75..00000000 --- a/debian/ocaml-mode.emacsen-compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/debian/ocaml-mode.emacsen-install b/debian/ocaml-mode.emacsen-install deleted file mode 100644 index b93a9c71..00000000 --- a/debian/ocaml-mode.emacsen-install +++ /dev/null @@ -1,62 +0,0 @@ -#! /bin/sh -e -# /usr/lib/emacsen-common/packages/install/ocaml-mode - -# Written by Jim Van Zandt , borrowing heavily -# from the install scripts for gettext by Santiago Vila -# and octave by Dirk Eddelbuettel . - -FLAVOR=$1 -PACKAGE=ocaml-mode - -if [ ${FLAVOR} = emacs ]; then exit 0; fi - -echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} - -# FLAVORTEST=`echo $FLAVOR | cut -c-6` -# if [ ${FLAVORTEST} = xemacs ] ; then -# SITEFLAG="-no-site-file" -# else -# SITEFLAG="--no-site-file" -# fi -FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" - -ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} -ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} -RELELDIR=../../../emacs/site-lisp/${PACKAGE} - -# Install-info-altdir does not actually exist. -# Maybe somebody will write it. -if test -x /usr/sbin/install-info-altdir; then - echo install/${PACKAGE}: install Info links for ${FLAVOR} - install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz -fi - -install -m 755 -d ${ELCDIR} - -cd ${ELDIR} -case "${FLAVOR}" in - xemacs21) - FILES=`ls *.el | egrep -v caml-emacs\|camldebug.el\|inf-caml.el` - ;; - - *) - FILES=`ls *.el | grep -v caml-xemacs` - ;; - -esac - -cd ${ELCDIR} -for f in ${FILES} ; do - ln -sf ${RELELDIR}/$f . -done - -cat << EOF > path.el -(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} -rm -f path.el - -exit 0 diff --git a/debian/ocaml-mode.emacsen-remove b/debian/ocaml-mode.emacsen-remove deleted file mode 100644 index abc5bd3f..00000000 --- a/debian/ocaml-mode.emacsen-remove +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -e -# /usr/lib/emacsen-common/packages/remove/ocaml-mode - -FLAVOR=$1 -PACKAGE=ocaml-mode - -if [ ${FLAVOR} != emacs ]; then - if test -x /usr/sbin/install-info-altdir; then - echo remove/${PACKAGE}: removing Info links for ${FLAVOR} - install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/#PACKAGE#.info.gz - fi - - echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} - rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} -fi diff --git a/debian/ocaml-mode.emacsen-startup b/debian/ocaml-mode.emacsen-startup deleted file mode 100644 index dd22fe60..00000000 --- a/debian/ocaml-mode.emacsen-startup +++ /dev/null @@ -1,26 +0,0 @@ -;; -*-emacs-lisp-*- -;; -;; Emacs startup file for the Debian GNU/Linux ocaml package -;; -;; Originally contributed by Nils Naumann -;; Modified by Dirk Eddelbuettel -;; Adapted for dh-make by Jim Van Zandt - -;; The ocaml 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 debian-emacs-flavor) - "/site-lisp/ocaml-mode"))) -;; 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) - (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) - (autoload 'run-caml "inf-caml" "Run an inferior Caml process." t))) diff --git a/debian/rules b/debian/rules index c9548d83..b93ff6fc 100755 --- a/debian/rules +++ b/debian/rules @@ -158,7 +158,6 @@ endif override_dh_auto_clean: ifneq ($(wildcard $(CURDIR)/Makefile.config),) $(MAKE) clean - $(MAKE) -C emacs clean endif $(MAKE) -f $(CURDIR)/debian/ocamlinit.mk ocamlinit-clean # Restore files altered by the build process @@ -171,9 +170,6 @@ endif mv -f debian/config.orig.$$ext config/gnu/config.$$ext; \ fi; \ done - if head -n 1 emacs/ocamltags.in | grep -q '^#!/bin/sh'; then \ - sed -i 1d emacs/ocamltags.in; \ - fi # Remaining stuff -rm -Rf debian/$(SRCTARBALL) debian/examples $(TESTDIR) @@ -182,16 +178,6 @@ override_dh_auto_install-arch: install-stamp-arch override_dh_auto_install-indep: install-stamp-indep install-stamp-indep: -ifneq (,$(findstring ocaml-mode,$(ALL_PACKAGES))) -# Install Emacs files - $(MAKE) -C emacs \ - EMACSDIR=$(CURDIR)/debian/ocaml-mode/usr/share/emacs/site-lisp/ocaml-mode \ - NOCOMPILE=true simple-install - if ! head -n 1 emacs/ocamltags.in | grep -q '^#!/bin/sh'; then \ - sed -i -e '1 i #!/bin/sh' emacs/ocamltags.in; \ - fi - $(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml-mode/usr/bin install-ocamltags -endif touch $@ install-stamp-arch: