6750121 Update xscope to open source version
authorStuart Kreitman <Stuart.Kreitman@Sun.COM>
Thu, 18 Sep 2008 17:57:55 -0700
changeset 539 d95b1caa9271
parent 538 599d40650a72
child 540 e6eebb6fa0a9
6750121 Update xscope to open source version
open-src/app/Makefile
open-src/app/xscope/COPYING
open-src/app/xscope/Makefile
packages/SUNWxwdem/copyright.add
packages/SUNWxwdem/prototype
packages/SUNWxwman/copyright.add
packages/SUNWxwman/prototype_com
--- a/open-src/app/Makefile	Wed Sep 17 10:55:07 2008 -0700
+++ b/open-src/app/Makefile	Thu Sep 18 17:57:55 2008 -0700
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.77	08/09/16
+# @(#)Makefile	1.78	08/09/18
 #
 ###############################################################################
 
@@ -112,6 +112,7 @@
 	xrdb \
 	xrefresh \
 	xrx \
+	xscope \
 	xset \
 	xsetroot \
 	xstdcmap \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xscope/COPYING	Thu Sep 18 17:57:55 2008 -0700
@@ -0,0 +1,95 @@
+
+/* **********************************************
+ *						*
+ * header file file descriptor (FD) code        *
+ *						*
+ *	James Peterson, 1987			*
+ * Copyright (C) 1987 MCC
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of MCC not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  MCC makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * MCC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL MCC BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *						*
+ *						*
+ * Copyright 2002 Sun Microsystems, Inc.  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"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ *
+ ********************************************** */
+
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xscope/Makefile	Thu Sep 18 17:57:55 2008 -0700
@@ -0,0 +1,49 @@
+###############################################################################
+#
+# xscope 1.x Makefile
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+#
+
+# Package name used in tarballs
+MODULE_NAME=xscope
+
+# Version number (used in path names)
+MODULE_VERSION=1.1
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = 
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=*.man
+SUN_PACKAGE=SUNWxwdev
+MODULE_STABILITY=Committed
+
+include ../Makefile.inc
--- a/packages/SUNWxwdem/copyright.add	Wed Sep 17 10:55:07 2008 -0700
+++ b/packages/SUNWxwdem/copyright.add	Thu Sep 18 17:57:55 2008 -0700
@@ -27,3 +27,9 @@
 
 include app/xmag_multivis/COPYING
 
+--------------------------------------------------------------------
+
+Files from the app/xscope package are covered by the following notice:
+
+include app/xscope/COPYING
+
--- a/packages/SUNWxwdem/prototype	Wed Sep 17 10:55:07 2008 -0700
+++ b/packages/SUNWxwdem/prototype	Thu Sep 18 17:57:55 2008 -0700
@@ -47,7 +47,6 @@
 f none openwin/demo/dpsexec 		0755 root bin
 f none openwin/demo/texteroids		0755 root bin
 f none openwin/demo/xepsf		0755 root bin
-f none openwin/demo/xscope		0755 root bin
 !search       $HOME/openwin/bin
 f none openwin/demo/xieperf		0755 root bin
 
@@ -74,3 +73,7 @@
 # open-src/app/xmag_multivis
 f none X11/bin/xmag_multivis 		0755 root bin
 s none openwin/demo/xmag_multivis=../../X11/bin/xmag_multivis
+
+# open-src/app/xscope
+f none X11/bin/xscope 		0755 root bin
+s none openwin/demo/xscope=../../X11/bin/xscope
--- a/packages/SUNWxwman/copyright.add	Wed Sep 17 10:55:07 2008 -0700
+++ b/packages/SUNWxwman/copyright.add	Thu Sep 18 17:57:55 2008 -0700
@@ -459,3 +459,9 @@
 
 include util/makedepend/COPYING
 
+--------------------------------------------------------------------
+
+Files from the app/xscope package are covered by the following notice:
+
+include app/xscope/COPYING
+
--- a/packages/SUNWxwman/prototype_com	Wed Sep 17 10:55:07 2008 -0700
+++ b/packages/SUNWxwman/prototype_com	Thu Sep 18 17:57:55 2008 -0700
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype_com 35.107     08/09/15 SMI"
+# ident "@(#)prototype_com 35.108     08/09/18 SMI"
 #
 #  X Window System online user man pages
 
@@ -81,7 +81,6 @@
 f none openwin/share/man/man6/dpsexec.6 0444 root bin
 f none openwin/share/man/man6/texteroids.6 0444 root bin
 f none openwin/share/man/man6/xepsf.6 0444 root bin
-f none openwin/share/man/man6/xscope.6 0444 root bin
 
 
 !search            $HOME/man5
@@ -316,6 +315,9 @@
 # open-src/app/xcolor
 f none X11/share/man/man1/xcolor.1 	0444 root bin
 
+# open-src/app/xscope
+f none X11/share/man/man1/xscope.1 	0444 root bin
+
 # open-src/app/xterm
 f none X11/share/man/man1/xterm.1 	0444 root bin
 f none X11/share/man/man1/resize.1 	0444 root bin