Module Name: xsrc
Committed By: mrg
Date: Sun Nov 21 02:19:25 UTC 2010
Modified Files:
xsrc/external/mit/mkfontscale/dist: ident.c
Removed Files:
xsrc/external/mit/bdftopcf/dist: NEWS
xsrc/external/mit/beforelight/dist: AUTHORS Beforelight.ad NEWS compile
xsrc/external/mit/bitmap/dist: Bitmap-color.ad Bitmap-nocase.ad
Bitmap.ad NEWS bitmap.icon bitmap.man
xsrc/external/mit/editres/dist: NEWS
xsrc/external/mit/fslsfonts/dist: AUTHORS NEWS
xsrc/external/mit/fstobdf/dist: AUTHORS NEWS
xsrc/external/mit/iceauth/dist: AUTHORS NEWS
xsrc/external/mit/ico/dist: AUTHORS NEWS
xsrc/external/mit/luit/dist: luit.man
xsrc/external/mit/mkfontdir/dist: AUTHORS NEWS
xsrc/external/mit/mkfontscale/dist: AUTHORS NEWS
xsrc/external/mit/oclock/dist: AUTHORS Clock-color.ad NEWS compile
mkinstalldirs
xsrc/external/mit/proxymngr/dist: compile mkinstalldirs
xsrc/external/mit/rgb/dist: NEWS rgb.man showrgb.man
xsrc/external/mit/setxkbmap/dist: AUTHORS NEWS
xsrc/external/mit/smproxy/dist: AUTHORS NEWS
xsrc/external/mit/twm/dist: AUTHORS NEWS
Log Message:
merge cornflakes
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/bdftopcf/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/beforelight/dist/AUTHORS \
xsrc/external/mit/beforelight/dist/Beforelight.ad \
xsrc/external/mit/beforelight/dist/NEWS \
xsrc/external/mit/beforelight/dist/compile
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/bitmap/dist/Bitmap-color.ad \
xsrc/external/mit/bitmap/dist/Bitmap-nocase.ad \
xsrc/external/mit/bitmap/dist/Bitmap.ad \
xsrc/external/mit/bitmap/dist/NEWS \
xsrc/external/mit/bitmap/dist/bitmap.icon
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/bitmap/dist/bitmap.man
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/editres/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/fslsfonts/dist/AUTHORS \
xsrc/external/mit/fslsfonts/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/fstobdf/dist/AUTHORS \
xsrc/external/mit/fstobdf/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/iceauth/dist/AUTHORS \
xsrc/external/mit/iceauth/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/ico/dist/AUTHORS \
xsrc/external/mit/ico/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/luit/dist/luit.man
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/mkfontdir/dist/AUTHORS \
xsrc/external/mit/mkfontdir/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/mkfontscale/dist/AUTHORS \
xsrc/external/mit/mkfontscale/dist/NEWS
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/mkfontscale/dist/ident.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/oclock/dist/AUTHORS \
xsrc/external/mit/oclock/dist/Clock-color.ad \
xsrc/external/mit/oclock/dist/NEWS xsrc/external/mit/oclock/dist/compile \
xsrc/external/mit/oclock/dist/mkinstalldirs
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/proxymngr/dist/compile \
xsrc/external/mit/proxymngr/dist/mkinstalldirs
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/rgb/dist/NEWS \
xsrc/external/mit/rgb/dist/rgb.man xsrc/external/mit/rgb/dist/showrgb.man
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/setxkbmap/dist/AUTHORS \
xsrc/external/mit/setxkbmap/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/smproxy/dist/AUTHORS \
xsrc/external/mit/smproxy/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/twm/dist/AUTHORS \
xsrc/external/mit/twm/dist/NEWS
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/mkfontscale/dist/ident.c
diff -u xsrc/external/mit/mkfontscale/dist/ident.c:1.2 xsrc/external/mit/mkfontscale/dist/ident.c:1.3
--- xsrc/external/mit/mkfontscale/dist/ident.c:1.2 Mon Mar 9 06:24:53 2009
+++ xsrc/external/mit/mkfontscale/dist/ident.c Sun Nov 21 02:19:23 2010
@@ -19,34 +19,28 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+/*
+ * Copyright (c) 2008, 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"), 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.
+ * 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 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.
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * 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.
- */
-/* $XFree86: xc/programs/mkfontscale/ident.c,v 1.3tsi Exp $ */
+ * 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
/* The function identifyBitmap returns -1 if filename is definitively not
a font file, 1 if it is a single-face bitmap font with a XLFD name,
