diff -Nru gedit-46.2/debian/changelog gedit-46.2/debian/changelog --- gedit-46.2/debian/changelog 2024-03-31 05:39:22.000000000 +0000 +++ gedit-46.2/debian/changelog 2024-01-23 21:13:14.000000000 +0000 @@ -1,8 +1,11 @@ -gedit (46.2-1build1) noble; urgency=medium +gedit (46.2-2) unstable; urgency=medium - * No-change rebuild for CVE-2024-3094 + * debian/postinst: Remove gedit as a gnome-text-editor alternative + in the alternatives system now that gnome-text-editor is an actual + program, provided in the gnome-text-editor package (Closes: #1057184) + (LP: #2062418) - -- Steve Langasek Sun, 31 Mar 2024 05:39:22 +0000 + -- Amin Bandali Tue, 23 Jan 2024 16:13:14 -0500 gedit (46.2-1) unstable; urgency=medium diff -Nru gedit-46.2/debian/control gedit-46.2/debian/control --- gedit-46.2/debian/control 2024-03-31 05:39:22.000000000 +0000 +++ gedit-46.2/debian/control 2024-01-23 21:13:14.000000000 +0000 @@ -1,8 +1,7 @@ Source: gedit Section: gnome Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian GNOME Maintainers +Maintainer: Debian GNOME Maintainers Uploaders: Amin Bandali , Jeremy BĂ­cha , Iain Lane , Laurent Bigonville , Michael Biebl Build-Depends: appstream-util , debhelper-compat (= 13), diff -Nru gedit-46.2/debian/gedit.postinst gedit-46.2/debian/gedit.postinst --- gedit-46.2/debian/gedit.postinst 2024-03-27 22:51:14.000000000 +0000 +++ gedit-46.2/debian/gedit.postinst 2024-01-23 21:13:14.000000000 +0000 @@ -1,20 +1,14 @@ #!/bin/sh - set -e case "$1" in configure) - # register gedit as a gnome-text-editor in the alternatives system - update-alternatives \ - --install \ - /usr/bin/gnome-text-editor \ - gnome-text-editor \ - /usr/bin/gedit \ - 50 \ - --slave \ - /usr/share/man/man1/gnome-text-editor.1.gz \ - gnome-text-editor.1.gz \ - /usr/share/man/man1/gedit.1.gz + # remove the gnome-text-editor alternative in the alternatives + # system now that gnome-text-editor is an actual, separate + # program, provided in the gnome-text-editor package + if update-alternatives --list gnome-text-editor >/dev/null 2>&1; then + update-alternatives --remove gnome-text-editor /usr/bin/gedit + fi ;; abort-upgrade|abort-remove|abort-deconfigure) @@ -22,8 +16,11 @@ *) echo "postinst called with unknown argument \`$1'" >&2 - exit 0 + exit 1 ;; esac + #DEBHELPER# + +exit 0 diff -Nru gedit-46.2/debian/gedit.prerm gedit-46.2/debian/gedit.prerm --- gedit-46.2/debian/gedit.prerm 2024-03-27 22:51:14.000000000 +0000 +++ gedit-46.2/debian/gedit.prerm 2024-01-23 21:13:14.000000000 +0000 @@ -1,9 +1,12 @@ #! /bin/sh - set -e if [ "$1" = remove ]; then - update-alternatives --remove gnome-text-editor /usr/bin/gedit || true + if update-alternatives --list gnome-text-editor >/dev/null 2>&1; then + update-alternatives --remove gnome-text-editor /usr/bin/gedit + fi fi #DEBHELPER# + +exit 0