[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. 3.2.2-2-102-g2b393c2
Thomas Weber
tweber at debian.org
Wed Dec 7 17:56:12 UTC 2011
The following commit has been merged in the master branch:
commit 810cfd651db6672fc2ced340d0ce016b271eadea
Author: Thomas Weber <tweber at debian.org>
Date: Mon Nov 14 23:12:23 2011 +0100
Remove emacsen package stuff
Octave no longer provides these files.
diff --git a/debian/in/PACKAGE-emacsen.dirs b/debian/in/PACKAGE-emacsen.dirs
deleted file mode 100644
index 8a5cd42..0000000
--- a/debian/in/PACKAGE-emacsen.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-etc/emacs/site-start.d
-usr/lib/emacsen-common/packages/install
-usr/lib/emacsen-common/packages/remove
-[V_3_2:[V_3_0:usr/bin
-usr/share/man/man1:]:]
diff --git a/debian/in/PACKAGE-emacsen.emacsen-install b/debian/in/PACKAGE-emacsen.emacsen-install
deleted file mode 100644
index b169477..0000000
--- a/debian/in/PACKAGE-emacsen.emacsen-install
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-# emacsen install script for the Debian GNU/Linux octave package
-#
-# Written by Dirk Eddelbuettel <edd at debian.org>
-
-#set -e
-
-# Canadian spelling ;-)
-flavour=$1
-
-package=@PACKAGE at -emacsen
-files="octave-hlp.el octave-inf.el octave-mod.el"
-source=/usr/share/emacs/site-lisp/${package}
-destination=/usr/share/${flavour}/site-lisp/${package}
-flavourtest=`echo $flavour | cut -c-6`
-if test ${flavourtest} = xemacs ; then
- siteflag="-vanilla"
-else
- siteflag="--no-site-file"
-fi
-flags="${siteflag} -q -no-init-file -batch -l path.el -f batch-byte-compile"
-
-
-if test ${flavour} != emacs
-then
- echo install/${package}: Byte-compiling for emacsen flavour ${flavour}
-
- # Copy the temp .el files into the destination directory
- install -c -m 0755 -d ${destination}
- for i in $files
- do
- cp $source/$i $destination
- done
-
- # The eval-and-compile construct is needed by emacs19, and was
- # pulled out of another package by Yann Dirson. Merci bien, Yann!
- # The load-path.el trick is from Davide Salvetti's auctex package
- cd ${destination}
- cat <<EOF >path.el
-(eval-and-compile
- (condition-case () (require 'custom) (error nil))
- (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
- nil
- (defmacro defgroup (&rest args) nil)
- (defmacro defcustom (var value doc &rest args)
- (\` (defvar (, var) (, value) (, doc))))))
-(setq load-path (cons "." load-path)
- byte-compile-warnings nil)
-EOF
- logfile=`tempfile`
- ${flavour} ${flags} ${files} >> ${logfile} 2>&1
- rm ${files} path.el
- mv ${logfile} ${destination}/install.log
- echo "Compilation log saved to ${destination}/install.log"
-
-else
- echo install/${package}: Ignoring emacsen flavour ${flavour}
-fi
-
-exit 0;
-
diff --git a/debian/in/PACKAGE-emacsen.emacsen-remove b/debian/in/PACKAGE-emacsen.emacsen-remove
deleted file mode 100644
index f1b71c9..0000000
--- a/debian/in/PACKAGE-emacsen.emacsen-remove
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# emacsen remove script for the Debian GNU/Linux octave package
-#
-# Written by Dirk Eddelbuettel <edd at debian.org>
-
-set -e
-
-# Canadian spelling ;-)
-flavour=$1
-
-package=@PACKAGE at -emacsen
-source=/usr/share/emacs/site-lisp/${package}
-destination=/usr/share/${flavour}/site-lisp/${package}
-
-if test ${flavour} != emacs
-then
- echo remove/${package}: Purging byte-compiled files for flavour ${flavour}
- rm -f ${destination}/*.elc ${destination}/install.log
- rmdir ${destination} || true
-else
- echo remove/${package}: Ignoring emacsen flavour ${flavour}
-fi
-
-exit 0;
diff --git a/debian/in/PACKAGE-emacsen.emacsen-startup b/debian/in/PACKAGE-emacsen.emacsen-startup
deleted file mode 100644
index 6e1c712..0000000
--- a/debian/in/PACKAGE-emacsen.emacsen-startup
+++ /dev/null
@@ -1,42 +0,0 @@
-;; -*-emacs-lisp-*-
-;;
-;; Emacs startup file for the Debian GNU/Linux octave package
-;;
-;; Originally contributed by Nils Naumann <naumann at unileoben.ac.at>
-;; Modified by Dirk Eddelbuettel <edd at debian.org>
-
-;; The Octave package follows the Debian/GNU Linux 'emacsen' policy and
-;; byte-compiles its elisp files for each 'emacs flavour' ({,x}emacs{19,20}).
-;; The compiled code is then installed in a subdirectory of the
-;; respective site-lisp directory. We have to add this back to the load-path:
-;; Modified per Rafael's patch to only execute for emacs19
-
-(if (string-match "^19." emacs-version)
- (setq load-path (nconc load-path
- (list (concat "/usr/share/"
- (symbol-name debian-emacs-flavor)
- "/site-lisp/octave")))))
-
-;; The Octave mode calls this file
-(autoload 'octave-mode "octave-mod" nil t)
-(autoload 'octave-help "octave-hlp" nil t)
-
-(setq auto-mode-alist (cons '("\\.m$" . octave-mode) auto-mode-alist))
-
-; (add-hook 'octave-mode-hook
-; (lambda ()
-; (abbrev-mode 1)
-; (auto-fill-mode 1)
-; (if (eq window-system 'x)
-; (font-lock-mode 1))))
-
-(autoload 'run-octave "octave-inf" nil t)
-(autoload 'inferior-octave "octave-inf" nil t)
-(add-hook 'inferior-octave-mode-hook
- (lambda ()
- (turn-on-font-lock)
-; (define-key inferior-octave-mode-map [up]
-; 'comint-previous-input)
-; (define-key inferior-octave-mode-map [down]
-; 'comint-next-input)
- ))
diff --git a/debian/in/PACKAGE-emacsen.postinst b/debian/in/PACKAGE-emacsen.postinst
deleted file mode 100644
index 58b9d74..0000000
--- a/debian/in/PACKAGE-emacsen.postinst
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# postinst script for the Debian GNU/Linux octave package
-#
-# Initial version written by Andrew D. Fernandes <adfernan at cnd.mcgill.ca>
-# This version written by Dirk Eddelbuettel <edd at debian.org>
-
-set -e
-
-#DEBHELPER#
-
-# The current Octave version, known to debian/rules at build time
-VERSION=@VERSION@
-PRIORITY=@PRIORITY@
-
-case "$1" in
- configure)
- #
- # update-alternatives for multiple Octave versions
- update-alternatives --install /usr/bin/octave-tags octave-tags \
- /usr/bin/octave-tags-$VERSION $PRIORITY \
- --slave /usr/share/man/man1/octave-tags.1.gz \
- octave-tags.1.gz \
- /usr/share/man/man1/octave-tags-$VERSION.1.gz
- ;;
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- ;;
-esac
-
-exit 0
diff --git a/debian/in/PACKAGE-emacsen.prerm b/debian/in/PACKAGE-emacsen.prerm
deleted file mode 100644
index 2f7bf7f..0000000
--- a/debian/in/PACKAGE-emacsen.prerm
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# prerm script for the Debian GNU/Linux octave package
-#
-# Written by Dirk Eddelbuettel <edd at debian.org>
-
-set -e
-
-#DEBHELPER#
-
-# The current Octave version, known to debian/rules at build time
-VERSION=@VERSION@
-
-case "$1" in
- remove|upgrade|deconfigure)
- #
- # update-alternatives for multiple Octave versions
- update-alternatives --remove octave-tags /usr/bin/octave-tags-$VERSION
- ;;
- failed-upgrade)
- ;;
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-
-
--
Debian packaging for octave
More information about the Pkg-octave-commit
mailing list