diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2020-06-07 15:18:24 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-06-07 15:18:24 -0700 |
commit | fbe57d9bd7d1b8fd8bb4c2eb9ad4160da89b5598 (patch) | |
tree | dfaa709150818b6a40ef9cc80e7bf431e90be40e /dh_elpa | |
parent | 5e6244b47186b16b379fde746c709d06bc25a65f (diff) | |
parent | e70705e6aa7db3e314ddab9b462a60b29eaf0b14 (diff) |
Merge tag 'debian/2.0.4' into dgit/buster-backports
dh-elpa release 2.0.4 for unstable (sid) [dgit]
[dgit distro=debian no-split]
# gpg: Signature made Mon 01 Jun 2020 05:33:48 PM MST
# gpg: using RSA key 9B917007AE030E36E4FC248B695B7AE4BF066240
# gpg: Good signature from "Sean Whitton <spwhitton@spwhitton.name>" [ultimate]
# Primary key fingerprint: 8DC2 487E 51AB DD90 B5C4 753F 0F56 D055 3B6D 411B
# Subkey fingerprint: 9B91 7007 AE03 0E36 E4FC 248B 695B 7AE4 BF06 6240
Diffstat (limited to 'dh_elpa')
-rwxr-xr-x | dh_elpa | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -210,10 +210,11 @@ if ($dh{BYTECOMPILE}) { } PACKAGE: -foreach my $package (@{$dh{DOPACKAGES}}) { +foreach my $package (getpackages()) { my $tmp=tmpdir($package); my $file=pkgfile($package,"elpa"); + my $skip_install = process_pkg($package) ? 0 : 1; my $varname="ELPA_NAME_${package}"; my $elpapkg = $ENV{$varname} || $ENV{ELPA_NAME}; @@ -265,7 +266,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) { push @actions, map { {"src" => $_} } @ARGV; } - next PACKAGE if (scalar(@actions) == 0); + log_installed_files($package, map { @{$_->{src}} } @actions); + + next PACKAGE if ($skip_install or (scalar(@actions) == 0)); my $pkg_file; my $cwd = getcwd(); @@ -367,7 +370,7 @@ Note that Emacs Lisp dependencies packaged outside the elpa-* dpkg namespace must be specified manually. For example, the s.el library was once provided by the binary package s-el, and at that time packages depending on it required an explicit dependency on s-el. A dependency -on s.el is now fulfilled automaticaly by elpa-s via ${elpa:Depends}. +on s.el is now fulfilled automatically by elpa-s via ${elpa:Depends}. If dh_elpa adds dependency elpa-x where x is an Emacs Lisp binary package outside the elpa-* namespace, please file a bug against @@ -479,7 +482,7 @@ initialization time. This is better than using C<debian/emacsen-startup> because the forms are then added to I<elpa-package>-autoloads.el, rather than a file in C</etc/>, as the contents of C<debian/emacsen-startup> was. This simplifies package -maintainance. +maintenance. These cookies can either annotate upstream source, or be added (along with the relevant forms) to a file in C<debian/>, by convention |