X Strike Force X.Org X11 SVN commit: r1212 - in branches/modular/font: xfonts-100dpi/debian xfonts-75dpi/debian xfonts-misc/debian
Author: dnusinow
Date: 2006-02-15 22:32:04 -0500 (Wed, 15 Feb 2006)
New Revision: 1212
Modified:
branches/modular/font/xfonts-100dpi/debian/rules
branches/modular/font/xfonts-75dpi/debian/rules
branches/modular/font/xfonts-misc/debian/rules
Log:
Apply Zephenia's patch to debian/rules for the fonts as well, so they FTBFS when one font fails
Modified: branches/modular/font/xfonts-100dpi/debian/rules
===================================================================
--- branches/modular/font/xfonts-100dpi/debian/rules 2006-02-16 03:22:01 UTC (rev 1211)
+++ branches/modular/font/xfonts-100dpi/debian/rules 2006-02-16 03:32:04 UTC (rev 1212)
@@ -41,11 +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); \
+ $(MAKE)) || exit 1; \
cd .. ; \
done
Modified: branches/modular/font/xfonts-75dpi/debian/rules
===================================================================
--- branches/modular/font/xfonts-75dpi/debian/rules 2006-02-16 03:22:01 UTC (rev 1211)
+++ branches/modular/font/xfonts-75dpi/debian/rules 2006-02-16 03:32:04 UTC (rev 1212)
@@ -41,11 +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); \
+ $(MAKE)) || exit 1; \
cd .. ; \
done
Modified: branches/modular/font/xfonts-misc/debian/rules
===================================================================
--- branches/modular/font/xfonts-misc/debian/rules 2006-02-16 03:22:01 UTC (rev 1211)
+++ branches/modular/font/xfonts-misc/debian/rules 2006-02-16 03:32:04 UTC (rev 1212)
@@ -41,11 +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); \
+ $(MAKE)) || exit 1; \
cd .. ; \
done
Reply to: