Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.547.2.10 diff -u -2 -0 -r1.547.2.10 ChangeLog --- xc/ChangeLog 3 Dec 2004 13:36:21 -0000 1.547.2.10 +++ xc/ChangeLog 3 Dec 2004 23:08:22 -0000 @@ -1,21 +1,30 @@ 2004-12-03 Roland Mainz + * xc/config/cf/host.def + * xc/config/cf/xprint_host.def + * xc/packager/tarball/Imakefile + Bugzilla #1923 (https://bugs.freedesktop.org/show_bug.cgi?id=1923): + Testing standalone package system for Xprint server, part 10: + Solaris package fixes to find the encoding mapping files + in the correct location (basically a fallout from bug 2002). + +2004-12-03 Roland Mainz * xc/config/cf/xprint_host.def * xc/packager/solaris/GISWxprint/README * xc/packager/solaris/GISWxprint/pkginfo * xc/packager/solaris/GISWxprintglue/README * xc/packager/solaris/GISWxprintglue/pkginfo Bugzilla #1923 (https://bugs.freedesktop.org/show_bug.cgi?id=1923): Testing standalone package system for Xprint server, part 9: Solaris packaging adjustments and README updates. 2004-12-02 Roland Mainz * xc/config/cf/X11.tmpl * xc/lib/font/fontfile/Imakefile Bugzilla #2002 (https://freedesktop.org/bugzilla/show_bug.cgi?id=2002): Make location of the encodings/ files configurable in the build system via adding a new |FontEncDir|-symbol to xc/config/cf/X11.tmpl (default value is |$(LIBDIR)/fonts/encodings|). 2004-12-02 Roland Mainz * xc/config/cf/xprint_host.def * xc/packager/tarball/startxprint.sh Index: xc/config/cf/host.def =================================================================== RCS file: /cvs/xorg/xc/config/cf/Attic/host.def,v retrieving revision 1.5.2.1 diff -u -2 -0 -r1.5.2.1 host.def --- xc/config/cf/host.def 26 Nov 2004 03:29:50 -0000 1.5.2.1 +++ xc/config/cf/host.def 3 Dec 2004 23:08:24 -0000 @@ -1,4 +1,6 @@ +#define BuildGISWxprint YES + /* lame hack, in theory the build script should symlink the file :-) */ #include "xprint_host.def" Index: xc/config/cf/xprint_host.def =================================================================== RCS file: /cvs/xorg/xc/config/cf/xprint_host.def,v retrieving revision 1.1.2.4 diff -u -2 -0 -r1.1.2.4 xprint_host.def --- xc/config/cf/xprint_host.def 3 Dec 2004 13:36:21 -0000 1.1.2.4 +++ xc/config/cf/xprint_host.def 3 Dec 2004 23:08:25 -0000 @@ -284,28 +284,24 @@ #define InstallXF86EncodingFiles NO /* Debian Xprint package puts the Xprt config files elsewhere */ #if (LinuxDistribution == LinuxDebian) # define XPrintDir /usr/share/Xprint/xserver #endif #endif /* Do not strip binaries to ensure usefull stacktraces in bug reports * (http://xprint.mozdev.org/bugs/show_bug.cgi?id=2264) */ #define StripInstalledPrograms NO /* Does the X11 installation have the Xfree86 encoding files ? */ #ifndef InstallXF86EncodingFiles #define InstallXF86EncodingFiles YES #endif /* InstallXF86EncodingFiles */ INSTALLXF86ENCODINGFILES = InstallXF86EncodingFiles -#ifndef XF86EncodingsPath -#define XF86EncodingsPath $(FONTDIR)/encodings -#endif /* XF86EncodingsPath * - /* ######################################################################### * ################ xprint.mozdev.org defaults end ################ * ######################################################################### */ Index: xc/packager/tarball/Imakefile =================================================================== RCS file: /cvs/xorg/xc/packager/tarball/Attic/Imakefile,v retrieving revision 1.1.4.1 diff -u -2 -0 -r1.1.4.1 Imakefile --- xc/packager/tarball/Imakefile 26 Nov 2004 03:29:51 -0000 1.1.4.1 +++ xc/packager/tarball/Imakefile 3 Dec 2004 23:08:47 -0000 @@ -1,15 +1,12 @@ XCOMM $Xorg: Imakefile,v 1.1 2003/02/10 19:54:53 gisburn Exp $ #if InstallXF86EncodingFiles INSTALLXF86ENCODINGFILES=1 #else INSTALLXF86ENCODINGFILES=0 #endif /* InstallXF86EncodingFiles */ -FONT_ENCODINGS_PATH = XF86EncodingsPath -FONT_ENCODINGS_DIRECTORY = $(FONT_ENCODINGS_PATH)/encodings.dir - make_xprint_tarball:: - XPRINTDIR=$(XPRINTDIR) XBINDIR=$(BINDIR) XTOP=$(TOP) XMANPATH=$(MANPATH) XFONTENCPATH=$(FONT_ENCODINGS_PATH) XINSTALLXF86ENCODINGFILES=$(INSTALLXF86ENCODINGFILES) ; \ + XPRINTDIR=$(XPRINTDIR) XBINDIR=$(BINDIR) XTOP=$(TOP) XMANPATH=$(MANPATH) XFONTENCPATH=$(ENCODINGSDIR) XINSTALLXF86ENCODINGFILES=$(INSTALLXF86ENCODINGFILES) ; \ export XPRINTDIR XBINDIR XTOP XMANPATH XFONTENCPATH XINSTALLXF86ENCODINGFILES ; \ $(SHELL) make_xprint_binary_tarball.sh