---
debian/PackagesMakefile.in | 1 -
debian/control | 8 +++----
debian/debian-rundir.el | 60 ----------------------------------------------
debian/site-start.el.in | 29 +---------------------
4 files changed, 5 insertions(+), 93 deletions(-)
delete mode 100644 debian/debian-rundir.el
diff --git a/debian/PackagesMakefile.in b/debian/PackagesMakefile.in
index dc1dafc..73abf33 100644
--- a/debian/PackagesMakefile.in
+++ b/debian/PackagesMakefile.in
@@ -72,7 +72,6 @@ xemacs@MAJVERSION@@SUBNAME@-support:
cp $(b)/$@/@PREFIX@/share/xemacs-@VERSION@/etc/xemacs-icon*.*
$(b)/$@/@PREFIX@/share/icons
cp debian/00debian.el $(b)/$@/etc/xemacs@MAJVERSION@/site-start.d/
cp debian/site-start.el
$(b)/$@/@PREFIX@/share/xemacs@MAJVERSION@/site-packages/lisp
- cp debian/debian-rundir.el
$(b)/$@/@PREFIX@/share/xemacs@MAJVERSION@/site-packages/lisp
# perl debian/get_menu_part info/dir debian/xemacs@MAJVERSION@.texi
# ( cd debian ; makeinfo xemacs@MAJVERSION@.texi )
# cp debian/xemacs@MAJVERSION@.info
$(b)/$@/@PREFIX@/share/info/xemacs@MAJVERSION@
diff --git a/debian/control b/debian/control
index e418431..86475e1 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Description: highly customizable text editor
Package: xemacs21-mule
Architecture: any
-Depends: xemacs21-support (= ${source:Version}), xemacs21-bin (=
${binary:Version}), ${shlibs:Depends}, xemacs21-mulesupport (>= 2003.04.23-1),
xemacs21-basesupport (>= 2003.04.23-1), emacsen-common, ${misc:Depends}
+Depends: xemacs21-support (= ${source:Version}), xemacs21-bin (=
${binary:Version}), ${shlibs:Depends}, xemacs21-mulesupport (>= 2003.04.23-1),
xemacs21-basesupport (>= 2003.04.23-1), emacsen-common (>= 3.0.0),
${misc:Depends}
Conflicts: xemacs21-gnome-mule
Provides: emacsen, info-browser, mail-reader, news-reader, www-browser,
xemacs21
Description: highly customizable text editor -- Mule binary
@@ -48,7 +48,7 @@ Description: highly customizable text editor -- Mule binary
Package: xemacs21-nomule
Architecture: any
-Depends: xemacs21-support (= ${source:Version}), xemacs21-bin (=
${binary:Version}), ${shlibs:Depends}, xemacs21-basesupport (>= 2003.04.23-1),
emacsen-common, ${misc:Depends}
+Depends: xemacs21-support (= ${source:Version}), xemacs21-bin (=
${binary:Version}), ${shlibs:Depends}, xemacs21-basesupport (>= 2003.04.23-1),
emacsen-common (>= 3.0.0), ${misc:Depends}
Conflicts: xemacs21-gnome-nomule
Provides: emacsen, info-browser, mail-reader, news-reader, www-browser,
xemacs21
Description: highly customizable text editor -- Non-mule binary
@@ -71,7 +71,7 @@ Description: highly customizable text editor -- Non-mule
binary
Package: xemacs21-mule-canna-wnn
Architecture: any
-Depends: xemacs21-support (= ${source:Version}), xemacs21-bin (=
${binary:Version}), ${shlibs:Depends}, xemacs21-mulesupport (>= 2003.04.23-1),
xemacs21-basesupport (>= 2003.04.23-1), emacsen-common, ${misc:Depends}
+Depends: xemacs21-support (= ${source:Version}), xemacs21-bin (=
${binary:Version}), ${shlibs:Depends}, xemacs21-mulesupport (>= 2003.04.23-1),
xemacs21-basesupport (>= 2003.04.23-1), emacsen-common (>= 3.0.0),
${misc:Depends}
Conflicts: xemacs21-gnome-mule-canna-wnn
Suggests: xfonts-cjk
Provides: emacsen, info-browser, mail-reader, news-reader, www-browser,
xemacs21
@@ -115,7 +115,7 @@ Architecture: all
Conflicts: xemacs-support, sgml-base (<< 1.23)
Replaces: xemacs-support
Suggests: xemacs21-supportel (= ${source:Version})
-Depends: emacsen-common, ${misc:Depends}
+Depends: emacsen-common (>= 3.0.0), ${misc:Depends}
Description: highly customizable text editor -- architecture independent
support files
XEmacs is a full fledged programming language with a mail reader,
news reader, info browser, web browser, calendar, specialized editor
diff --git a/debian/debian-rundir.el b/debian/debian-rundir.el
deleted file mode 100644
index 5e732c9..0000000
--- a/debian/debian-rundir.el
+++ /dev/null
@@ -1,60 +0,0 @@
-;;; debian-rundir.el --- run all lisp startup files in a directory.
-
-;; Copyright (C) 1996 Mark Eichin
-
-;; Maintainer: Mark Eichin <eic...@kitten.gen.ma.us>
-;; Keywords: debian
-
-;; This file is part of the debian release of GNU Emacs, and will
-;; be contributed to the FSF after testing. It is released under the same
-;; terms, namely the GPL v2 or later.
-
-;; GNU Emacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Commentary:
-
-;; This file provides functions to process a directory full of lisp
-;; files in the style of the System V "rc0.d" mechanism, namely the
-;; directory contents are sorted alphabetically, and the files are
-;; conventionally named 00program.el (default of 50, but allowing
-;; order.)
-
-(defvar emacs-debian-default-directory
- (if (string-match ".*XEmacs.*" emacs-version)
- (let ((point
- (string-match "[0-9]*\.[0-9]*.*XEmacs.*" emacs-version)))
- (concat "/etc/xemacs/site-start-"
- (substring emacs-version point (+ point 2))
- ".d"))
- "/etc/emacs/site-start.d")
- "The default directory for this version of XEmacs to load from")
-
-
-(defun debian-run-directory (&optional dir)
- "Load each file in the form 00filename.el stored in the path.
-The files are sorted so order can be controlled."
- (interactive "DConfiguration directory : ")
- (let ((path (if dir dir emacs-debian-default-directory)))
- (mapcar
- (lambda (file)
- (if debug-on-error
- (load-file file)
- (condition-case ()
- (progn
- (load file nil t t)
- (message "*** %s loaded ***" (file-name-nondirectory file)))
- (error (message "Error while loading %s" file)))))
- (directory-files path t "^[0-9][0-9].*\\.el$" nil))))
diff --git a/debian/site-start.el.in b/debian/site-start.el.in
index cbed5fe..94b3dbd 100644
--- a/debian/site-start.el.in
+++ b/debian/site-start.el.in
@@ -11,34 +11,7 @@
;;; can simply change it to say 'x<name of file>' and it will be
;;; disabled.
-(defvar emacs-debian-default-directory
- (if (string-match ".*XEmacs.*" emacs-version)
- (let ((point
- (string-match "[0-9]*\.[0-9]*.*XEmacs.*" emacs-version)))
- (concat "/etc/xemacs/site-start-"
- (substring emacs-version point (+ point 2))
- ".d"))
- "/etc/emacs/site-start.d")
- "The default directory for this version of XEmacs to load from")
-
-
-(defun debian-run-directory (&optional dir)
- "Load each file in the form 00filename.el stored in the path.
-The files are sorted so order can be controlled."
- (interactive "DConfiguration directory : ")
- (let ((path (if dir dir emacs-debian-default-directory)))
- (mapcar
- (lambda (file)
- (if debug-on-error
- (load-file file)
- (condition-case ()
- (progn
- (load file nil t t)
- (message "*** %s loaded ***" (file-name-nondirectory file)))
- (error (message "Error while loading %s" file)))))
- (directory-files path t "^[0-9][0-9].*\\.el$" nil))))
-
-(load "/usr/share/emacs/site-lisp/debian-startup")
+(load "/usr/share/emacsen-common/debian-startup")
(setq debian-emacs-flavor 'xemacs@MAJVERSION@)
(debian-startup debian-emacs-flavor)
--
2.15.1
