Author: dnusinow Date: 2006-02-15 20:20:55 -0500 (Wed, 15 Feb 2006) New Revision: 1207
Modified: branches/modular/app/xbase-clients/debian/rules branches/modular/app/xutils/debian/rules Log: * Apply patch from Zephenia E. Hull to cause packages like xutils and xbase-clients that build multiple sub-packages to FTBFS when one subpackage fails. Also fix list of packages in xbase-clients. Thanks Zephenia! Modified: branches/modular/app/xbase-clients/debian/rules =================================================================== --- branches/modular/app/xbase-clients/debian/rules 2006-02-16 01:16:40 UTC (rev 1206) +++ branches/modular/app/xbase-clients/debian/rules 2006-02-16 01:20:55 UTC (rev 1207) @@ -14,7 +14,7 @@ # This package contains multiple modules as shipped by upstream. Each module is # contained in a subdirectory in the root dir of the package. You must list each # subdirectory explicitly so that the build system knows what to build -SUBDIRS="appres-X11R7.0-1.0.0 beforelight-X11R7.0-1.0.1 bitmap-X11R7.0-1.0.1 editres-X11R7.0-1.0.1 fstobdf-X11R7.0-1.0.1 iceauth-X11R7.0-1.0.1 ico-X11R7.0-1.0.1 listres-X11R7.0-1.0.1 oclock-X11R7.0-1.0.1 setxkbmap-X11R7.0-1.0.1 smproxy-X11R7.0-1.0.1 viewres-X11R7.0-1.0.1 x11perf-X11R7.0-1.0.1 xauth-X11R7.0-1.0.1 xbiff-X11R7.0-1.0.1 xcalc-X11R7.0-1.0.1 xclipboard-X11R7.0-1.0.1 xclock-X11R7.0-1.0.1 xcmsdb-X11R7.0-1.0.1 xconsole-X11R7.0-1.0.1 xcursorgen-X11R7.0-1.0.0 xdbedizzy-X11R7.0-1.0.1 xditview-X11R7.0-1.0.1 xdpyinfo-X11R7.0-1.0.1 xdriinfo-X11R7.0-1.0.0 xedit-X11R7.0-1.0.1 xev-X11R7.0-1.0.1 xeyes-X11R7.0-1.0.1 xf86dga-X11R7.0-1.0.1 xfd-X11R7.0-1.0.1 xfindproxy-X11R7.0-1.0.1 xfontsel-X11R7.0-1.0.1 xgamma-X11R7.0-1.0.1 xgc-X11R7.0-1.0.1 xhost-X11R7.0-1.0.0 xinit-X11R7.0-1.0.1 xkbcomp-X11R7.0-1.0.1 xkbevd-X11R7.0-1.0.1 xkbprint-X11R7.0-1.0.1 xkbutils-X11R7.0-1.0.1 xkill-X11R7.0-1.0.1 xload-X11R7.0-1.0.1 xlogo-X11R7.0-1.0.1 xlsatoms-X11R7.0-1.0.1 xlsclients-X11R7.0-1.0.1 xlsfonts-X11R7.0-1.0.1 xmag-X11R7.0-1.0.1 xman-X11R7.0-1.0.1 xmessage-X11R7.0-1.0.1 xmodmap-X11R7.0-1.0.0 xmore-X11R7.0-1.0.1 xprop-X11R7.0-1.0.1 xrandr-X11R7.0-1.0.1 xrdb-X11R7.0-1.0.1 xrefresh-X11R7.0-1.0.1 xsetmode-X11R7.0-1.0.0 xsetpointer-X11R7.0-1.0.0 xsetroot-X11R7.0-1.0.1 xset-X11R7.0-1.0.1 xsm-X11R7.0-1.0.1 xstdcmap-X11R7.0-1.0.1 xtrap-X11R7.0-1.0.1 xvidtune-X11R7.0-1.0.1 xvinfo-X11R7.0-1.0.1 xwd-X11R7.0-1.0.1 xwininfo-X11R7.0-1.0.1 xwud-X11R7.0-1.0.1" +SUBDIRS="appres-X11R7.0-1.0.0 beforelight-X11R7.0-1.0.1 bitmap-X11R7.0-1.0.1 editres-X11R7.0-1.0.1 fstobdf-X11R7.0-1.0.1 iceauth-X11R7.0-1.0.1 ico-X11R7.0-1.0.1 listres-X11R7.0-1.0.1 oclock-X11R7.0-1.0.1 setxkbmap-X11R7.0-1.0.1 smproxy-X11R7.0-1.0.1 viewres-X11R7.0-1.0.1 x11perf-X11R7.0-1.0.1 xauth-X11R7.0-1.0.1 xbiff-X11R7.0-1.0.1 xcalc-X11R7.0-1.0.1 xclipboard-X11R7.0-1.0.1 xclock-X11R7.0-1.0.1 xcmsdb-X11R7.0-1.0.1 xconsole-X11R7.0-1.0.1 xcursorgen-X11R7.0-1.0.0 xdbedizzy-X11R7.0-1.0.1 xditview-X11R7.0-1.0.1 xdpyinfo-X11R7.0-1.0.1 xdriinfo-X11R7.0-1.0.0 xedit-X11R7.0-1.0.1 xev-X11R7.0-1.0.1 xeyes-X11R7.0-1.0.1 xf86dga-X11R7.0-1.0.1 xfd-X11R7.0-1.0.1 xfontsel-X11R7.0-1.0.1 xgamma-X11R7.0-1.0.1 xgc-X11R7.0-1.0.1 xhost-X11R7.0-1.0.0 xinit-X11R7.0-1.0.1 xkbcomp-X11R7.0-1.0.1 xkbevd-X11R7.0-1.0.1 xkbprint-X11R7.0-1.0.1 xkbutils-X11R7.0-1.0.1 xkill-X11R7.0-1.0.1 xload-X11R7.0-1.0.1 xlogo-X11R7.0-1.0.1 xlsatoms-X11R7.0-1.0.1 xlsclients-X11R7.0-1.0.1 xlsfonts-X11R7.0-1.0.1 xmag-X11R7.0-1.0.1 xman-X11R7.0-1.0.1 xmessage-X11R7.0-1.0.1 xmodmap-X11R7.0-1.0.0 xmore-X11R7.0-1.0.1 xprop-X11R7.0-1.0.1 xrandr-X11R7.0-1.0.1 xrdb-X11R7.0-1.0.1 xrefresh-X11R7.0-1.0.1 xsetmode-X11R7.0-1.0.0 xsetpointer-X11R7.0-1.0.0 xsetroot-X11R7.0-1.0.1 xset-X11R7.0-1.0.1 xsm-X11R7.0-1.0.1 xstdcmap-X11R7.0-1.0.1 xtrap-X11R7.0-1.0.1 xvidtune-X11R7.0-1.0.1 xvinfo-X11R7.0-1.0.1 xwd-X11R7.0-1.0.1 xwininfo-X11R7.0-1.0.1 xwud-X11R7.0-1.0.1" CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -40,13 +40,13 @@ build-stamp: dh_testdir for FILE in "$(SUBDIRS)"; do \ + echo "$$FILE" ; \ mkdir "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE); \ - cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && \ + (cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && \ ../"$$FILE"/configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ - CFLAGS="$(CFLAGS)"; \ - $(MAKE); \ - cd .. ; \ + CFLAGS="$(CFLAGS)" && \ + $(MAKE)) || exit 1; \ done touch build-stamp Modified: branches/modular/app/xutils/debian/rules =================================================================== --- branches/modular/app/xutils/debian/rules 2006-02-16 01:16:40 UTC (rev 1206) +++ branches/modular/app/xutils/debian/rules 2006-02-16 01:20:55 UTC (rev 1207) @@ -41,12 +41,11 @@ dh_testdir for FILE in "$(SUBDIRS)"; do \ mkdir "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE); \ - cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && \ + (cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && \ ../"$$FILE"/configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ - CFLAGS="$(CFLAGS)"; \ - $(MAKE); \ - cd .. ; \ + CFLAGS="$(CFLAGS)" && \ + $(MAKE)) || exit 1; \ done touch build-stamp -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]