From 498643624bb0e45cde694c2857b42f7dd56b7fb5 Mon Sep 17 00:00:00 2001 From: matthieu Date: Tue, 11 Sep 2007 11:28:37 +0000 Subject: [PATCH] ico 1.0.2 --- app/ico/COPYING | 69 +++++++++++-- app/ico/ChangeLog | 226 ++++++++++++++++++++++++++++++++++++++----- app/ico/Makefile.am | 12 ++- app/ico/configure.ac | 2 +- app/ico/ico.man | 2 +- 5 files changed, 277 insertions(+), 34 deletions(-) diff --git a/app/ico/COPYING b/app/ico/COPYING index 7f33cbfd2..15697a830 100644 --- a/app/ico/COPYING +++ b/app/ico/COPYING @@ -1,12 +1,65 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright (c) 1987, 1994 X Consortium -Please submit updated COPYING files to the Xorg bugzilla: +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: -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +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 +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -http://lists.freedesktop.org/mailman/listinfo/xorg +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 dealings +in this Software without prior written authorization from the X Consortium. + + +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +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 Digital not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL 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 2005 Red Hat, Inc. + +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 Red Hat not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Red Hat makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL RED HAT 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. diff --git a/app/ico/ChangeLog b/app/ico/ChangeLog index a6236dd8b..afc745f13 100644 --- a/app/ico/ChangeLog +++ b/app/ico/ChangeLog @@ -1,35 +1,217 @@ -2005-12-20 Kevin E. Martin +commit 11308c41fe4c1bf99a6654fca294f3e098075a33 +Author: Alan Coopersmith +Date: Fri Jul 20 16:28:38 2007 -0700 - * configure.ac: - Update package version for X11R7 release. + Version bump: 1.0.2 -2005-12-14 Kevin E. Martin +commit 255c8078a0edfc289e434ba769fd50e05ab72ad2 +Author: Alan Coopersmith +Date: Fri Jul 20 16:17:31 2007 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + Fill in COPYING stub with copyright & licenses from source files -2005-12-06 Kevin E. Martin +commit 5a51d7e1db3694e41d55bc02208f3fa1b736e951 +Author: Alan Coopersmith +Date: Fri Jul 20 16:14:34 2007 -0700 - * Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + Replace static changelog with dist-hook to generate from git log -2005-12-03 Kevin E. Martin +commit e7a16eb488b591af57561799525891be5030bf25 +Author: Alan Coopersmith +Date: Fri Jul 20 16:10:58 2007 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Change ico_CFLAGS to AM_CFLAGS to stop automake-1.10 warning + + Makefile.am:27: compiling `ico.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac' -2005-11-09 Kevin E. Martin +commit e3146e963d7bf333d0e01d9d556d6c8be722898d +Author: Alan Coopersmith +Date: Wed Apr 11 15:37:10 2007 -0700 - * configure.ac: - Update package version number for X11R7 RC2 release. + renamed: .cvsignore -> .gitignore -2005-10-18 Kevin E. Martin +commit db38b36c535baeda5bdc8a873b32f678e7df8e36 +Author: Alan Coopersmith +Date: Wed Apr 11 15:36:16 2007 -0700 - * configure.ac: - Update package version number for RC1 release. + Bug #10616: Man page typo: s/TREMINATION/TERMINATION/ + + X.Org Bugzilla #10616 + Reported upstream from + Debian Bug #395445 -2005-08-17 Adam Jackson +commit 366924f71f6e5db3641bc350a07d37f64fe6ea08 +Author: Kevin E Martin +Date: Wed Dec 21 02:29:42 2005 +0000 - * configure.ac: - * Makefile.am: - Get xthreadlib variable from Xlib. Bump to 0.99.1. + Update package version for X11R7 release. + +commit 82481ae9b8335ae924b4341d194c4f0ed51f1f03 +Author: Adam Jackson +Date: Mon Dec 19 16:22:40 2005 +0000 + + Stub COPYING files + +commit 52ad0990a0f63ef8601c56b3937afba0a511b376 +Author: Kevin E Martin +Date: Thu Dec 15 00:24:02 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 22bef66811d55607c096b0e015fb91e31c3043c6 +Author: Kevin E Martin +Date: Tue Dec 6 22:48:16 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit f8a8eb25e339b5ae58c0bd6b9068338488d3be22 +Author: Kevin E Martin +Date: Sat Dec 3 05:49:16 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 8e79cdd0c53ab420fa3b69003762d2d1ebfa0273 +Author: Alan Coopersmith +Date: Mon Nov 28 22:01:37 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit 3c4e96626a4fcc4df45bced95c44c5e99e605537 +Author: Eric Anholt +Date: Mon Nov 21 10:34:55 2005 +0000 + + Another pass at .cvsignores for apps. + +commit 3cb8504ab547357b6b538e1ffbb3000b5cc0b8e7 +Author: Eric Anholt +Date: Sun Nov 20 22:08:48 2005 +0000 + + Add/improve .cvsignore files for apps. + +commit 02b2de700f25d3be621d560b3042f7a7a89369e6 +Author: Kevin E Martin +Date: Wed Nov 9 21:09:19 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit 703edae088fb7bb409dbdb58d111ed9e4c31cf78 +Author: Kean Johnson +Date: Tue Nov 8 06:33:31 2005 +0000 + + See ChangeLog entry 2005-11-07 for details. + +commit fe9efd5cd0703005da9ceb55f59d376ba0b01226 +Author: Kevin E Martin +Date: Wed Oct 19 02:47:48 2005 +0000 + + Update package version number for RC1 release. + +commit 7ad280349d00bb52201dc43c21ac097ec97132dc +Author: Alan Coopersmith +Date: Mon Oct 17 23:56:19 2005 +0000 + + Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to + work better with BSD make + +commit cd8ac3431f4b2c6a8fad1031bf34d894fb6398ae +Author: Alan Coopersmith +Date: Fri Oct 14 00:25:41 2005 +0000 + + Use sed to fill in variables in man page + +commit a0f44d19aa84965a31303fd39f05631665fd7e37 +Author: Adam Jackson +Date: Wed Aug 17 19:49:17 2005 +0000 + + Get xthreadlib variable from Xlib. Bump to 0.99.1. + +commit 19fd5758771d31d13cc483cf80adafa3bf530132 +Author: Alan Coopersmith +Date: Sat Aug 13 02:13:30 2005 +0000 + + Update for modularization: include & , use + XTHREADS define from XlibConf.h to enable multithreading Also ansify + icoFatal prototype to clear Sun cc warnings. + +commit 979aa90d7b94494ce365b9dc3cf724a3f91f8598 +Author: Alan Coopersmith +Date: Mon Aug 1 20:25:27 2005 +0000 + + Install man pages to section 1 instead of section m (Patch from Donnie + Berkholz) + +commit 25ac536b836c2772784bd13b543d538a2673fb4c +Author: Kevin E Martin +Date: Fri Jul 29 21:22:29 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit 5c31a07dbcb735445951f7f7cae8579ee16262d5 +Author: Adam Jackson +Date: Wed Jul 20 19:31:48 2005 +0000 + + Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global + configure cache, you cache it, and the cached value is probably wrong. + +commit 9e0555e9d980217dd20d1f7385ff47514675629c +Author: Søren Sandmann Pedersen +Date: Tue Jun 28 15:00:13 2005 +0000 + + Check in build system for ico + +commit 6a904d00db84e235ea2b0073fbcd078f8a96c9c2 +Author: Egbert Eich +Date: Fri Apr 23 19:54:33 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit caf6767501c8176c02702e441ab422ced4ea5033 +Author: Egbert Eich +Date: Sun Mar 14 08:34:51 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 81bd81a192d3e6cc4e8ac744d6f9dd844013c3de +Author: Egbert Eich +Date: Wed Mar 3 12:12:52 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 0fe04de86a907b549e143b27ff5c16887ec7de2a +Author: Egbert Eich +Date: Thu Feb 26 13:36:15 2004 +0000 + + readding XFree86's cvs IDs + +commit dcd8f0f0b566a45609145651ae0c6d2cbed6bfc7 +Author: Egbert Eich +Date: Thu Feb 26 09:23:54 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 996d4a49a21986ae0a8d3f4f047aa71422727925 +Author: Kaleb Keithley +Date: Tue Nov 25 19:29:02 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit c3b5b1a77685345b857f858fa3c226ec4a826414 +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:57 2003 +0000 + + XFree86 4.3.0.1 + +commit 352df17fc71405e7bc36559ee8a72e21d7a5694a +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:57 2003 +0000 + + Initial revision diff --git a/app/ico/Makefile.am b/app/ico/Makefile.am index cda69b124..a03cffd95 100644 --- a/app/ico/Makefile.am +++ b/app/ico/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = ico -ico_CFLAGS = $(ICO_CFLAGS) +AM_CFLAGS = $(ICO_CFLAGS) ico_LDADD = $(ICO_LIBS) $(XTHREADLIB) -lm ico_SOURCES = \ @@ -43,8 +43,16 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) +EXTRA_DIST = $(appman_PRE) ChangeLog CLEANFILES = $(appman_DATA) +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog SED = sed diff --git a/app/ico/configure.ac b/app/ico/configure.ac index a56721801..e8a433f58 100644 --- a/app/ico/configure.ac +++ b/app/ico/configure.ac @@ -22,7 +22,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(ico,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],ico) +AC_INIT(ico,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],ico) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE diff --git a/app/ico/ico.man b/app/ico/ico.man index fb5d19b76..07fb57617 100644 --- a/app/ico/ico.man +++ b/app/ico/ico.man @@ -56,7 +56,7 @@ about each object. .B -colors \fIcolor color ...\fP Specify what colors should be used to draw the filled faces of the object. If less colors than faces are given, the colors are reused. -.SH PROGRAM TREMINATION +.SH PROGRAM TERMINATION .LP Pressing "q" will close a window. If compiled with threads support, the program will stop only when all threads terminate. You can also close an