[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1069210: marked as done (dh-elpa: Support nested directory in elpa installation)

Your message dated Fri, 12 Jul 2024 06:19:36 +0000
with message-id <E1sS9d2-0069i4-Ue@fasolo.debian.org>
and subject line Bug#1069210: fixed in dh-elpa 2.1.2
has caused the Debian Bug report #1069210,
regarding dh-elpa: Support nested directory in elpa installation
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1069210: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069210
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: dh-elpa
Version: 2.0.17
Severity: wishlist

Hi,

Currently dh-elpa installs all *.el files directly under the root of
ELPA installation directory.  This handles most ELPA packages without
issues, though there are some packages that starts to use nested
directory structures, e.g. auctex[1].

Therefore I'd like to propose to add nested directory support in
dh-elpa.  I have a draft implementation that adds support for
recursively create symlink in subdirectories as well as recursive
byte-compiling.  You can check it out in my salsa repo[2], and the
patches are also attached.  I have tested with the work-in-progress
auctex which seems to work, but it would be good to know whether there
are any aspects that I missed from the dh-elpa handling.

Any comments are welcome.

[1] When installing elpa.gnu.org auctex will have a nested `style/'
directory, though for the auctex packaged in Debian has not been
elpafied (which I'm trying to experiment in
https://bugs.debian.org/1056939)

[2] https://salsa.debian.org/manphiz/dh-elpa/-/tree/nested-directory-support?ref_type=heads

-- System Information:
Debian Release: 12.5
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable-security'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 6.1.0-20-amd64 (SMP w/16 CPU threads; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages dh-elpa depends on:
ii  debhelper               13.11.4
ii  emacs                   1:29.3+1-2~bpo12+0manphiz1
ii  emacs-gtk [emacs]       1:29.3+1-2~bpo12+0manphiz1
ii  libarray-utils-perl     0.5-3
ii  libconfig-tiny-perl     2.28-2
ii  libdebian-source-perl   0.122
ii  libdpkg-perl            1.21.22
ii  libfile-find-rule-perl  0.34-3
ii  libtext-glob-perl       0.11-3
ii  perl                    5.36.0-7+deb12u1

dh-elpa recommends no packages.

dh-elpa suggests no packages.

-- no debconf information

>From 2df1f0d70c62e322618e7ed64515b33566c2f5f2 Mon Sep 17 00:00:00 2001
From: Xiyue Deng <manphiz@gmail.com>
Date: Mon, 15 Apr 2024 13:03:16 -0700
Subject: [PATCH 1/3] Byte compile recursively during install to handle nested
 directories

* This handles addons that have source files under nested directories
in ELPA install directories.
---
 helper/install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/helper/install b/helper/install
index 39db695..eb68ef5 100755
--- a/helper/install
+++ b/helper/install
@@ -58,7 +58,8 @@ echo "install/${ELPA_DIR}: byte-compiling for ${FLAVOR}"
  ${FLAVOR} --quick --batch -l package \
            --eval "(setq package-user-dir \"/nonexistent\")" \
            --eval "(add-to-list 'package-directory-list \"$src_dir\")" \
-           -f package-initialize -f batch-byte-compile ./*.el > Install.log 2>&1
+           -f package-initialize \
+           --eval "(byte-recompile-directory \".\" 0)" > Install.log 2>&1
  if test $? -ne 0
  then
    cat Install.log
-- 
2.39.2


>From 5729f59dfa29bf9acda3959ff00aab179744e6d0 Mon Sep 17 00:00:00 2001
From: Xiyue Deng <manphiz@gmail.com>
Date: Wed, 17 Apr 2024 14:06:42 -0700
Subject: [PATCH 2/3] Create symlink from elpa-src to elpa recursively

* Instead of using `ln -s', use `cp -rs' so that directories are
handled recursively.
* In remove we use `rmdir --ignore-fail-on-non-empty' so this was
handled automatically as well.
---
 helper/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helper/install b/helper/install
index eb68ef5..8d748c8 100755
--- a/helper/install
+++ b/helper/install
@@ -50,7 +50,7 @@ echo "install/${ELPA_DIR}: byte-compiling for ${FLAVOR}"
 # policy).  This makes complation easy, and also allows find-function
 # and find-library to work properly.  Also link all other top level
 # files and directories into the flavor directory
-(cd "${elc_dir}" && ln -sf "${el_dir}"* .)
+(cd "${elc_dir}" && cp -rsf "${el_dir}"* .)
 
 # Byte compile them
 (cd "${elc_dir}"
-- 
2.39.2


>From b15e026ce0d4166d427aca14d3451eb9b60fb1c9 Mon Sep 17 00:00:00 2001
From: Xiyue Deng <manphiz@gmail.com>
Date: Wed, 17 Apr 2024 14:17:41 -0700
Subject: [PATCH 3/3] Update d/changelog

---
 debian/changelog | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 161b05c..20026ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,13 @@ dh-elpa (2.1.2) UNRELEASED; urgency=medium
   * Add transient to the list of packages packaged separately as well as
     provided with emacs.
 
- -- Xiyue Deng <manphiz@gmail.com>  Sat, 06 Apr 2024 16:41:14 -0700
+  [ Xiyue Deng ]
+  * Add support for nested directory in elpa installation.
+    - Byte compile recursively during install to handle nested
+      directories.
+    - Create symlink from elpa-src to elpa recursively.
+
+ -- Xiyue Deng <manphiz@gmail.com>  Wed, 17 Apr 2024 14:16:00 -0700
 
 dh-elpa (2.1.1) experimental; urgency=medium
 
-- 
2.39.2

--- End Message ---
--- Begin Message --- 
Source: dh-elpa
Source-Version: 2.1.2
Done: Sean Whitton <spwhitton@spwhitton.name>

We believe that the bug you reported is fixed in the latest version of
dh-elpa, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1069210@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Sean Whitton <spwhitton@spwhitton.name> (supplier of updated dh-elpa package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Fri, 12 Jul 2024 14:03:04 +0800
Source: dh-elpa
Architecture: source
Version: 2.1.2
Distribution: experimental
Urgency: medium
Maintainer: Debian Emacsen team <debian-emacsen@lists.debian.org>
Changed-By: Sean Whitton <spwhitton@spwhitton.name>
Closes: 973393 1069210 1069326
Changes:
 dh-elpa (2.1.2) experimental; urgency=medium
 .
   [ Xiyue Deng ]
   * Set ert-batch-backtrace-right-margin to nil to allow full backtrace
     when ERT tests fail (Closes: #973393).
   * Add support for passing ERT selectors using ert_selectors.
   * Handle git version with date in dhelpa-sanitise-version.
   * dh_elpa_test: Don't rename files under test/, tests/
     (Closes: #1069326).
   * Use `pretty' stack frame style in buttercup for full back trace.
   * Add support for installing nested directories (Closes: #1069210)
     - Don't recursively add to elpa path, to match package.el
     - Byte-compile recursively during install
     - Recursively create the symlinks from elpa-src->elpa.
 .
   [ Aymeric Agon-Rambosson ]
   * Get Package-Requires with lm-header-multiline (some upstream
     maintainers specify one dependency per line).
   * Add transient to the list of packages packaged separately as well as
     provided with Emacs.
Checksums-Sha1:
 ed17599ddc9b7967203d9037b7feabf3b777da27 1914 dh-elpa_2.1.2.dsc
 1a2256110107ef06534efb41c5b16c9c051805e5 27488 dh-elpa_2.1.2.tar.xz
Checksums-Sha256:
 692a68a27e5db06d14937c0f846edafaae5a06b76d381accf80fa9aaf3659929 1914 dh-elpa_2.1.2.dsc
 660790a81fb0fa1a876a982656664f67b7b522b1c932da3fbda18861471c842d 27488 dh-elpa_2.1.2.tar.xz
Files:
 9fcdd20b6700141e80bdc2d7501fa54d 1914 devel optional dh-elpa_2.1.2.dsc
 d12792cc6b464f7cee4ffb3a92f39b5d 27488 devel optional dh-elpa_2.1.2.tar.xz

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEm5FwB64DDjbk/CSLaVt65L8GYkAFAmaQx/8ACgkQaVt65L8G
YkDPTg/9HuTIYTetAZRhzP/KqpC30FulmLAFk9gr9jhEbuLrYPPq1uh2xX2Anbfo
zWPNN31ghvvwHL3hHCsLbMW2PcM5wJMeLHNLVLrtpkIHvRMxzWo2rp8XLWjwMT6/
xC2Xyx13wmMw75latSY/rsMqyWpnlrQLatehtS+4fk96cjGwuCKq2UfafdY4+Vtl
vZ27QcbK/bU1fd3vVYyFn4/PbwJ5T0exjQRdZPeyjJ4dWJmPbOGP0FAuV1b2RnyB
bKHwJSXyXLICAshRfk7OoiLdDatXwsWLTWX7fWIwCOHXhqK9D45pBGGMaveC+JZe
y9DI3ygpqrHe57/ITbx1Oxg5Y320cVC24DLmLSziy378zUMzU45cCIRJoMPgegK6
KZrLvLheHGoqsufYLwbyL5DHyYT2oSuoYRCD0wtCh9gV1KfvOhO/Mzupx377mKZq
AYizu9rcmQ2OS3kgv2G0ZGcgKJDgRgk3gVzFIJ3e72IbG1WXrz6/WaKQzj+ddpsN
GXoy/q5mIReUdWwLCSMHD8JLIHqQ6bxhguyAXXwOm3hP6nq/ERMaJtRp8N3AElaV
vbyfhyEUkQNcOItF3c6wYBrySQO+rnAo8EyA2sIXifThejanyvLOJW61Sc5ir1dM
D7IPKUXRcPJiEZ/FzXYcbDki/PeyjVNcYRPe6f3V4hE8U6Q7Cas=
=9MfD
-----END PGP SIGNATURE-----

Attachment: pgpk43oJMin_Y.pgp
Description: PGP signature


--- End Message ---
Reply to: