tags 972871 + patch pending quit Jonathan Nieder wrote:
> Thanks for reporting. > > Strangely, debian-emacs-policy doesn't appear to be in the > emacsen-common package any more. Fortunately, it's in > https://www.debian.org/doc/packaging-manuals/debian-emacs-policy. > > It looks like we can remove the '"$FLAVOR" != emacs' check because > Debian no longer provides multiple co-installable versions of emacs > (good!). I think if we remove the check this will simply do the > right thing. > > Emacsen team: would a Breaks against emacsen-common (<< 3.0.0~) > be sufficient for ensuring we have a new enough version of emacs > for this to be safe? More concretely: how about this patch? -- 8< -- Subject: debian/git-el: do not exclude "emacs" from the flavors to install for As Zack Weinberg noticed, the git-el package has not installed any elisp for emacs for the last two years, producing a warning at startup instead: git removed but not purged, skipping setup That is because "emacs" switched from being a virtual package to being the only flavor of standard emacs installed. Update the installation scripts to reflect this. Even after this patch, the elisp installed does not do anything other than point the user to magit and emacs's built in vc-git support. A followup change may remove the package. Fixes: https://bugs.debian.org/972871 Signed-off-by: Jonathan Nieder <jrnie...@gmail.com> --- debian/changelog | 5 ++++- debian/control | 1 + debian/git-el.emacsen-install | 6 ------ debian/git-el.emacsen-remove | 1 - 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 96d06fcaff4..657218ad785 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,11 @@ git (1:2.29.1-0.1) unstable; urgency=low * debian/control: Build-Depends: debhelper-compat (= 10) * debian/rules: run "dh --without autoreconf" to speed up build, since we don't use the autotools-generated configure script. + * git-el: install elisp for the "emacs" flavor, too (thx Zack Weinberg; + closes: #972871). Breaks: emacsen-common (<< 3.0.0~) to avoid + triggering on older systems where "emacs" was a virtual package. - -- Jonathan Nieder <jrnie...@gmail.com> Mon, 26 Oct 2020 15:44:15 -0700 + -- Jonathan Nieder <jrnie...@gmail.com> Mon, 26 Oct 2020 16:22:41 -0700 git (1:2.28.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index e3edda4cf85..25c5b83f45d 100644 --- a/debian/control +++ b/debian/control @@ -278,6 +278,7 @@ Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, git (>= 1:1.7.4.1-2~), emacs | emacsen Recommends: elpa-magit +Breaks: emacsen-common (<< 3.0.0~) Replaces: git (<< 1:1.7.4.1-2~) Breaks: git (<< 1:1.7.4.1-2~) Description: fast, scalable, distributed revision control system (emacs support) diff --git a/debian/git-el.emacsen-install b/debian/git-el.emacsen-install index da35fdb0c59..4b02513a5ae 100755 --- a/debian/git-el.emacsen-install +++ b/debian/git-el.emacsen-install @@ -12,12 +12,6 @@ el_files="git.el git-blame.el" el_dir=/usr/share/git-core/emacs elc_dir=/usr/share/$FLAVOR/site-lisp/git -# The emacs startup file looks for these files in -# /usr/share/${debian-emacs-flavor}/site-lisp/git. -# Installing to the generic /usr/share/emacs/site-list/git would be -# pointless. -[ "$FLAVOR" != emacs ] || exit 0 - printf 'install/git: Handling install of emacsen flavor %s\n' "$FLAVOR" [ -d "$elc_dir" ] || mkdir "$elc_dir" ( diff --git a/debian/git-el.emacsen-remove b/debian/git-el.emacsen-remove index 5d345e1ff84..81408b0b32e 100755 --- a/debian/git-el.emacsen-remove +++ b/debian/git-el.emacsen-remove @@ -8,7 +8,6 @@ el_files="git.el git-blame.el" elc_files="git.elc git-blame.elc" elc_dir=/usr/share/$FLAVOR/site-lisp/git -[ "$FLAVOR" != emacs ] || exit 0 printf 'remove/git: Handling removal of emacsen flavor %s\n' "$FLAVOR" [ -d "$elc_dir" ] || exit 0 (cd "$elc_dir"; rm -f $elc_files $el_files) -- 2.29.0.rc2.309.g374f81d7ae
