Re: [PATCH modular 08/15] jhbuild: Reorder and rename font modules sanely
On Sun, Mar 06, 2011 at 09:29:53AM -0800, Dan Nicholson wrote: The font modules seemed to be in a random order and had inconsistent names. adobe-75dpi corresponds to the tarball font-adobe-75dpi, yet fonts-cursor corresponds to the tarball font-cursor-misc. Instead, the tarball names will be used. Signed-off-by: Dan Nicholson dbn.li...@gmail.com --- xorg.modules | 122 +- 1 files changed, 61 insertions(+), 61 deletions(-) Reviewed-by: Dirk Wallenstein hals...@t-online.de -- Greetings, Dirk ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH modular 08/15] jhbuild: Reorder and rename font modules sanely
The font modules seemed to be in a random order and had inconsistent names. adobe-75dpi corresponds to the tarball font-adobe-75dpi, yet fonts-cursor corresponds to the tarball font-cursor-misc. Instead, the tarball names will be used. Signed-off-by: Dan Nicholson dbn.li...@gmail.com --- xorg.modules | 122 +- 1 files changed, 61 insertions(+), 61 deletions(-) diff --git a/xorg.modules b/xorg.modules index 052f044..68cdc1c 100644 --- a/xorg.modules +++ b/xorg.modules @@ -569,7 +569,7 @@ dependencies dep package=macros/ dep package=x11proto/ - dep package=fonts-util/ + dep package=font-util/ /dependencies /autotools @@ -1607,99 +1607,112 @@ /dependencies /autotools - autotools id=bitstream-75dpi -branch module=xorg/font/bitstream-75dpi -checkoutdir=xorg/font/bitstream-75dpi/ + autotools id=font-util +branch module=xorg/font/util +checkoutdir=xorg/font/util/ + /autotools + + autotools id=encodings +branch module=xorg/font/encodings +checkoutdir=xorg/font/encodings/ +dependencies + dep package=mkfontscale/ +/dependencies + /autotools + + autotools id=font-adobe-100dpi +branch module=xorg/font/adobe-100dpi +checkoutdir=xorg/font/adobe-100dpi/ dependencies dep package=bdftopcf/ dep package=mkfontscale/ dep package=mkfontdir/ dep package=fontconfig/ + dep package=font-util/ /dependencies /autotools - autotools id=bitstream-100dpi -branch module=xorg/font/bitstream-100dpi -checkoutdir=xorg/font/bitstream-100dpi/ + autotools id=font-adobe-75dpi +branch module=xorg/font/adobe-75dpi +checkoutdir=xorg/font/adobe-75dpi/ dependencies dep package=bdftopcf/ dep package=mkfontscale/ dep package=mkfontdir/ dep package=fontconfig/ + dep package=font-util/ /dependencies /autotools - autotools id=bitstream-type1 -branch module=xorg/font/bitstream-type1 -checkoutdir=xorg/font/bitstream-type1/ + autotools id=font-adobe-utopia-100dpi +branch module=xorg/font/adobe-utopia-100dpi +checkoutdir=xorg/font/adobe-utopia-100dpi/ dependencies + dep package=bdftopcf/ dep package=mkfontscale/ dep package=mkfontdir/ dep package=fontconfig/ + dep package=font-util/ /dependencies /autotools - autotools id=adobe-75dpi -branch module=xorg/font/adobe-75dpi -checkoutdir=xorg/font/adobe-75dpi/ + autotools id=font-adobe-utopia-75dpi +branch module=xorg/font/adobe-utopia-75dpi +checkoutdir=xorg/font/adobe-utopia-75dpi/ dependencies dep package=bdftopcf/ dep package=mkfontscale/ dep package=mkfontdir/ dep package=fontconfig/ - dep package=fonts-util/ + dep package=font-util/ /dependencies /autotools - autotools id=adobe-100dpi -branch module=xorg/font/adobe-100dpi -checkoutdir=xorg/font/adobe-100dpi/ + autotools id=font-adobe-utopia-type1 +branch module=xorg/font/adobe-utopia-type1 +checkoutdir=xorg/font/adobe-utopia-type1/ dependencies dep package=bdftopcf/ dep package=mkfontscale/ dep package=mkfontdir/ dep package=fontconfig/ - dep package=fonts-util/ + dep package=font-util/ /dependencies /autotools - autotools id=adobe-utopia-75dpi -branch module=xorg/font/adobe-utopia-75dpi -checkoutdir=xorg/font/adobe-utopia-75dpi/ + autotools id=font-bitstream-100dpi +branch module=xorg/font/bitstream-100dpi +checkoutdir=xorg/font/bitstream-100dpi/ dependencies dep package=bdftopcf/ dep package=mkfontscale/ dep package=mkfontdir/ dep package=fontconfig/ - dep package=fonts-util/ /dependencies /autotools - autotools id=adobe-utopia-100dpi -branch module=xorg/font/adobe-utopia-100dpi -checkoutdir=xorg/font/adobe-utopia-100dpi/ + autotools id=font-bitstream-75dpi +branch module=xorg/font/bitstream-75dpi +checkoutdir=xorg/font/bitstream-75dpi/ dependencies dep package=bdftopcf/ dep package=mkfontscale/ dep package=mkfontdir/ dep package=fontconfig/ - dep package=fonts-util/ /dependencies /autotools - autotools id=adobe-utopia-type1 -branch module=xorg/font/adobe-utopia-type1 -checkoutdir=xorg/font/adobe-utopia-type1/ + autotools id=font-bitstream-type1 +branch module=xorg/font/bitstream-type1 +checkoutdir=xorg/font/bitstream-type1/ dependencies - dep package=bdftopcf/ dep package=mkfontscale/ dep package=mkfontdir/ dep package=fontconfig/ - dep package=fonts-util/ /dependencies /autotools - autotools id=fonts-cursor + autotools id=font-cursor-misc
