Author: julien Date: 2006-12-16 16:51:49 -0500 (Sat, 16 Dec 2006) New Revision: 4156
Modified: branches/etch/app/xterm/debian/changelog branches/etch/app/xterm/debian/xterm.postinst Log: * 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). Modified: branches/etch/app/xterm/debian/changelog =================================================================== --- branches/etch/app/xterm/debian/changelog 2006-12-16 21:33:00 UTC (rev 4155) +++ branches/etch/app/xterm/debian/changelog 2006-12-16 21:51:49 UTC (rev 4156) @@ -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 <[EMAIL PROTECTED]> Sat, 16 Dec 2006 22:35:47 +0100 + xterm (222-1) unstable; urgency=low * New upstream release Modified: branches/etch/app/xterm/debian/xterm.postinst =================================================================== --- branches/etch/app/xterm/debian/xterm.postinst 2006-12-16 21:33:00 UTC (rev 4155) +++ branches/etch/app/xterm/debian/xterm.postinst 2006-12-16 21:51:49 UTC (rev 4156) @@ -13,25 +13,34 @@ 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# exit 0 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
