Version in base suite: 2.30.2-1+deb11u2 Base version: git_2.30.2-1+deb11u2 Target version: git_2.30.2-1+deb11u3 Base file: /srv/ftp-master.debian.org/ftp/pool/main/g/git/git_2.30.2-1+deb11u2.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/g/git/git_2.30.2-1+deb11u3.dsc changelog | 13 +++++++++++++ control | 27 +++------------------------ git-el.emacsen-install | 27 --------------------------- git-el.emacsen-remove | 15 --------------- git-el.emacsen-startup | 32 -------------------------------- git-el.install | 6 ------ git-el.links | 2 -- git-el.postinst | 7 ------- git-el.prerm | 6 ------ rules | 5 ----- 10 files changed, 16 insertions(+), 124 deletions(-) diff -Nru git-2.30.2/debian/changelog git-2.30.2/debian/changelog --- git-2.30.2/debian/changelog 2023-02-22 09:51:09.000000000 +0000 +++ git-2.30.2/debian/changelog 2023-06-27 21:27:24.000000000 +0000 @@ -1,3 +1,16 @@ +git (1:2.30.2-1+deb11u3) bullseye; urgency=medium + + * Non-maintainer upload. + * Backport git-el removal from 1:2.32.0~rc2-1. + + [ Jonathan Nieder ] + * remove git-el package (closes: #987264, #984931). Since version + 1:2.18.0~rc2-1, it only contained modules that error out with a + message pointing to other Emacs packages. Nowadays users can + use the README.emacs file from the git package for that instead. + + -- Andreas Beckmann Tue, 27 Jun 2023 23:27:24 +0200 + git (1:2.30.2-1+deb11u2) bullseye-security; urgency=high * Non-maintainer upload by the Security Team. diff -Nru git-2.30.2/debian/control git-2.30.2/debian/control --- git-2.30.2/debian/control 2021-03-10 01:40:56.000000000 +0000 +++ git-2.30.2/debian/control 2023-06-07 09:52:58.000000000 +0000 @@ -32,13 +32,14 @@ Pre-Depends: ${misc:Pre-Depends} Recommends: ca-certificates, patch, less, ssh-client Suggests: gettext-base, git-daemon-run | git-daemon-sysvinit, - git-doc, git-el, git-email, git-gui, gitk, gitweb, + git-doc, git-email, git-gui, gitk, gitweb, git-cvs, git-mediawiki, git-svn Replaces: gitweb (<< 1:1.7.4~rc1), git-core (<< 1:1.7.0.4-1.) Breaks: bash-completion (<< 1:1.90-1), gitweb (<< 1:1.7.4~rc1), dgit (<< 5.1~), git-buildpackage (<< 0.6.5), + git-el (<< 1:2.32.0~rc2-1~), cogito (<= 0.18.2+), openssh-client (<< 1:6.8), stgit (<< 0.15), stgit-contrib (<< 0.15), gitpkg (<< 0.15), @@ -273,28 +274,6 @@ . This package provides the gitk program, a tcl/tk revision tree visualizer. -Package: git-el -Architecture: all -Multi-Arch: foreign -Depends: ${misc:Depends}, git (>= 1:1.7.4.1-2~), emacs | emacsen -Recommends: elpa-magit -Replaces: git (<< 1:1.7.4.1-2~) -Breaks: emacsen-common (<< 3.0.0~), git (<< 1:1.7.4.1-2~) -Description: fast, scalable, distributed revision control system (emacs support) - Git is popular version control system designed to handle very large - projects with speed and efficiency; it is used for many high profile - open source projects, most notably the Linux kernel. - . - Git falls in the category of distributed source code management tools. - Every Git working directory is a full-fledged repository with full - revision tracking capabilities, not dependent on network access or a - central server. - . - This transitional package provides two modules that previously could be - used for integration with Emacs: git.el and git-blame.el. Now the - modules print an error message with instructions that users can use to - migrate to Emacs's VC-mode backend for Git or Magit. - Package: gitweb Architecture: all Multi-Arch: foreign @@ -327,7 +306,7 @@ Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), - git-doc, git-el, git-cvs, git-mediawiki, git-svn, + git-doc, git-cvs, git-mediawiki, git-svn, git-email, git-gui, gitk, gitweb Suggests: git-daemon-run | git-daemon-sysvinit Description: fast, scalable, distributed revision control system (all subpackages) diff -Nru git-2.30.2/debian/git-el.emacsen-install git-2.30.2/debian/git-el.emacsen-install --- git-2.30.2/debian/git-el.emacsen-install 2021-03-10 01:40:56.000000000 +0000 +++ git-2.30.2/debian/git-el.emacsen-install 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -#!/bin/sh -# Based on /usr/share/doc/emacsen-common/sample-package-install-foo.gz. -# -# Unlike the example, we place symlinks to the elisp source alongside -# the compiled bytecode, so the .el source is available to the various -# Emacs help tools. Putting .el and .elc files in the same directory -# keeps "list-load-path-shadows" happy. - -set -e -FLAVOR=$1 -el_files="git.el git-blame.el" -el_dir=/usr/share/git-core/emacs -elc_dir=/usr/share/$FLAVOR/site-lisp/git - -printf 'install/git: Handling install of emacsen flavor %s\n' "$FLAVOR" -[ -d "$elc_dir" ] || mkdir "$elc_dir" -( - cd $elc_dir - for i in $el_files - do - ln -sf $el_dir/$i $i - done - - printf 'install/git: Byte-compiling for %s\n' "$FLAVOR" - set -x - $FLAVOR -batch -q -no-site-file -f batch-byte-compile $el_files -) diff -Nru git-2.30.2/debian/git-el.emacsen-remove git-2.30.2/debian/git-el.emacsen-remove --- git-2.30.2/debian/git-el.emacsen-remove 2021-03-10 01:40:56.000000000 +0000 +++ git-2.30.2/debian/git-el.emacsen-remove 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -#!/bin/sh -# Clean up after git.emacsen-install. That is: -# 1. Remove compiled .elc bytecode from the site-lisp directory. -# 2. Remove .el symlinks from the site-lisp directory. -set -e -FLAVOR=$1 -el_files="git.el git-blame.el" -elc_files="git.elc git-blame.elc" -elc_dir=/usr/share/$FLAVOR/site-lisp/git - -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) -# Simulate --ignore-fail-on-non-empty (which is a GNU extension). -rmdir "$elc_dir" 2>/dev/null || true diff -Nru git-2.30.2/debian/git-el.emacsen-startup git-2.30.2/debian/git-el.emacsen-startup --- git-2.30.2/debian/git-el.emacsen-startup 2021-03-10 01:40:56.000000000 +0000 +++ git-2.30.2/debian/git-el.emacsen-startup 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -;; -*-emacs-lisp-*- -;; -;; Emacs startup file, e.g. /etc/emacs/site-start.d/50git-core.el -;; for the Debian git package - - -(let ((dir (concat "/usr/share/" - (symbol-name debian-emacs-flavor) - "/site-lisp/git"))) - (if (not (file-exists-p dir)) - (message "git removed but not purged, skipping setup") - - ;; debian-pkg-add-load-path-item as from debian 3.1 "sarge", - ;; emacsen-common 1.4.14 of June 2002 - (debian-pkg-add-load-path-item dir) - - ;; Compatibility note: In debian git-core 1:1.7.0-1 there was a long - ;; list of generated autoloads here, but now pruned back to the - ;; interactive entrypoints. If you were using those autoloads in elisp - ;; code, don't do that, use (require 'git) to express the dependency. - - ;; git.el - - (autoload 'git-status "git" "Entry point into git-status mode." t) - - ;; git-blame.el - - ;; this autoload as recommended by git-blame.el comments - (autoload 'git-blame-mode "git-blame" - "Minor mode for incremental blame for Git." t))) - -;; End of file diff -Nru git-2.30.2/debian/git-el.install git-2.30.2/debian/git-el.install --- git-2.30.2/debian/git-el.install 2021-03-10 01:40:56.000000000 +0000 +++ git-2.30.2/debian/git-el.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -#!/usr/bin/dh-exec -debian/git-el.emacsen-startup => etc/emacs/site-start.d/50git-core.el -debian/git-el.emacsen-install => usr/lib/emacsen-common/packages/install/git -debian/git-el.emacsen-remove => usr/lib/emacsen-common/packages/remove/git -contrib/emacs/git-blame.el usr/share/git-core/emacs -contrib/emacs/git.el usr/share/git-core/emacs diff -Nru git-2.30.2/debian/git-el.links git-2.30.2/debian/git-el.links --- git-2.30.2/debian/git-el.links 2021-03-10 01:40:56.000000000 +0000 +++ git-2.30.2/debian/git-el.links 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/share/doc/git/README.emacs usr/share/doc/git-el/README.Debian -usr/share/git-core/emacs usr/share/doc/git/contrib/emacs diff -Nru git-2.30.2/debian/git-el.postinst git-2.30.2/debian/git-el.postinst --- git-2.30.2/debian/git-el.postinst 2021-03-10 01:40:56.000000000 +0000 +++ git-2.30.2/debian/git-el.postinst 2023-06-07 09:51:35.000000000 +0000 @@ -1,10 +1,3 @@ -#!/bin/sh -set -e - -#DEBHELPER# - -test "$1" = configure || exit 0 -/usr/lib/emacsen-common/emacs-package-install git # Clean up after 1:1.7.4.1-1 through 1:1.7.4.1-3. ! test -L /usr/share/git-core/emacs/emacs || diff -Nru git-2.30.2/debian/git-el.prerm git-2.30.2/debian/git-el.prerm --- git-2.30.2/debian/git-el.prerm 2021-03-10 01:40:56.000000000 +0000 +++ git-2.30.2/debian/git-el.prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -#!/bin/sh -set -e - -#DEBHELPER# - -/usr/lib/emacsen-common/emacs-package-remove git diff -Nru git-2.30.2/debian/rules git-2.30.2/debian/rules --- git-2.30.2/debian/rules 2021-03-10 01:40:56.000000000 +0000 +++ git-2.30.2/debian/rules 2023-06-07 09:51:35.000000000 +0000 @@ -171,10 +171,5 @@ dh_installinit -pgit-daemon-sysvinit --name=git-daemon dh_installinit -# Skip dh_installemacsen to avoid having to rename -# /etc/emacs/site-start.d/50git-core.el to -# /etc/emacs/site-start.d/50git-el.el. -override_dh_installemacsen: - override_dh_compress: dh_compress -X.txt -Xcontrib