xorg-server: Changes to 'upstream-experimental'
hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am | 2 +-
hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am | 2 +-
hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am | 1 +
hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit aeabf2a1f873f884b8a8c33b1517c3f3cab4c7f5
Author: Drew Parsons <drew@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.
diff --git a/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am b/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
index 5be5419..c574c5c 100644
--- a/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
@@ -1,6 +1,6 @@
xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS/fonts
-parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
+parentdir = ../../PSdefault/fonts
XPFONTS = \
AvantGarde-Book.pmf \
diff --git a/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am b/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
index 2ff9ab7..634db1f 100644
--- a/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
@@ -1,6 +1,6 @@
xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS/fonts
-parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
+parentdir = ../../PSdefault/fonts
XPFONTS = \
AvantGarde-Book.pmf \
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 \
diff --git a/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am b/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am
index 8cc2694..d1ee6cf 100644
--- a/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am
@@ -1,6 +1,6 @@
xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts
-parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
+parentdir = ../../PSdefault/fonts
XPFONTS = \
Courier-Bold.pmf \
Reply to: