libxp: Changes to 'upstream-unstable'
.gitignore | 10 +++++
AUTHORS | 1
COPYING | 78 +++++++++++++++++++++++++++++++------------
ChangeLog | 78 -------------------------------------------
INSTALL | 8 ----
Makefile.am | 12 ++++--
README | 25 +++++++++++++
configure.ac | 37 ++++++++++----------
man/.gitignore | 3 -
man/Makefile.am | 55 ++++++++++++------------------
man/XpCancelDoc.man | 3 -
man/XpCancelJob.man | 3 -
man/XpCancelPage.man | 3 -
man/XpCreateContext.man | 3 -
man/XpDestroyContext.man | 3 -
man/XpEndDoc.man | 3 -
man/XpEndJob.man | 3 -
man/XpEndPage.man | 3 -
man/XpFreePrinterList.man | 3 -
man/XpGetAttributes.man | 3 -
man/XpGetContext.man | 3 -
man/XpGetDocumentData.man | 3 -
man/XpGetImageResolution.man | 3 -
man/XpGetLocaleHinter.man | 3 -
man/XpGetOneAttribute.man | 3 -
man/XpGetPageDimensions.man | 3 -
man/XpGetPdmStartParams.man | 3 -
man/XpGetPrinterList.man | 3 -
man/XpGetScreenOfContext.man | 3 -
man/XpInputSelected.man | 3 -
man/XpPutDocumentData.man | 3 -
man/XpQueryExtension.man | 3 -
man/XpQueryScreens.man | 3 -
man/XpQueryVersion.man | 3 -
man/XpRehashPrinterList.man | 3 -
man/XpSelectInput.man | 3 -
man/XpSetAttributes.man | 3 -
man/XpSetContext.man | 3 -
man/XpSetImageResolution.man | 3 -
man/XpSetLocaleHinter.man | 3 -
man/XpStartDoc.man | 3 -
man/XpStartJob.man | 3 -
man/XpStartPage.man | 3 -
man/libXp.man | 3 -
src/.gitignore | 6 ---
src/Makefile.am | 2 -
src/XpAttr.c | 4 --
src/XpContext.c | 6 +--
src/XpDoc.c | 4 --
src/XpExtUtil.c | 39 +++++++--------------
src/XpExtUtil.h | 14 +++++++
src/XpExtVer.c | 4 --
src/XpGetData.c | 12 +-----
src/XpImageRes.c | 4 --
src/XpInput.c | 4 --
src/XpJob.c | 7 ++-
src/XpLocale.c | 10 +----
src/XpNotifyPdm.c | 6 +--
src/XpPage.c | 4 --
src/XpPageDim.c | 4 --
src/XpPrinter.c | 8 +---
src/XpPutData.c | 4 --
src/XpScreens.c | 4 --
63 files changed, 231 insertions(+), 324 deletions(-)
New commits:
commit 78773073a0b5801a72be7a5309a40ddc90d9916e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jan 13 22:09:29 2011 -0800
libXp 1.0.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 707c581..419c935 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
# Initialize Autoconf
-AC_INIT([libXp],[1.0.0],
+AC_INIT([libXp],[1.0.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXp])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit a3ec6397c598ebb9eb61c138efb48be18fc3191c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jan 12 00:06:53 2011 -0800
Remove old INSTALL file stub so we use the one from xorg-macros
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 1ba9998..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-Xp is built with the traditional configure script:
-
- $ ./configure --prefix=/usr/X11R6
-
-This should generate valid Makefiles, then:
-
- $ make
- $ make install
commit 17fcf8be65ae6a300782f6a0758a4cb1061856bf
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jan 12 00:03:04 2011 -0800
This is not a GNU project, so declare it foreign
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 894f074..707c581 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
# Initialize Automake
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
commit 7937866efbf022a37da40ab92eabb6ebc5a36554
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jan 11 23:16:54 2011 -0800
config: Remove unnecessary calls from configure.ac
AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 7e4b0b3..894f074 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,13 +40,10 @@ XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
# Check for X and print proto
PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau printproto)
-AC_SUBST(XPRINT_CFLAGS)
-AC_SUBST(XPRINT_LIBS)
AC_CONFIG_FILES([Makefile
src/Makefile
commit 5240bd2ec1bef2592de75dc6aabdfcc0d3402ec0
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jan 11 23:14:33 2011 -0800
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Regroup AC statements under the Autoconf initialization section.
Regroup AM statements under the Automake initialization section.
Add missing AC_CONFIG_SRCDIR
Replace deprecated arguments to AC_OUTPUT with AC_CONFIG_FILES
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index b0fbc83..7e4b0b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,13 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
-AC_INIT(libXp, 1.0.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXp)
+# Initialize Autoconf
+AC_INIT([libXp],[1.0.0],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXp])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -33,8 +39,6 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AM_CONFIG_HEADER(config.h)
-
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
@@ -44,8 +48,9 @@ PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau printproto)
AC_SUBST(XPRINT_CFLAGS)
AC_SUBST(XPRINT_LIBS)
-AC_OUTPUT([Makefile
- src/Makefile
- man/Makefile
- xp.pc])
+AC_CONFIG_FILES([Makefile
+ src/Makefile
+ man/Makefile
+ xp.pc])
+AC_OUTPUT
commit 5d0f927ae0c580a6c4c3f119576753dc7b547966
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jan 11 23:11:57 2011 -0800
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
The existing statement can now be removed from the configuration file.
Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
Enables silent rule and use platform appropriate version of sed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index cbff9ed..b0fbc83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,10 +27,10 @@ AC_INIT(libXp, 1.0.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros minimum of 1.3 for XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
diff --git a/man/Makefile.am b/man/Makefile.am
index 6ce1990..94c387f 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -66,16 +66,9 @@ CLEANFILES = $(libman_DATA)
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = -e 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/'
-
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(LIB_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
commit b14dc70f4d7d538071b725e3fd453dbfe2b9e0d4
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jan 11 23:09:14 2011 -0800
config: Update to XORG_DEFAULT_OPTIONS from xorg-macros 1.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 6c30bb8..cbff9ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,27 +27,23 @@ AC_INIT(libXp, 1.0.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros minimum of 1.3 for XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
# Check for X and print proto
PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau printproto)
-XPRINT_CFLAGS="$CWARNFLAGS $XPRINT_CFLAGS"
AC_SUBST(XPRINT_CFLAGS)
AC_SUBST(XPRINT_LIBS)
-XORG_CHECK_MALLOC_ZERO
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
AC_OUTPUT([Makefile
src/Makefile
man/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index b109a77..3ca2659 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,7 @@ libXp_la_SOURCES = \
libXp_la_LIBADD = $(XPRINT_LIBS)
-AM_CFLAGS = $(XPRINT_CFLAGS) $(MALLOC_ZERO_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XPRINT_CFLAGS) $(MALLOC_ZERO_CFLAGS)
INCLUDES = -I$(top_srcdir)/include/X11/extensions
commit c6db604b4cb0f3a5f596d78826ac8a95fb0bcc3f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jan 11 23:05:27 2011 -0800
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 74ef108..6c30bb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT(libXp, 1.0.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXp)
AM_INIT_AUTOMAKE([dist-bzip2])
commit b2c7de468c83a2f2856fa67de2d63b2c08075c91
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Nov 21 11:32:33 2010 -0800
Sun's copyrights belong to Oracle now
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/COPYING b/COPYING
index 86fa0f1..bb88558 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
Copyright 1996 Hewlett-Packard Company
Copyright 1996 International Business Machines Corp.
-Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
Copyright 1996 Novell, Inc.
Copyright 1996 Digital Equipment Corp.
Copyright 1996 Fujitsu Limited
diff --git a/man/Makefile.am b/man/Makefile.am
index ff30c01..6ce1990 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
diff --git a/man/XpCancelDoc.man b/man/XpCancelDoc.man
index 3c49476..5540415 100644
--- a/man/XpCancelDoc.man
+++ b/man/XpCancelDoc.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpCancelJob.man b/man/XpCancelJob.man
index b4ac537..6c6df54 100644
--- a/man/XpCancelJob.man
+++ b/man/XpCancelJob.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpCancelPage.man b/man/XpCancelPage.man
index 06b49d3..207f37e 100644
--- a/man/XpCancelPage.man
+++ b/man/XpCancelPage.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpCreateContext.man b/man/XpCreateContext.man
index 3c29e4f..8c1bb0f 100644
--- a/man/XpCreateContext.man
+++ b/man/XpCreateContext.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpDestroyContext.man b/man/XpDestroyContext.man
index 38b9807..6737fc1 100644
--- a/man/XpDestroyContext.man
+++ b/man/XpDestroyContext.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpEndDoc.man b/man/XpEndDoc.man
index d77c29a..bf7516c 100644
--- a/man/XpEndDoc.man
+++ b/man/XpEndDoc.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpEndJob.man b/man/XpEndJob.man
index 474aa80..5d18f3b 100644
--- a/man/XpEndJob.man
+++ b/man/XpEndJob.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpEndPage.man b/man/XpEndPage.man
index 84a1bc1..4b144f2 100644
--- a/man/XpEndPage.man
+++ b/man/XpEndPage.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpFreePrinterList.man b/man/XpFreePrinterList.man
index ac2377b..40a731b 100644
--- a/man/XpFreePrinterList.man
+++ b/man/XpFreePrinterList.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpGetAttributes.man b/man/XpGetAttributes.man
index 8168b37..c813469 100644
--- a/man/XpGetAttributes.man
+++ b/man/XpGetAttributes.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpGetContext.man b/man/XpGetContext.man
index 23ab60a..98fd481 100644
--- a/man/XpGetContext.man
+++ b/man/XpGetContext.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpGetDocumentData.man b/man/XpGetDocumentData.man
index 018c28a..3179dd5 100644
--- a/man/XpGetDocumentData.man
+++ b/man/XpGetDocumentData.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpGetImageResolution.man b/man/XpGetImageResolution.man
index 006da0e..da100f2 100644
--- a/man/XpGetImageResolution.man
+++ b/man/XpGetImageResolution.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpGetLocaleHinter.man b/man/XpGetLocaleHinter.man
index 76cb2e8..d4fbf4e 100644
--- a/man/XpGetLocaleHinter.man
+++ b/man/XpGetLocaleHinter.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpGetOneAttribute.man b/man/XpGetOneAttribute.man
index 59cae9c..5fc107f 100644
--- a/man/XpGetOneAttribute.man
+++ b/man/XpGetOneAttribute.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpGetPageDimensions.man b/man/XpGetPageDimensions.man
index 1d42534..49d8e04 100644
--- a/man/XpGetPageDimensions.man
+++ b/man/XpGetPageDimensions.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpGetPdmStartParams.man b/man/XpGetPdmStartParams.man
index 9427204..e5c46c5 100644
--- a/man/XpGetPdmStartParams.man
+++ b/man/XpGetPdmStartParams.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpGetPrinterList.man b/man/XpGetPrinterList.man
index 301a600..1e9b747 100644
--- a/man/XpGetPrinterList.man
+++ b/man/XpGetPrinterList.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpGetScreenOfContext.man b/man/XpGetScreenOfContext.man
index 7a49d02..32d9ffc 100644
--- a/man/XpGetScreenOfContext.man
+++ b/man/XpGetScreenOfContext.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpInputSelected.man b/man/XpInputSelected.man
index f672b95..e2d9c7a 100644
--- a/man/XpInputSelected.man
+++ b/man/XpInputSelected.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpPutDocumentData.man b/man/XpPutDocumentData.man
index 93b01f1..b072de3 100644
--- a/man/XpPutDocumentData.man
+++ b/man/XpPutDocumentData.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpQueryExtension.man b/man/XpQueryExtension.man
index c8b5b9e..b3d4a03 100644
--- a/man/XpQueryExtension.man
+++ b/man/XpQueryExtension.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpQueryScreens.man b/man/XpQueryScreens.man
index b9a066e..bdd188f 100644
--- a/man/XpQueryScreens.man
+++ b/man/XpQueryScreens.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpQueryVersion.man b/man/XpQueryVersion.man
index d1acbe9..9914bf0 100644
--- a/man/XpQueryVersion.man
+++ b/man/XpQueryVersion.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpRehashPrinterList.man b/man/XpRehashPrinterList.man
index 7f99277..ad4898f 100644
--- a/man/XpRehashPrinterList.man
+++ b/man/XpRehashPrinterList.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpSelectInput.man b/man/XpSelectInput.man
index 4c4b34f..4f443c5 100644
--- a/man/XpSelectInput.man
+++ b/man/XpSelectInput.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpSetAttributes.man b/man/XpSetAttributes.man
index cef8ed8..67e7c8c 100644
--- a/man/XpSetAttributes.man
+++ b/man/XpSetAttributes.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpSetContext.man b/man/XpSetContext.man
index 4b6d21d..a0bb9bf 100644
--- a/man/XpSetContext.man
+++ b/man/XpSetContext.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpSetImageResolution.man b/man/XpSetImageResolution.man
index 35a78ce..23e79c4 100644
--- a/man/XpSetImageResolution.man
+++ b/man/XpSetImageResolution.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpSetLocaleHinter.man b/man/XpSetLocaleHinter.man
index e755b07..b57002d 100644
--- a/man/XpSetLocaleHinter.man
+++ b/man/XpSetLocaleHinter.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpStartDoc.man b/man/XpStartDoc.man
index 6ab7814..a78115f 100644
--- a/man/XpStartDoc.man
+++ b/man/XpStartDoc.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpStartJob.man b/man/XpStartJob.man
index 2121693..1fb1fc5 100644
--- a/man/XpStartJob.man
+++ b/man/XpStartJob.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/XpStartPage.man b/man/XpStartPage.man
index 90f8c50..058a6d3 100644
--- a/man/XpStartPage.man
+++ b/man/XpStartPage.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/man/libXp.man b/man/libXp.man
index a60aa15..7a1cbf6 100644
--- a/man/libXp.man
+++ b/man/libXp.man
@@ -1,7 +1,7 @@
.\"
.\" Copyright 1996 Hewlett-Packard Company
.\" Copyright 1996 International Business Machines Corp.
-.\" Copyright 1996, 1999, 2004 Sun Microsystems, Inc.
+.\" Copyright 1996, 1999, 2004, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 1996 Novell, Inc.
.\" Copyright 1996 Digital Equipment Corp.
.\" Copyright 1996 Fujitsu Limited
diff --git a/src/XpAttr.c b/src/XpAttr.c
index 1b6ed63..e8b85ac 100644
--- a/src/XpAttr.c
+++ b/src/XpAttr.c
@@ -3,7 +3,7 @@
**
** (c) Copyright 1996 Hewlett-Packard Company
** (c) Copyright 1996 International Business Machines Corp.
- ** (c) Copyright 1996 Sun Microsystems, Inc.
+ ** (c) Copyright 1996, Oracle and/or its affiliates. All rights reserved.
** (c) Copyright 1996 Novell, Inc.
** (c) Copyright 1996 Digital Equipment Corp.
** (c) Copyright 1996 Fujitsu Limited
diff --git a/src/XpContext.c b/src/XpContext.c
index a326274..5b1e4f9 100644
--- a/src/XpContext.c
+++ b/src/XpContext.c
@@ -3,7 +3,7 @@
**
** (c) Copyright 1996 Hewlett-Packard Company
** (c) Copyright 1996 International Business Machines Corp.
- ** (c) Copyright 1996 Sun Microsystems, Inc.
+ ** (c) Copyright 1996, Oracle and/or its affiliates. All rights reserved.
** (c) Copyright 1996 Novell, Inc.
** (c) Copyright 1996 Digital Equipment Corp.
** (c) Copyright 1996 Fujitsu Limited
diff --git a/src/XpDoc.c b/src/XpDoc.c
index e5d9a30..e7e9660 100644
--- a/src/XpDoc.c
+++ b/src/XpDoc.c
@@ -3,7 +3,7 @@
**
** (c) Copyright 1996 Hewlett-Packard Company
** (c) Copyright 1996 International Business Machines Corp.
- ** (c) Copyright 1996 Sun Microsystems, Inc.
+ ** (c) Copyright 1996, Oracle and/or its affiliates. All rights reserved.
** (c) Copyright 1996 Novell, Inc.
** (c) Copyright 1996 Digital Equipment Corp.
** (c) Copyright 1996 Fujitsu Limited
diff --git a/src/XpExtUtil.c b/src/XpExtUtil.c
index 4e9f2e6..4fcf42b 100644
--- a/src/XpExtUtil.c
+++ b/src/XpExtUtil.c
@@ -3,7 +3,7 @@
**
** (c) Copyright 1996 Hewlett-Packard Company
** (c) Copyright 1996 International Business Machines Corp.
- ** (c) Copyright 1996 Sun Microsystems, Inc.
+ ** (c) Copyright 1996, Oracle and/or its affiliates. All rights reserved.
** (c) Copyright 1996 Novell, Inc.
** (c) Copyright 1996 Digital Equipment Corp.
** (c) Copyright 1996 Fujitsu Limited
diff --git a/src/XpExtVer.c b/src/XpExtVer.c
index 72e0ccc..d6fcbd0 100644
--- a/src/XpExtVer.c
+++ b/src/XpExtVer.c
@@ -3,7 +3,7 @@
**
** (c) Copyright 1996 Hewlett-Packard Company
** (c) Copyright 1996 International Business Machines Corp.
- ** (c) Copyright 1996 Sun Microsystems, Inc.
+ ** (c) Copyright 1996, Oracle and/or its affiliates. All rights reserved.
** (c) Copyright 1996 Novell, Inc.
** (c) Copyright 1996 Digital Equipment Corp.
** (c) Copyright 1996 Fujitsu Limited
diff --git a/src/XpGetData.c b/src/XpGetData.c
index e5af3d9..8696120 100644
--- a/src/XpGetData.c
+++ b/src/XpGetData.c
@@ -3,7 +3,7 @@
**
** (c) Copyright 1996 Hewlett-Packard Company
** (c) Copyright 1996 International Business Machines Corp.
- ** (c) Copyright 1996 Sun Microsystems, Inc.
+ ** (c) Copyright 1996, Oracle and/or its affiliates. All rights reserved.
** (c) Copyright 1996 Novell, Inc.
** (c) Copyright 1996 Digital Equipment Corp.
** (c) Copyright 1996 Fujitsu Limited
diff --git a/src/XpImageRes.c b/src/XpImageRes.c
index 1c37961..8e227bc 100644
--- a/src/XpImageRes.c
+++ b/src/XpImageRes.c
@@ -3,7 +3,7 @@
**
** (c) Copyright 1996 Hewlett-Packard Company
** (c) Copyright 1996 International Business Machines Corp.
- ** (c) Copyright 1996 Sun Microsystems, Inc.
+ ** (c) Copyright 1996, Oracle and/or its affiliates. All rights reserved.
** (c) Copyright 1996 Novell, Inc.
** (c) Copyright 1996 Digital Equipment Corp.
** (c) Copyright 1996 Fujitsu Limited
diff --git a/src/XpInput.c b/src/XpInput.c
index 05d6f1f..d6dd2bd 100644
--- a/src/XpInput.c
+++ b/src/XpInput.c
@@ -3,7 +3,7 @@
**
** (c) Copyright 1996 Hewlett-Packard Company
** (c) Copyright 1996 International Business Machines Corp.
- ** (c) Copyright 1996 Sun Microsystems, Inc.
+ ** (c) Copyright 1996, Oracle and/or its affiliates. All rights reserved.
** (c) Copyright 1996 Novell, Inc.
** (c) Copyright 1996 Digital Equipment Corp.
** (c) Copyright 1996 Fujitsu Limited
diff --git a/src/XpJob.c b/src/XpJob.c
index dee2f85..b705c73 100644
--- a/src/XpJob.c
+++ b/src/XpJob.c
@@ -3,7 +3,7 @@
**
** (c) Copyright 1996 Hewlett-Packard Company
** (c) Copyright 1996 International Business Machines Corp.
- ** (c) Copyright 1996 Sun Microsystems, Inc.
+ ** (c) Copyright 1996, Oracle and/or its affiliates. All rights reserved.
** (c) Copyright 1996 Novell, Inc.
** (c) Copyright 1996 Digital Equipment Corp.
** (c) Copyright 1996 Fujitsu Limited
diff --git a/src/XpLocale.c b/src/XpLocale.c
index 9819d50..9b71363 100644
--- a/src/XpLocale.c
+++ b/src/XpLocale.c
@@ -3,7 +3,7 @@
**
** (c) Copyright 1996 Hewlett-Packard Company
** (c) Copyright 1996 International Business Machines Corp.
- ** (c) Copyright 1996 Sun Microsystems, Inc.
+ ** (c) Copyright 1996, Oracle and/or its affiliates. All rights reserved.
** (c) Copyright 1996 Novell, Inc.
** (c) Copyright 1996 Digital Equipment Corp.
** (c) Copyright 1996 Fujitsu Limited
diff --git a/src/XpNotifyPdm.c b/src/XpNotifyPdm.c
index fb38bcc..2bef6b4 100644
--- a/src/XpNotifyPdm.c
+++ b/src/XpNotifyPdm.c
@@ -10,7 +10,7 @@
**
** (c) Copyright 1996 Hewlett-Packard Company
** (c) Copyright 1996 International Business Machines Corp.
- ** (c) Copyright 1996 Sun Microsystems, Inc.
+ ** (c) Copyright 1996, Oracle and/or its affiliates. All rights reserved.
** (c) Copyright 1996 Novell, Inc.
** (c) Copyright 1996 Digital Equipment Corp.
** (c) Copyright 1996 Fujitsu Limited
diff --git a/src/XpPage.c b/src/XpPage.c
index d3970e6..1a4b722 100644
--- a/src/XpPage.c
+++ b/src/XpPage.c
@@ -3,7 +3,7 @@
**
** (c) Copyright 1996 Hewlett-Packard Company
** (c) Copyright 1996 International Business Machines Corp.
- ** (c) Copyright 1996 Sun Microsystems, Inc.
+ ** (c) Copyright 1996, Oracle and/or its affiliates. All rights reserved.
** (c) Copyright 1996 Novell, Inc.
** (c) Copyright 1996 Digital Equipment Corp.
** (c) Copyright 1996 Fujitsu Limited
diff --git a/src/XpPageDim.c b/src/XpPageDim.c
index cb18b4a..85c321c 100644
--- a/src/XpPageDim.c
+++ b/src/XpPageDim.c
Reply to: