On Thu, Dec 14, 2006 at 20:11:45 +0100, Julien Cristau wrote: > Hi, > > xterm in etch is currently affected by #349462. This means that it > registers the x-terminal-emulator alternative with a slave link of > x-terminal-emulator.1x.gz, instead of x-terminal-emulator.1.gz, like all > other terminal emulators do, and like it did in sarge. Because of this, > when switching from one alternative to another, you get a broken manpage > symlink. I fixed this in 222-2 in sid. > I think that this is an important bug, that is easy to fix, so I'd like > to know if an upload to tpu to fix this would be ok for the release > team. > Proposed package is at http://liafa.jussieu.fr/~jcristau/debian/xterm/xterm_222-1etch1.dsc Please find the diff from 222-1 attached to this mail. Cheers, Julien
diff -u xterm-222/debian/xterm.postinst xterm-222/debian/xterm.postinst --- xterm-222/debian/xterm.postinst +++ xterm-222/debian/xterm.postinst @@ -13,24 +13,33 @@ THIS_SCRIPT=postinst update-alternatives --install /usr/bin/x-terminal-emulator \ - x-terminal-emulator /usr/bin/xterm 20 --slave \ - /usr/share/man/man1/x-terminal-emulator.1x.gz x-terminal-emulator.1x.gz \ - /usr/share/man/man1/xterm.1x.gz + x-terminal-emulator /usr/bin/xterm 20 --slave \ + /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \ + /usr/share/man/man1/xterm.1x.gz update-alternatives --install /usr/bin/x-terminal-emulator \ - x-terminal-emulator /usr/bin/uxterm 20 --slave \ - /usr/share/man/man1/x-terminal-emulator.1x.gz x-terminal-emulator.1x.gz \ - /usr/share/man/man1/uxterm.1x.gz + x-terminal-emulator /usr/bin/uxterm 20 --slave \ + /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \ + /usr/share/man/man1/uxterm.1x.gz update-alternatives --install /usr/bin/x-terminal-emulator \ - x-terminal-emulator /usr/bin/koi8rxterm 20 --slave \ - /usr/share/man/man1/x-terminal-emulator.1x.gz x-terminal-emulator.1x.gz \ - /usr/share/man/man1/koi8rxterm.1x.gz + x-terminal-emulator /usr/bin/koi8rxterm 20 --slave \ + /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \ + /usr/share/man/man1/koi8rxterm.1x.gz update-alternatives --install /usr/bin/x-terminal-emulator \ - x-terminal-emulator /usr/bin/lxterm 30 --slave \ - /usr/share/man/man1/x-terminal-emulator.1x.gz x-terminal-emulator.1x.gz \ - /usr/share/man/man1/lxterm.1x.gz + x-terminal-emulator /usr/bin/lxterm 30 --slave \ + /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \ + /usr/share/man/man1/lxterm.1x.gz + +# in xterm versions from 204-0pre1 to 222-1, the manpage alternative was +# set incorrectly to x-terminal-emulator.1x.gz. In some cases, this can lead +# to the absence of the x-terminal-emulator.1.gz symbolic link after the +# upgrade, so we check for this situation and add it back if necessary. +# This can be removed after the release of etch. +if ! [ -e /usr/share/man/man1/x-terminal-emulator.1.gz ]; then + ln -s /etc/alternatives/x-terminal-emulator.1.gz /usr/share/man/man1 +fi #DEBHELPER# diff -u xterm-222/debian/changelog xterm-222/debian/changelog --- xterm-222/debian/changelog +++ xterm-222/debian/changelog @@ -1,3 +1,15 @@ +xterm (222-1etch1) testing; urgency=low + + * Use x-terminal-emulator.1.gz as slave alternative, instead of + x-terminal-emulator.1x.gz. That's what other terminal emulators use, and + what xterm used to do. We also need to clean up the mess this wrong path + caused, and make sure that the x-terminal-emulator.1.gz link in + /usr/share/man/man1/ is still there, for the benefit of testing users. If + it disappeared, we add it back in postinst. Thanks to Vincent Lefevre and + Joey Hess (closes: #349462). + + -- Julien Cristau <julien.cristau@ens-lyon.org> Sat, 16 Dec 2006 22:35:47 +0100 + xterm (222-1) unstable; urgency=low * New upstream release
Attachment:
signature.asc
Description: Digital signature