* debian/rules
- remove spurious CVS directories from labltk examples
(Closes: Bug#322712)
-
- -- Stefano Zacchiroli <zack@debian.org> Fri, 19 Aug 2005 14:39:51 +0200
+
+ Changes by Jérôme Marant:
+ * debian/control
+ - Add new ocaml-mode package section
+ - [ocaml-nox]
+ + Remove emacsen-common dependency
+ + Suggests tuareg-mode or ocaml-mode
+ * debian/ocaml-mode.dirs: New file
+ * debian/ocaml-nox.dirs: Remove emacsen-related files entries
+ * debian/ocaml-mode.emacsen-install,
+ debian/ocaml-mode.emacsen-remove,
+ debian/ocaml-mode.emacsen-startup: New files respectively renamed from
+ emacsen-install, emacsen-remove and emacsen-startup
+ * debian/rules: Install ocaml-mode files in their own location
+ * debian/ocaml-base-nox.README.Debian: Mention new ocaml-mode package
+ * debian/ocaml-nox.NEWS:
+ - New file
+ - Mention all emacs-related files moved to a separate ocaml-mode
+ package
+ * debian/changelog: Remove spurious changelog entry
+
+ -- Jerome Marant <jerome@debian.org> Sat, 20 Aug 2005 13:34:52 +0200
ocaml (3.08.3-7) unstable; urgency=low
-- Sven Luther <luther@debian.org> Thu, 15 Jul 2004 09:21:55 +0200
-ocaml (3.07.2a-5) unstable; urgency=low
-
-
- -- Sven Luther <luther@debian.org> Mon, 12 Jul 2004 12:06:33 +0200
-
ocaml (3.07.2a-4) unstable; urgency=low
* *-nox and -interp now conflict with the package which previously
Package: ocaml-nox
Architecture: any
-Depends: libncurses5-dev, ocaml-base-nox (=${Source-Version}), ocaml-base-nox-3.08.3, ocaml-interp-3.08.3, emacsen-common
-Suggests: ocaml-doc, libgdbm-dev, emacsen
+Depends: libncurses5-dev, ocaml-base-nox (=${Source-Version}), ocaml-base-nox-3.08.3, ocaml-interp-3.08.3
+Suggests: ocaml-doc, libgdbm-dev, tuareg-mode | ocaml-mode
Recommends: ledit, file
Provides: ocaml-nox-3.08.3 ${F:BestProvides}, libnums-ocaml-dev
Replaces: camlp4, ocaml (<< 3.07.2a-3), libnums-ocaml-dev
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: emacs21 | emacsen
+Suggests: ocaml
+Conflicts: ocaml-nox (<< 3.08.3-8)
+Description: A major mode for editing Objective Caml in Emacs
+ 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
+++ /dev/null
-#! /bin/sh -e
-# /usr/lib/emacsen-common/packages/install/ocaml
-
-# Written by Jim Van Zandt <jrv@vanzandt.mv.com>, borrowing heavily
-# from the install scripts for gettext by Santiago Vila
-# <sanvila@ctv.es> and octave by Dirk Eddelbuettel <edd@debian.org>.
-
-FLAVOR=$1
-PACKAGE=ocaml
-
-case ${FLAVOR} in
- emacs20|emacs21|xemacs21)
- ;;
- *)
- echo install/${PACKAGE}: Ignoring emacsen flavor ${FLAVOR}
- exit 0
- ;;
-esac
-
-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}
-
-# 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
- emacs20 | emacs21)
- FILES=`ls *.el | grep -v caml-xemacs`
- ;;
-
- xemacs21)
- FILES=`ls *.el | grep -v caml-emacs`
- ;;
- *)
- ;;
-esac
-cp ${FILES} ${ELCDIR}
-cd ${ELCDIR}
-
-cat << EOF > path.el
-(setq load-path (cons "." load-path) byte-compile-warnings nil)
-EOF
-${FLAVOR} ${FLAGS} ${FILES}
-rm -f *.el path.el
-
-exit 0
+++ /dev/null
-#!/bin/sh -e
-# /usr/lib/emacsen-common/packages/remove/ocaml
-
-FLAVOR=$1
-PACKAGE=ocaml
-
-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
+++ /dev/null
-;; -*-emacs-lisp-*-
-;;
-;; Emacs startup file for the Debian GNU/Linux ocaml package
-;;
-;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
-;; Modified by Dirk Eddelbuettel <edd@debian.org>
-;; Adapted for dh-make by Jim Van Zandt <jrv@vanzandt.mv.com>
-
-;; 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:
-(setq load-path
- (nconc load-path
- (list (concat "/usr/share/"
- (symbol-name flavor)
- "/site-lisp/ocaml"))))
-(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)
need them at build time or for personal use (it should _not_ be used to
build ocam litself).
+ o ocaml-mode: contains a major mode for editing OCaml files in Emacs.
+
2) The caml include files are found under /usr/lib/ocaml/<ocaml_version>/caml.
A symlink is provided from /usr/include/caml for convenience. If
/usr/include/caml was previously a directory, for whatever reason, a warning
/usr/local/lib/ocaml/<ocaml_version>/stublibs which is searched before
/usr/lib/ocaml/<ocaml_version>/stublibs.
- -- Mike Furr <mfurr@debian.org>, Thu Jun 24 14:23:14 2004
+ -- Jerome Marant <jerome@debian.org>, Sat Aug 20 11:51:32 2005
--- /dev/null
+#! /bin/sh -e
+# /usr/lib/emacsen-common/packages/install/ocaml-mode
+
+# Written by Jim Van Zandt <jrv@vanzandt.mv.com>, borrowing heavily
+# from the install scripts for gettext by Santiago Vila
+# <sanvila@ctv.es> and octave by Dirk Eddelbuettel <edd@debian.org>.
+
+FLAVOR=$1
+PACKAGE=ocaml-mode
+
+case ${FLAVOR} in
+ emacs20|emacs21|xemacs21)
+ ;;
+ *)
+ echo install/${PACKAGE}: Ignoring emacsen flavor ${FLAVOR}
+ exit 0
+ ;;
+esac
+
+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}
+
+# 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
+ emacs20 | emacs21)
+ FILES=`ls *.el | grep -v caml-xemacs`
+ ;;
+
+ xemacs21)
+ FILES=`ls *.el | grep -v caml-emacs`
+ ;;
+ *)
+ ;;
+esac
+cp ${FILES} ${ELCDIR}
+cd ${ELCDIR}
+
+cat << EOF > path.el
+(setq load-path (cons "." load-path) byte-compile-warnings nil)
+EOF
+${FLAVOR} ${FLAGS} ${FILES}
+rm -f *.el path.el
+
+exit 0
--- /dev/null
+#!/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
--- /dev/null
+;; -*-emacs-lisp-*-
+;;
+;; Emacs startup file for the Debian GNU/Linux ocaml package
+;;
+;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
+;; Modified by Dirk Eddelbuettel <edd@debian.org>
+;; Adapted for dh-make by Jim Van Zandt <jrv@vanzandt.mv.com>
+
+;; 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:
+(setq load-path
+ (nconc load-path
+ (list (concat "/usr/share/"
+ (symbol-name flavor)
+ "/site-lisp/ocaml-mode"))))
+(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)
--- /dev/null
+ocaml-nox (3.08.3-8) unstable; urgency=low
+
+ * The Emacs mode for editing both Objective Caml and Caml Light
+ programs which is shipped with ocaml has been moved to its own
+ `ocaml-mode' package.
+
+ -- Jerome Marant <jerome@debian.org> Sat, 20 Aug 2005 13:30:25 +0200
+
usr/include/ocaml/3.08.3
usr/share/man/man1
usr/share/man/man3
-usr/share/emacs/site-lisp/ocaml
usr/share/texmf/tex/latex/misc
usr/X11R6/include/X11/pixmaps
usr/share/lintian/overrides
if [ "$1" = "configure" ]; then
ocaml-md5sums update
+
+ # Get rid of Emacs conffiles from previous ocaml versions
+ for f in ocaml ocaml-nox ; do
+ [ -e "/etc/emacs/site-start.d/50$f.el" ] && \
+ rm -f "/etc/emacs/site-start.d/50$f.el"
+ done
fi
#DEBHELPER#
build-arch: build-arch-stamp
build-arch-stamp: patch-stamp config-stamp
-
+
# Add here commands to compile the arch part of the package.
if test ! -d boot.debian; then \
cp -xa boot boot.debian; \
build-indep: build-indep-stamp
build-indep-stamp: patch-stamp config-stamp
-
+
# Add here commands to compile the indep part of the package.
#$(MAKE) doc
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-cp -f /usr/share/misc/config.guess config/gnu/config.guess
endif
-
+
dh_clean debian/README.labltk camlp4/config/Makefile.cnf camlp4/config/Makefile config/m.h config/s.h config/Makefile
install: install-indep install-arch
dh_testroot
dh_clean -k -i
dh_installdirs -i
-
+
+ # Install Emacs files
+ $(MAKE) -C emacs EMACSDIR=$(CURDIR)/debian/ocaml-mode/usr/share/emacs/site-lisp/ocaml-mode \
+ NOCOMPILE=true simple-install
+ $(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml-mode/usr/bin install-ocamltags
+
# Add here commands to install the indep part of the package into
# debian/<package>-doc.
for i in `cat debian/ocaml-source.files`; do \
# Let's install ocaml first.
$(MAKE) install PREFIX=$(CURDIR)/debian/ocaml-nox/usr
- $(MAKE) -C emacs EMACSDIR=$(CURDIR)/debian/ocaml-nox/usr/share/emacs/site-lisp/ocaml \
- NOCOMPILE=true simple-install
- $(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml-nox/usr/bin install-ocamltags
install -m 644 debian/JoeCaml.xpm \
$(CURDIR)/debian/ocaml-nox/usr/X11R6/include/X11/pixmaps
install -m 644 debian/ocaml-nox.override \
# The interpreter files
dh_movefiles -pocaml-interp \
- --sourcedir=debian/ocaml-nox; \
+ --sourcedir=debian/ocaml-nox
# Some extra stuff
install -m 644 utils/*.mli utils/*.cmi utils/*.cmo \
projects / ocaml.git / commitdiff