On Wed, Nov 06, 2019 at 09:44:59PM -0800, Dima Kogan wrote:
> Hi.
> 
> It looks like the elpa-gnuplot-mode package is missing some of the
> debiany emacs machinery: the files in
> 
>   /usr/lib/emacsen-common/packages/...
> 
> Somebody should look at the packaging, and figure out what we're missing
> and add it. Likely it's just a line or two somewhere.

Hi,

Having played with gnuplot-mode before (but not with elpa) I have been
digging into this problem, which is not Emacs26 related.

Original problem seems to be a bogus hyphen in debian/rules that completely
disables the elpa machinery, so problem went undetected. It really took me
a while to spot this problem.

I also added a debian/gnuplot-mode-pkg.el file and fine tuned
elpa-gnuplot-mode.elpa to include it and be more selective regarding files
to install.

Once this is done I noticed that package did not pass the tests because
gnuplot package was missing at that time, so I added it to Build-Deps.

I finally added elpa-gnuplot-mode.emacsen-startup to keep the .gp -> gnuplot
mode association in Emacs auto-mode-alist.

I am attaching three git patches dealing with the above.

Hope they help

-- 
Agustin
>From 1c6e992136fb5c33f28ee74e6992387a9bfa91d0 Mon Sep 17 00:00:00 2001
From: Agustin Martin Domingo <agmar...@debian.org>
Date: Fri, 8 Nov 2019 17:09:19 +0100
Subject: [PATCH 1/3] Modify to work better with elpa.

* debian/rules: Remove bogus hyphen
* debian/gnuplot-mode-pkg.el: Create
* debian/elpa-gnuplot-mode.elpa: Rename from gnuplot-mode.elpa and modify
  to include install contents and gnuplot-mode-pkg.el.
* debian/install: Remove. No longer needed.
---
 debian/elpa-gnuplot-mode.elpa | 4 ++++
 debian/gnuplot-mode-pkg.el    | 5 +++++
 debian/gnuplot-mode.elpa      | 1 -
 debian/install                | 3 ---
 debian/rules                  | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 debian/elpa-gnuplot-mode.elpa
 create mode 100644 debian/gnuplot-mode-pkg.el
 delete mode 100644 debian/gnuplot-mode.elpa
 delete mode 100644 debian/install

diff --git a/debian/elpa-gnuplot-mode.elpa b/debian/elpa-gnuplot-mode.elpa
new file mode 100644
index 0000000..cd726c7
--- /dev/null
+++ b/debian/elpa-gnuplot-mode.elpa
@@ -0,0 +1,4 @@
+gnuplot.el
+gnuplot-gui.el
+gnuplot-context.el
+debian/gnuplot-mode-pkg.el
diff --git a/debian/gnuplot-mode-pkg.el b/debian/gnuplot-mode-pkg.el
new file mode 100644
index 0000000..8b98b6e
--- /dev/null
+++ b/debian/gnuplot-mode-pkg.el
@@ -0,0 +1,5 @@
+(define-package
+  "gnuplot-mode"
+  "50"
+  "Emacs gnuplot mode"
+  nil)
diff --git a/debian/gnuplot-mode.elpa b/debian/gnuplot-mode.elpa
deleted file mode 100644
index abf136d..0000000
--- a/debian/gnuplot-mode.elpa
+++ /dev/null
@@ -1 +0,0 @@
-*.el
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 4463e0a..0000000
--- a/debian/install
+++ /dev/null
@@ -1,3 +0,0 @@
-gnuplot.el         usr/share/emacs/site-lisp/gnuplot-mode
-gnuplot-gui.el     usr/share/emacs/site-lisp/gnuplot-mode
-gnuplot-context.el usr/share/emacs/site-lisp/gnuplot-mode
diff --git a/debian/rules b/debian/rules
index ffea5e3..bb43d84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 %:
-	dh $@ --with-elpa
+	dh $@ --with elpa
 
 override_dh_auto_build:
 	$(if $(filter nodoc,$(DEB_BUILD_OPTIONS)),true,make -f Makefile.dst gpelcard.pdf)
-- 
2.24.0.rc1

>From a019516e49055cc424a624bf076874e2e3ee9e48 Mon Sep 17 00:00:00 2001
From: Agustin Martin Domingo <agmar...@debian.org>
Date: Fri, 8 Nov 2019 17:26:14 +0100
Subject: [PATCH 2/3] debian/control: Build depend on gnuplot, to allow tests
 being actually passed.

---
 debian/control | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 8d96b1f..29411f8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,11 @@ Section: lisp
 Priority: optional
 Maintainer: Debian Emacs addons team <pkg-emacsen-add...@lists.alioth.debian.org>
 Uploaders: Dima Kogan <dko...@debian.org>
-Build-Depends: debhelper (>= 10), dh-elpa (>= 0.0.17), texlive-latex-base, texlive-latex-recommended
+Build-Depends: debhelper (>= 10),
+	       dh-elpa (>= 0.0.17),
+	       texlive-latex-base,
+	       texlive-latex-recommended,
+	       gnuplot
 Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/debian/gnuplot-mode.git
 Vcs-Browser: https://salsa.debian.org/debian/gnuplot-mode
-- 
2.24.0.rc1

>From 0b7604f0e336f69f9b9bcb08a2e66dbf408b5dc3 Mon Sep 17 00:00:00 2001
From: Agustin Martin Domingo <agmar...@debian.org>
Date: Fri, 8 Nov 2019 17:41:06 +0100
Subject: [PATCH 3/3] elpa-gnuplot-mode.emacsen-startup: Add auto-mode-alist
 entry for .gp->gnuplot-mode association.

Based on old one, but with path and autoload handling removed.
---
 debian/elpa-gnuplot-mode.emacsen-startup | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 debian/elpa-gnuplot-mode.emacsen-startup

diff --git a/debian/elpa-gnuplot-mode.emacsen-startup b/debian/elpa-gnuplot-mode.emacsen-startup
new file mode 100644
index 0000000..2b83d62
--- /dev/null
+++ b/debian/elpa-gnuplot-mode.emacsen-startup
@@ -0,0 +1,12 @@
+;; -*-emacs-lisp-*-
+;;
+;; Emacs startup file for the Debian GNU/Linux elpa-gnuplot-mode package
+
+;; autoloads and paths are now handled by elpa
+
+;; Make all files with the .gp extension be loaded into gnuplot mode
+  (setq auto-mode-alist (append '(("\\.gp\\'" . gnuplot-mode)) auto-mode-alist))
+
+;; This line binds the function-9 key so that it opens a buffer into
+;; gnuplot mode
+;;  (global-set-key [(f9)] 'gnuplot-make-buffer)
-- 
2.24.0.rc1

Reply via email to