Author: branden Date: 2003-08-27 13:08:10 -0500 (Wed, 27 Aug 2003) New Revision: 447
Modified: trunk/debian/changelog trunk/debian/rules Log: debian/rules: don't try to install the XFree86.1x manpage as XFree86-debug.1x if the XFree86.1x manpage doesn't exist (it doesn't on architectures that don't build the XFree86 X server, like s390; fixes FTBFS on s390) Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2003-08-27 15:59:18 UTC (rev 446) +++ trunk/debian/changelog 2003-08-27 18:08:10 UTC (rev 447) @@ -66,8 +66,13 @@ - patch #000_stolen_from_HEAD: updated - patch #067: resync - -- Branden Robinson <[EMAIL PROTECTED]> Wed, 27 Aug 2003 10:56:19 -0500 + * debian/rules: don't try to install the XFree86.1x manpage as + XFree86-debug.1x if the XFree86.1x manpage doesn't exist (it doesn't on + architectures that don't build the XFree86 X server, like s390; fixes + FTBFS on s390) + -- Branden Robinson <[EMAIL PROTECTED]> Wed, 27 Aug 2003 13:06:44 -0500 + xfree86 (4.2.1-10) unstable; urgency=medium * patch #000_stolen_from_HEAD_xlib: fix for buffer overflow in Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2003-08-27 15:59:18 UTC (rev 446) +++ trunk/debian/rules 2003-08-27 18:08:10 UTC (rev 447) @@ -348,9 +348,13 @@ dh_testdir dh_testroot dh_install --sourcedir=debian/tmp - # special handling - install -m 755 -d debian/xserver-xfree86-dbg/usr/X11R6/man/man1 - install -m 644 debian/tmp/usr/X11R6/man/man1/XFree86.1x debian/xserver-xfree86-dbg/usr/X11R6/man/man1/XFree86-debug.1x + # special handling; don't do this if the manpage doesn't exist, which + # will be the case if this architecture doesn't build the XFree86 X + # server + if [ -e debian/tmp/usr/X11R6/man/man1/XFree86.1x ]; then \ + install -m 755 -d debian/xserver-xfree86-dbg/usr/X11R6/man/man1; \ + install -m 644 debian/tmp/usr/X11R6/man/man1/XFree86.1x debian/xserver-xfree86-dbg/usr/X11R6/man/man1/XFree86-debug.1x; \ + fi dh_installdebconf dh_installdirs dh_installdocs -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]