Author: fabbione
Date: 2004-07-12 11:22:48 -0500 (Mon, 12 Jul 2004)
New Revision: 1628
Modified:
people/fabbione/trunk/debian/CHANGESET
people/fabbione/trunk/debian/MANIFEST.all
people/fabbione/trunk/debian/MANIFEST.alpha.in
people/fabbione/trunk/debian/MANIFEST.arm.in
people/fabbione/trunk/debian/MANIFEST.hppa.in
people/fabbione/trunk/debian/MANIFEST.hurd-i386.in
people/fabbione/trunk/debian/MANIFEST.i386.in
people/fabbione/trunk/debian/MANIFEST.ia64.in
people/fabbione/trunk/debian/MANIFEST.m68k.in
people/fabbione/trunk/debian/MANIFEST.mips.in
people/fabbione/trunk/debian/MANIFEST.mipsel.in
people/fabbione/trunk/debian/MANIFEST.powerpc.in
people/fabbione/trunk/debian/MANIFEST.s390.in
people/fabbione/trunk/debian/MANIFEST.sparc.in
people/fabbione/trunk/debian/rules
Log:
Fix fonts/util build when fonts are not built, update MANIFEST.*.in files,
prepare to stop building docs when called with binary-arch.
Modified: people/fabbione/trunk/debian/CHANGESET
===================================================================
--- people/fabbione/trunk/debian/CHANGESET 2004-07-12 16:20:10 UTC (rev
1627)
+++ people/fabbione/trunk/debian/CHANGESET 2004-07-12 16:22:48 UTC (rev
1628)
@@ -8,6 +8,10 @@
(It should always be safe to merge the latest version of TODO or CHANGESETS
files anywhere.)
+Fix fonts/util build when fonts are not built, update MANIFEST.*.in files,
+prepare to stop building docs when called with binary-arch.
+ 1628
+
Add support for dynamic MANIFEST files.
1362
Modified: people/fabbione/trunk/debian/MANIFEST.all
===================================================================
--- people/fabbione/trunk/debian/MANIFEST.all 2004-07-12 16:20:10 UTC (rev
1627)
+++ people/fabbione/trunk/debian/MANIFEST.all 2004-07-12 16:22:48 UTC (rev
1628)
@@ -1,5 +1,3 @@
-usr/X11R6/bin/bdftruncate
-usr/X11R6/bin/ucs2any
usr/X11R6/lib/X11/fonts/100dpi/UTBI__10-ISO8859-1.pcf.gz
usr/X11R6/lib/X11/fonts/100dpi/UTBI__10-ISO8859-10.pcf.gz
usr/X11R6/lib/X11/fonts/100dpi/UTBI__10-ISO8859-13.pcf.gz
@@ -4364,5 +4362,3 @@
usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
usr/X11R6/lib/X11/fonts/util/map-KOI8-R
-usr/X11R6/man/man1/bdftruncate.1x
-usr/X11R6/man/man1/ucs2any.1x
Modified: people/fabbione/trunk/debian/MANIFEST.alpha.in
===================================================================
--- people/fabbione/trunk/debian/MANIFEST.alpha.in 2004-07-12 16:20:10 UTC
(rev 1627)
+++ people/fabbione/trunk/debian/MANIFEST.alpha.in 2004-07-12 16:22:48 UTC
(rev 1628)
@@ -428,6 +428,7 @@
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
usr/X11R6/bin/bdftopcf
+usr/X11R6/bin/bdftruncate
usr/X11R6/bin/beforelight
usr/X11R6/bin/bitmap
usr/X11R6/bin/bmtoa
@@ -484,6 +485,7 @@
usr/X11R6/bin/sxpm
usr/X11R6/bin/texteroids
usr/X11R6/bin/twm
+usr/X11R6/bin/ucs2any
usr/X11R6/bin/uxterm
usr/X11R6/bin/viewres
usr/X11R6/bin/x11perf
@@ -1759,6 +1761,7 @@
usr/X11R6/man/man1/appres.1x
usr/X11R6/man/man1/atobm.1x
usr/X11R6/man/man1/bdftopcf.1x
+usr/X11R6/man/man1/bdftruncate.1x
usr/X11R6/man/man1/beforelight.1x
usr/X11R6/man/man1/bitmap.1x
usr/X11R6/man/man1/bmtoa.1x
@@ -1811,6 +1814,7 @@
usr/X11R6/man/man1/sxpm.1x
usr/X11R6/man/man1/texteroids.1x
usr/X11R6/man/man1/twm.1x
+usr/X11R6/man/man1/ucs2any.1x
usr/X11R6/man/man1/uxterm.1x
usr/X11R6/man/man1/viewres.1x
usr/X11R6/man/man1/x11perf.1x
Modified: people/fabbione/trunk/debian/MANIFEST.arm.in
===================================================================
--- people/fabbione/trunk/debian/MANIFEST.arm.in 2004-07-12 16:20:10 UTC
(rev 1627)
+++ people/fabbione/trunk/debian/MANIFEST.arm.in 2004-07-12 16:22:48 UTC
(rev 1628)
@@ -428,6 +428,7 @@
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
usr/X11R6/bin/bdftopcf
+usr/X11R6/bin/bdftruncate
usr/X11R6/bin/beforelight
usr/X11R6/bin/bitmap
usr/X11R6/bin/bmtoa
@@ -483,6 +484,7 @@
usr/X11R6/bin/sxpm
usr/X11R6/bin/texteroids
usr/X11R6/bin/twm
+usr/X11R6/bin/ucs2any
usr/X11R6/bin/uxterm
usr/X11R6/bin/viewres
usr/X11R6/bin/x11perf
@@ -1748,6 +1750,7 @@
usr/X11R6/man/man1/appres.1x
usr/X11R6/man/man1/atobm.1x
usr/X11R6/man/man1/bdftopcf.1x
+usr/X11R6/man/man1/bdftruncate.1x
usr/X11R6/man/man1/beforelight.1x
usr/X11R6/man/man1/bitmap.1x
usr/X11R6/man/man1/bmtoa.1x
@@ -1800,6 +1803,7 @@
usr/X11R6/man/man1/sxpm.1x
usr/X11R6/man/man1/texteroids.1x
usr/X11R6/man/man1/twm.1x
+usr/X11R6/man/man1/ucs2any.1x
usr/X11R6/man/man1/uxterm.1x
usr/X11R6/man/man1/viewres.1x
usr/X11R6/man/man1/x11perf.1x
Modified: people/fabbione/trunk/debian/MANIFEST.hppa.in
===================================================================
--- people/fabbione/trunk/debian/MANIFEST.hppa.in 2004-07-12 16:20:10 UTC
(rev 1627)
+++ people/fabbione/trunk/debian/MANIFEST.hppa.in 2004-07-12 16:22:48 UTC
(rev 1628)
@@ -428,6 +428,7 @@
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
usr/X11R6/bin/bdftopcf
+usr/X11R6/bin/bdftruncate
usr/X11R6/bin/beforelight
usr/X11R6/bin/bitmap
usr/X11R6/bin/bmtoa
@@ -483,6 +484,7 @@
usr/X11R6/bin/sxpm
usr/X11R6/bin/texteroids
usr/X11R6/bin/twm
+usr/X11R6/bin/ucs2any
usr/X11R6/bin/uxterm
usr/X11R6/bin/viewres
usr/X11R6/bin/x11perf
@@ -1642,6 +1644,7 @@
usr/X11R6/man/man1/appres.1x
usr/X11R6/man/man1/atobm.1x
usr/X11R6/man/man1/bdftopcf.1x
+usr/X11R6/man/man1/bdftruncate.1x
usr/X11R6/man/man1/beforelight.1x
usr/X11R6/man/man1/bitmap.1x
usr/X11R6/man/man1/bmtoa.1x
@@ -1694,6 +1697,7 @@
usr/X11R6/man/man1/sxpm.1x
usr/X11R6/man/man1/texteroids.1x
usr/X11R6/man/man1/twm.1x
+usr/X11R6/man/man1/ucs2any.1x
usr/X11R6/man/man1/uxterm.1x
usr/X11R6/man/man1/viewres.1x
usr/X11R6/man/man1/x11perf.1x
Modified: people/fabbione/trunk/debian/MANIFEST.hurd-i386.in
===================================================================
--- people/fabbione/trunk/debian/MANIFEST.hurd-i386.in 2004-07-12 16:20:10 UTC
(rev 1627)
+++ people/fabbione/trunk/debian/MANIFEST.hurd-i386.in 2004-07-12 16:22:48 UTC
(rev 1628)
@@ -428,6 +428,7 @@
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
usr/X11R6/bin/bdftopcf
+usr/X11R6/bin/bdftruncate
usr/X11R6/bin/beforelight
usr/X11R6/bin/bitmap
usr/X11R6/bin/bmtoa
@@ -484,6 +485,7 @@
usr/X11R6/bin/sxpm
usr/X11R6/bin/texteroids
usr/X11R6/bin/twm
+usr/X11R6/bin/ucs2any
usr/X11R6/bin/uxterm
usr/X11R6/bin/viewres
usr/X11R6/bin/x11perf
@@ -1598,6 +1600,7 @@
usr/X11R6/man/man1/appres.1x
usr/X11R6/man/man1/atobm.1x
usr/X11R6/man/man1/bdftopcf.1x
+usr/X11R6/man/man1/bdftruncate.1x
usr/X11R6/man/man1/beforelight.1x
usr/X11R6/man/man1/bitmap.1x
usr/X11R6/man/man1/bmtoa.1x
@@ -1650,6 +1653,7 @@
usr/X11R6/man/man1/sxpm.1x
usr/X11R6/man/man1/texteroids.1x
usr/X11R6/man/man1/twm.1x
+usr/X11R6/man/man1/ucs2any.1x
usr/X11R6/man/man1/uxterm.1x
usr/X11R6/man/man1/viewres.1x
usr/X11R6/man/man1/x11perf.1x
Modified: people/fabbione/trunk/debian/MANIFEST.i386.in
===================================================================
--- people/fabbione/trunk/debian/MANIFEST.i386.in 2004-07-12 16:20:10 UTC
(rev 1627)
+++ people/fabbione/trunk/debian/MANIFEST.i386.in 2004-07-12 16:22:48 UTC
(rev 1628)
@@ -428,6 +428,7 @@
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
usr/X11R6/bin/bdftopcf
+usr/X11R6/bin/bdftruncate
usr/X11R6/bin/beforelight
usr/X11R6/bin/bitmap
usr/X11R6/bin/bmtoa
@@ -484,6 +485,7 @@
usr/X11R6/bin/sxpm
usr/X11R6/bin/texteroids
usr/X11R6/bin/twm
+usr/X11R6/bin/ucs2any
usr/X11R6/bin/uxterm
usr/X11R6/bin/viewres
usr/X11R6/bin/x11perf
@@ -1784,6 +1786,7 @@
usr/X11R6/man/man1/appres.1x
usr/X11R6/man/man1/atobm.1x
usr/X11R6/man/man1/bdftopcf.1x
+usr/X11R6/man/man1/bdftruncate.1x
usr/X11R6/man/man1/beforelight.1x
usr/X11R6/man/man1/bitmap.1x
usr/X11R6/man/man1/bmtoa.1x
@@ -1836,6 +1839,7 @@
usr/X11R6/man/man1/sxpm.1x
usr/X11R6/man/man1/texteroids.1x
usr/X11R6/man/man1/twm.1x
+usr/X11R6/man/man1/ucs2any.1x
usr/X11R6/man/man1/uxterm.1x
usr/X11R6/man/man1/viewres.1x
usr/X11R6/man/man1/x11perf.1x
Modified: people/fabbione/trunk/debian/MANIFEST.ia64.in
===================================================================
--- people/fabbione/trunk/debian/MANIFEST.ia64.in 2004-07-12 16:20:10 UTC
(rev 1627)
+++ people/fabbione/trunk/debian/MANIFEST.ia64.in 2004-07-12 16:22:48 UTC
(rev 1628)
@@ -428,6 +428,7 @@
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
usr/X11R6/bin/bdftopcf
+usr/X11R6/bin/bdftruncate
usr/X11R6/bin/beforelight
usr/X11R6/bin/bitmap
usr/X11R6/bin/bmtoa
@@ -484,6 +485,7 @@
usr/X11R6/bin/sxpm
usr/X11R6/bin/texteroids
usr/X11R6/bin/twm
+usr/X11R6/bin/ucs2any
usr/X11R6/bin/uxterm
usr/X11R6/bin/viewres
usr/X11R6/bin/x11perf
@@ -1781,6 +1783,7 @@
usr/X11R6/man/man1/appres.1x
usr/X11R6/man/man1/atobm.1x
usr/X11R6/man/man1/bdftopcf.1x
+usr/X11R6/man/man1/bdftruncate.1x
usr/X11R6/man/man1/beforelight.1x
usr/X11R6/man/man1/bitmap.1x
usr/X11R6/man/man1/bmtoa.1x
@@ -1833,6 +1836,7 @@
usr/X11R6/man/man1/sxpm.1x
usr/X11R6/man/man1/texteroids.1x
usr/X11R6/man/man1/twm.1x
+usr/X11R6/man/man1/ucs2any.1x
usr/X11R6/man/man1/uxterm.1x
usr/X11R6/man/man1/viewres.1x
usr/X11R6/man/man1/x11perf.1x
Modified: people/fabbione/trunk/debian/MANIFEST.m68k.in
===================================================================
--- people/fabbione/trunk/debian/MANIFEST.m68k.in 2004-07-12 16:20:10 UTC
(rev 1627)
+++ people/fabbione/trunk/debian/MANIFEST.m68k.in 2004-07-12 16:22:48 UTC
(rev 1628)
@@ -428,6 +428,7 @@
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
usr/X11R6/bin/bdftopcf
+usr/X11R6/bin/bdftruncate
usr/X11R6/bin/beforelight
usr/X11R6/bin/bitmap
usr/X11R6/bin/bmtoa
@@ -483,6 +484,7 @@
usr/X11R6/bin/sxpm
usr/X11R6/bin/texteroids
usr/X11R6/bin/twm
+usr/X11R6/bin/ucs2any
usr/X11R6/bin/uxterm
usr/X11R6/bin/viewres
usr/X11R6/bin/x11perf
@@ -1750,6 +1752,7 @@
usr/X11R6/man/man1/appres.1x
usr/X11R6/man/man1/atobm.1x
usr/X11R6/man/man1/bdftopcf.1x
+usr/X11R6/man/man1/bdftruncate.1x
usr/X11R6/man/man1/beforelight.1x
usr/X11R6/man/man1/bitmap.1x
usr/X11R6/man/man1/bmtoa.1x
@@ -1802,6 +1805,7 @@
usr/X11R6/man/man1/sxpm.1x
usr/X11R6/man/man1/texteroids.1x
usr/X11R6/man/man1/twm.1x
+usr/X11R6/man/man1/ucs2any.1x
usr/X11R6/man/man1/uxterm.1x
usr/X11R6/man/man1/viewres.1x
usr/X11R6/man/man1/x11perf.1x
Modified: people/fabbione/trunk/debian/MANIFEST.mips.in
===================================================================
--- people/fabbione/trunk/debian/MANIFEST.mips.in 2004-07-12 16:20:10 UTC
(rev 1627)
+++ people/fabbione/trunk/debian/MANIFEST.mips.in 2004-07-12 16:22:48 UTC
(rev 1628)
@@ -428,6 +428,7 @@
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
usr/X11R6/bin/bdftopcf
+usr/X11R6/bin/bdftruncate
usr/X11R6/bin/beforelight
usr/X11R6/bin/bitmap
usr/X11R6/bin/bmtoa
@@ -483,6 +484,7 @@
usr/X11R6/bin/sxpm
usr/X11R6/bin/texteroids
usr/X11R6/bin/twm
+usr/X11R6/bin/ucs2any
usr/X11R6/bin/uxterm
usr/X11R6/bin/viewres
usr/X11R6/bin/x11perf
@@ -1643,6 +1645,7 @@
usr/X11R6/man/man1/appres.1x
usr/X11R6/man/man1/atobm.1x
usr/X11R6/man/man1/bdftopcf.1x
+usr/X11R6/man/man1/bdftruncate.1x
usr/X11R6/man/man1/beforelight.1x
usr/X11R6/man/man1/bitmap.1x
usr/X11R6/man/man1/bmtoa.1x
@@ -1695,6 +1698,7 @@
usr/X11R6/man/man1/sxpm.1x
usr/X11R6/man/man1/texteroids.1x
usr/X11R6/man/man1/twm.1x
+usr/X11R6/man/man1/ucs2any.1x
usr/X11R6/man/man1/uxterm.1x
usr/X11R6/man/man1/viewres.1x
usr/X11R6/man/man1/x11perf.1x
Modified: people/fabbione/trunk/debian/MANIFEST.mipsel.in
===================================================================
--- people/fabbione/trunk/debian/MANIFEST.mipsel.in 2004-07-12 16:20:10 UTC
(rev 1627)
+++ people/fabbione/trunk/debian/MANIFEST.mipsel.in 2004-07-12 16:22:48 UTC
(rev 1628)
@@ -428,6 +428,7 @@
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
usr/X11R6/bin/bdftopcf
+usr/X11R6/bin/bdftruncate
usr/X11R6/bin/beforelight
usr/X11R6/bin/bitmap
usr/X11R6/bin/bmtoa
@@ -483,6 +484,7 @@
usr/X11R6/bin/sxpm
usr/X11R6/bin/texteroids
usr/X11R6/bin/twm
+usr/X11R6/bin/ucs2any
usr/X11R6/bin/uxterm
usr/X11R6/bin/viewres
usr/X11R6/bin/x11perf
@@ -1643,6 +1645,7 @@
usr/X11R6/man/man1/appres.1x
usr/X11R6/man/man1/atobm.1x
usr/X11R6/man/man1/bdftopcf.1x
+usr/X11R6/man/man1/bdftruncate.1x
usr/X11R6/man/man1/beforelight.1x
usr/X11R6/man/man1/bitmap.1x
usr/X11R6/man/man1/bmtoa.1x
@@ -1695,6 +1698,7 @@
usr/X11R6/man/man1/sxpm.1x
usr/X11R6/man/man1/texteroids.1x
usr/X11R6/man/man1/twm.1x
+usr/X11R6/man/man1/ucs2any.1x
usr/X11R6/man/man1/uxterm.1x
usr/X11R6/man/man1/viewres.1x
usr/X11R6/man/man1/x11perf.1x
Modified: people/fabbione/trunk/debian/MANIFEST.powerpc.in
===================================================================
--- people/fabbione/trunk/debian/MANIFEST.powerpc.in 2004-07-12 16:20:10 UTC
(rev 1627)
+++ people/fabbione/trunk/debian/MANIFEST.powerpc.in 2004-07-12 16:22:48 UTC
(rev 1628)
@@ -428,6 +428,7 @@
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
usr/X11R6/bin/bdftopcf
+usr/X11R6/bin/bdftruncate
usr/X11R6/bin/beforelight
usr/X11R6/bin/bitmap
usr/X11R6/bin/bmtoa
@@ -483,6 +484,7 @@
usr/X11R6/bin/sxpm
usr/X11R6/bin/texteroids
usr/X11R6/bin/twm
+usr/X11R6/bin/ucs2any
usr/X11R6/bin/uxterm
usr/X11R6/bin/viewres
usr/X11R6/bin/x11perf
@@ -1758,6 +1760,7 @@
usr/X11R6/man/man1/appres.1x
usr/X11R6/man/man1/atobm.1x
usr/X11R6/man/man1/bdftopcf.1x
+usr/X11R6/man/man1/bdftruncate.1x
usr/X11R6/man/man1/beforelight.1x
usr/X11R6/man/man1/bitmap.1x
usr/X11R6/man/man1/bmtoa.1x
@@ -1810,6 +1813,7 @@
usr/X11R6/man/man1/sxpm.1x
usr/X11R6/man/man1/texteroids.1x
usr/X11R6/man/man1/twm.1x
+usr/X11R6/man/man1/ucs2any.1x
usr/X11R6/man/man1/uxterm.1x
usr/X11R6/man/man1/viewres.1x
usr/X11R6/man/man1/x11perf.1x
Modified: people/fabbione/trunk/debian/MANIFEST.s390.in
===================================================================
--- people/fabbione/trunk/debian/MANIFEST.s390.in 2004-07-12 16:20:10 UTC
(rev 1627)
+++ people/fabbione/trunk/debian/MANIFEST.s390.in 2004-07-12 16:22:48 UTC
(rev 1628)
@@ -421,6 +421,7 @@
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
usr/X11R6/bin/bdftopcf
+usr/X11R6/bin/bdftruncate
usr/X11R6/bin/beforelight
usr/X11R6/bin/bitmap
usr/X11R6/bin/bmtoa
@@ -471,6 +472,7 @@
usr/X11R6/bin/sxpm
usr/X11R6/bin/texteroids
usr/X11R6/bin/twm
+usr/X11R6/bin/ucs2any
usr/X11R6/bin/uxterm
usr/X11R6/bin/viewres
usr/X11R6/bin/x11perf
@@ -1569,6 +1571,7 @@
usr/X11R6/man/man1/appres.1x
usr/X11R6/man/man1/atobm.1x
usr/X11R6/man/man1/bdftopcf.1x
+usr/X11R6/man/man1/bdftruncate.1x
usr/X11R6/man/man1/beforelight.1x
usr/X11R6/man/man1/bitmap.1x
usr/X11R6/man/man1/bmtoa.1x
@@ -1618,6 +1621,7 @@
usr/X11R6/man/man1/sxpm.1x
usr/X11R6/man/man1/texteroids.1x
usr/X11R6/man/man1/twm.1x
+usr/X11R6/man/man1/ucs2any.1x
usr/X11R6/man/man1/uxterm.1x
usr/X11R6/man/man1/viewres.1x
usr/X11R6/man/man1/x11perf.1x
Modified: people/fabbione/trunk/debian/MANIFEST.sparc.in
===================================================================
--- people/fabbione/trunk/debian/MANIFEST.sparc.in 2004-07-12 16:20:10 UTC
(rev 1627)
+++ people/fabbione/trunk/debian/MANIFEST.sparc.in 2004-07-12 16:22:48 UTC
(rev 1628)
@@ -428,6 +428,7 @@
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
usr/X11R6/bin/bdftopcf
+usr/X11R6/bin/bdftruncate
usr/X11R6/bin/beforelight
usr/X11R6/bin/bitmap
usr/X11R6/bin/bmtoa
@@ -483,6 +484,7 @@
usr/X11R6/bin/sxpm
usr/X11R6/bin/texteroids
usr/X11R6/bin/twm
+usr/X11R6/bin/ucs2any
usr/X11R6/bin/uxterm
usr/X11R6/bin/viewres
usr/X11R6/bin/x11perf
@@ -1770,6 +1772,7 @@
usr/X11R6/man/man1/appres.1x
usr/X11R6/man/man1/atobm.1x
usr/X11R6/man/man1/bdftopcf.1x
+usr/X11R6/man/man1/bdftruncate.1x
usr/X11R6/man/man1/beforelight.1x
usr/X11R6/man/man1/bitmap.1x
usr/X11R6/man/man1/bmtoa.1x
@@ -1822,6 +1825,7 @@
usr/X11R6/man/man1/sxpm.1x
usr/X11R6/man/man1/texteroids.1x
usr/X11R6/man/man1/twm.1x
+usr/X11R6/man/man1/ucs2any.1x
usr/X11R6/man/man1/uxterm.1x
usr/X11R6/man/man1/viewres.1x
usr/X11R6/man/man1/x11perf.1x
Modified: people/fabbione/trunk/debian/rules
===================================================================
--- people/fabbione/trunk/debian/rules 2004-07-12 16:20:10 UTC (rev 1627)
+++ people/fabbione/trunk/debian/rules 2004-07-12 16:22:48 UTC (rev 1628)
@@ -137,7 +137,7 @@
dh_testdir
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
perl $(SCRIPT_DIR)/dbs_split clean
- rm -rf imports debian/local/xlibmesa-drm-source/modules
debian/build-fonts
+ rm -rf imports debian/local/xlibmesa-drm-source/modules debian/build-all
dh_clean debian/local/xserver-wrapper debian/local/xterm.faq.text.gz \
debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new
debian/shlibs.local
@@ -205,8 +205,8 @@
$(STAMP_DIR)/stamp-build: $(STAMP_DIR)/patch-audit $(STAMP_DIR)/genscripts
dh_testdir
# check if we need to build fonts
- if [ ! -e debian/build-fonts ]; then \
- mv -f $(SOURCE_TREE)/fonts/Imakefile
$(SOURCE_TREE)/fonts/Imakefile.removed; \
+ if [ ! -e debian/build-all ]; then \
+ mv -f $(SOURCE_TREE)/fonts/Imakefile
$(SOURCE_TREE)/fonts/Imakefile.removed; \
fi
# Symlink some of the libraries on which we build-depend into
# imports/{lib,include} so we don't have to pull in -L/usr/include and
@@ -240,13 +240,14 @@
ifndef NOT_BUILDING_XFREE86_X_SERVER
$(MAKE) -C $(SOURCE_TREE)-xserver-xfree86-dbg WORLDOPTS=""
IMAKE_DEFINES="$(SERVERDEBUG_IMAKE_DEFINES)" World
endif
+ if [ ! -e debian/build-all ]; then \
+ cd $(SOURCE_TREE)/fonts/util && \
+ ../../config/imake/imake -I../../config/cf && \
+ $(MAKE) IMAKE_DEFINES="$(IMAKE_DEFINES)"; \
+ fi
else
# skipping build rule because test_rules was defined
endif
- # put back the Imakefile
- if [ ! -e debian/build-fonts ]; then \
- mv -f $(SOURCE_TREE)/fonts/Imakefile.removed
$(SOURCE_TREE)/fonts/Imakefile; \
- fi
touch $@
# At present we don't support invoking the build in different ways based on
@@ -259,11 +260,11 @@
# do nothing. build-indep and build-arch will be called by binary-*
targets.
# Policy allows us to do so.
-build-fonts:
- touch debian/build-fonts
+build-all:
+ touch debian/build-all
build-arch: real-build
-build-indep: build-fonts real-build
+build-indep: build-all real-build
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE
install-server RULE BELOW
install: $(STAMP_DIR)/install
@@ -281,6 +282,12 @@
install -m 755 debian/local/update-fonts-$$FOO
$(DEBTREEDIR)/usr/sbin; \
install -m 644 debian/local/update-fonts-$$FOO.8
$(DEBTREEDIR)/usr/share/man/man8; \
done
+ if [ ! -e debian/build-all ]; then \
+ install -m 755 $(SOURCE_TREE)/fonts/util/ucs2any.pl
$(DEBTREEDIR)/usr/X11R6/bin/ucs2any && \
+ install -m 644 $(SOURCE_TREE)/fonts/util/ucs2any._man
$(DEBTREEDIR)/usr/X11R6/man/man1/ucs2any.1x && \
+ install -m 755 $(SOURCE_TREE)/fonts/util/bdftruncate.pl
$(DEBTREEDIR)/usr/X11R6/bin/bdftruncate && \
+ install -m 644 $(SOURCE_TREE)/fonts/util/bdftruncate._man
$(DEBTREEDIR)/usr/X11R6/man/man1/bdftruncate.1x; \
+ fi
ifdef NOT_BUILDING_XFREE86_X_SERVER
# these files need to be installed with the upstream Imakefiles
install -m 644 $(SOURCE_TREE)/programs/Xserver/hw/xfree86/doc/README \
@@ -336,7 +343,7 @@
# compare manifests
(cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-) >
debian/MANIFEST.$(ARCH).new
# create proper MANIFEST from our well known sources
- if [ ! -e debian/build-fonts ]; then \
+ if [ ! -e debian/build-all ]; then \
cp debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH); \
$(ELSE) \
cat debian/MANIFEST.$(ARCH).in debian/MANIFEST.all | sort >
debian/MANIFEST.$(ARCH); \
