summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2020-07-25 15:48:36 -0700
committerSean Whitton <spwhitton@spwhitton.name>2020-07-25 16:15:58 -0700
commit53b6818bbd1c5ce4dfadaaa022b6a0d5cc4955db (patch)
tree0e19c1f7bb90fcaf7efc845f94e890e42423fc73
parentf6cbd322cfd001c5e8214f7d632ac4b25c1d37a7 (diff)
downloademacs-53b6818bbd1c5ce4dfadaaa022b6a0d5cc4955db.tar.gz
attempt to register as an Emacsen flavour
-rw-r--r--debian/dirs1
-rw-r--r--debian/links1
-rwxr-xr-xdebian/postinst7
-rwxr-xr-xdebian/prerm7
-rw-r--r--lisp/startup.el2
5 files changed, 17 insertions, 1 deletions
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 00000000000..057f2009f6c
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+/usr/share/emacs-snapshot/site-lisp/elpa
diff --git a/debian/links b/debian/links
new file mode 100644
index 00000000000..ac7e4afc766
--- /dev/null
+++ b/debian/links
@@ -0,0 +1 @@
+/usr/local/bin/emacs /usr/bin/emacs-snapshot
diff --git a/debian/postinst b/debian/postinst
new file mode 100755
index 00000000000..6e1fde4934b
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+/usr/lib/emacsen-common/emacs-install emacs-snapshot
+
+#DEBHELPER#
diff --git a/debian/prerm b/debian/prerm
new file mode 100755
index 00000000000..e72305bba57
--- /dev/null
+++ b/debian/prerm
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+/usr/lib/emacsen-common/emacs-remove emacs-snapshot
+
+#DEBHELPER#
diff --git a/lisp/startup.el b/lisp/startup.el
index 850fdf4b5d7..d679a96e779 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1235,7 +1235,7 @@ please check its value")
package-enable-at-startup
(require 'package)
(add-to-list 'package-directory-list
- "/usr/share/emacs/site-lisp/elpa-src")
+ "/usr/share/emacs-snapshot/site-lisp/elpa")
(not (bound-and-true-p package--activated))
(catch 'package-dir-found
(let (dirs)