Package: seyon Version: 2..20c-20 Severity: grave Tags: patch Hey Steve,
The seyon package is currently uninstallable in unstable, because it still installs to /usr/X11R6/bin which is being turned into a compatibility symlink for the X11R7 transition. Fortunately, since seyon is using imake the transition is fairly easy, but it does require a patch when rebuilding with the new imake due to some hard-coded references to /usr/X11R6/{bin,man,lib}. In addition, since seyon.help is now moved to /usr/lib/X11, a pre-dependency on x11-common is needed to ensure /usr/lib/X11 isn't a symlink at the time of unpack. Attached is the patch to fix these issues. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
diff -u seyon-2.20c/debian/config.include seyon-2.20c/debian/config.include --- seyon-2.20c/debian/config.include +++ seyon-2.20c/debian/config.include @@ -61,14 +61,14 @@ define install_command $(MAKE) DESTDIR=debian/tmp install install -d debian/tmp/etc/X11/seyon - ln -sf /etc/X11/seyon/seyon-emu debian/tmp/usr/X11R6/bin/seyon-emu - install -d debian/tmp/usr/X11R6/man/man1 - install -m 644 seyon.man debian/tmp/usr/X11R6/man/man1/seyon.1x - install -m 644 debian/seyon-emu.man debian/tmp/usr/X11R6/man/man1/seyon-emu.1x + ln -sf /etc/X11/seyon/seyon-emu debian/tmp/usr/bin/seyon-emu + install -d debian/tmp/usr/share/man/man1 + install -m 644 seyon.man debian/tmp/usr/share/man/man1/seyon.1x + install -m 644 debian/seyon-emu.man debian/tmp/usr/share/man/man1/seyon-emu.1x # Install 1-CHANGES as upstream changelog. install -d debian/tmp/usr/share/doc/$(package) cp 1-CHANGES debian/tmp/usr/share/doc/$(package)/changelog - strip --remove-section=.comment --remove-section=.note debian/tmp/usr/X11R6/bin/seyon + strip --remove-section=.comment --remove-section=.note debian/tmp/usr/share/bin/seyon install -d debian/tmp/usr/share/menu install -m 644 debian/menu debian/tmp/usr/share/menu/seyon endef @@ -82,3 +82,3 @@ chmod 644 debian/tmp/etc/X11/app-defaults/* - chmod 644 debian/tmp/usr/X11R6/lib/X11/seyon.help + chmod 644 debian/tmp/usr/lib/X11/seyon.help endef diff -u seyon-2.20c/debian/changelog seyon-2.20c/debian/changelog --- seyon-2.20c/debian/changelog +++ seyon-2.20c/debian/changelog @@ -1,3 +1,14 @@ +seyon (2.20c-20.1) unstable; urgency=high + + * Non-maintainer upload. + * High-urgency upload for RC bugfix. + * Update debian/ to use FHS paths instead of /usr/X11R6 for Xorg7, and + build-depend on xutils-dev to get a compatible version of xmkmf. + * Pre-Depend on x11-common (>= 1:7.0.0) to also ensure /usr/lib/X11 is + a directory when we unpack to it. + + -- Steve Langasek <[EMAIL PROTECTED]> Fri, 28 Apr 2006 13:17:55 -0700 + seyon (2.20c-20) unstable; urgency=high * Remove now-redundant xlibs-dev build-dep - serious bug. Closes: #346920 diff -u seyon-2.20c/debian/control seyon-2.20c/debian/control --- seyon-2.20c/debian/control +++ seyon-2.20c/debian/control @@ -3,11 +3,12 @@ Priority: extra Maintainer: Steve McIntyre <[EMAIL PROTECTED]> Standards-Version: 3.6.2.0 -Build-Depends: libxmu-dev, libxt-dev, xutils, libxaw7-dev, bison, debhelper (>= 4.1.16) +Build-Depends: libxmu-dev, libxt-dev, xutils-dev, libxaw7-dev, bison, debhelper (>= 4.1.16) Package: seyon Architecture: any Depends: ${shlibs:Depends}, xterm | x-terminal-emulator, debconf (>= 1.2.9) | debconf-2.0 +Pre-Depends: x11-common (>= 1:7.0.0) Suggests: lrzsz, ckermit Description: Full-featured native X11 communications program Seyon is a complete full-featured modem communications package diff -u seyon-2.20c/debian/menu seyon-2.20c/debian/menu --- seyon-2.20c/debian/menu +++ seyon-2.20c/debian/menu @@ -3 +3 @@ - command="/usr/X11R6/bin/seyon" + command="/usr/bin/seyon" diff -u seyon-2.20c/debian/rules seyon-2.20c/debian/rules --- seyon-2.20c/debian/rules +++ seyon-2.20c/debian/rules @@ -78,7 +78,7 @@ install -d debian/tmp debian/tmp/DEBIAN debian/tmp/usr/share/doc/$(package) $(install_command) # Compress manpages - -gzip -9v -r debian/tmp/usr/man/ debian/tmp/usr/X11R6/man/ + -gzip -9v -r debian/tmp/usr/man/ debian/tmp/usr/share/man/ # Install documentation files, compressed. ifneq ($(strip $(docs)),) cp $(docs) debian/tmp/usr/share/doc/$(package)
signature.asc
Description: Digital signature