xserver: Branch 'server-1.3-branch' - 2 commits

[Daniel Stone]

On Sat, Mar 03, 2007 at 09:54:44PM -0800, Drew Parsons wrote:
> diff-tree aeabf2a1f873f884b8a8c33b1517c3f3cab4c7f5 (from ee3000f97d7561b2137e247495468a17e6e3b4c3)
> Author: Drew Parsons <drew at pug.localdomain>
> Date:   Sun Mar 4 16:28:54 2007 +1100
> 
>     Xprint: fix font symlinks
>     
>     Change symlinks to Xprint base fonts in model/PSdefault using local
>     relative links.  This facilitates moving the Xprint config files, for
>     instance for FHS compliance placing data files in /usr/share rather
>     than /usr/lib.  Also ensures NewCenturySchlbk-BoldItalic.pmf is
>     installed.

Please make commits to master in the future and then place on
http://xorg.freedesktop.org/wiki/Server13Branch for merge consideration:
at the moment, this merge will simply get lost when we move to 1.4, and
we try to avoid instamerges whereever possible.

> diff --git a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
> index e7ddb6c..1e8c8a7 100644
> --- a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
> +++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
> @@ -18,6 +18,7 @@ dist_xpc_DATA =				\
>  	LubalinGraph-DemiOblique.pmf	\
>  	LubalinGraph-Demi.pmf		\
>  	NewCenturySchlbk-Bold.pmf	\
> +	NewCenturySchlbk-BoldItalic.pmf \
>  	NewCenturySchlbk-Italic.pmf	\
>  	NewCenturySchlbk-Roman.pmf	\
>  	Souvenir-DemiItalic.pmf		\

Please also look at the rationale for the original commit before
reverting.

commit 24051ef97406f28c102cf46a78223400b61fdae2
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Sun Jul 30 12:15:33 2006 +0300

    remove filename that's too long for tar

i.e., this change breaks distcheck.

Cheers,
Daniel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg/attachments/20070304/c1dd9156/attachment.pgp>