libxkbfile: Changes to 'upstream-unstable'
COPYING | 70 ++++++++++++++++++++++++++++++++++-----
ChangeLog | 105 -----------------------------------------------------------
Makefile.am | 10 +++++
configure.ac | 2 -
4 files changed, 73 insertions(+), 114 deletions(-)
New commits:
commit 415a513387748e1763a477a486a9789f88784ec5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Mar 17 19:44:07 2008 -0700
Version bump: 1.0.5
diff --git a/configure.ac b/configure.ac
index 673bccf..fc8b8c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(libxkbfile, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libxkbfile)
+AC_INIT(libxkbfile, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libxkbfile)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 4505577c4d6b5d32c276366ce6bc3eda1cd59ad7
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:38:53 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 7084416..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,105 +0,0 @@
-2006-04-26 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Bump to 1.0.3
-
-2006-04-12 Daniel Stone <daniel@freedesktop.org>
-
- * src/xkbatom.c:
- * src/xkbout.c:
- Fix offline operation.
-
-2006-04-10 Daniel Stone <daniel@freedesktop.org>
-
- * src/xkbtext.c:
- * src/xkbout.c:
- Fix stupid typos. (Shang-Feng Yang)
-
-2006-04-09 Daniel Stone <daniel@freedesktop.org>
-
- * src/xkbtext.c:
- Coverity #776, 777: Fix memory leaks.
-
- * src/xkbout.c:
- Coverity #774: Fix memory leak.
- Coverity #265: Fix potential NULL dereference.
-
-2006-04-07 Daniel Stone <daniel@freedesktop.org>
-
- * src/maprules.c:
- Fix signed vs unsigned char hilarity. (Bill Crawford)
-
- * src/xkbout.c:
- Coverity #979, 980, 981, 982: Fix potential NULL dereferences.
-
- * src/xkbmisc.c:
- Coverity #787, 788: Fix memory leaks.
-
-2006-03-27 Daniel Stone <daniel@freedesktop.org>
-
- * configure.ac:
- * src/XKBfileInt.h:
- * src/xkbmisc.c:
- * src/xkbconfig.c:
- * src/maprules.c:
- Fix horrendous botching of previous commit.
-
-2006-03-25 Daniel Stone <daniel@freedesktop.org>
-
- * src/XKBfileInt.h:
- * src/xkbmisc.c:
- * src/xkbconfig.c:
- * src/maprules.c:
- Bug #3819: Change open-coded _XkbStrCaseCmp to strcmp + tolower.
-
-2006-02-28 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/Makefile.am:
- Bump to 1.0.2.
-
-2006-02-28 Daniel Stone <daniel@freedesktop.org>
-
- * src/maprules.c:
- Bug #5216: Allow options to appear with other components.
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * xkbfile.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
-
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for RC1 release.
-
-2005-10-04 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * Makefile.am:
- * src/Makefile.am:
- magic lives in src, so add it to EXTRA_DIST there instead
-
-2005-07-08 Keith Packard <keithp@keithp.com>
-
- * .cvsignore:
- * include/X11/.cvsignore:
- * src/.cvsignore:
- * src/Makefile.am:
- Add .cvsignore files
- Switch _la_CFLAGS for AM_CFLAGS to clean up directory
diff --git a/Makefile.am b/Makefile.am
index 5df3025..14028f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,3 +25,13 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xkbfile.pc
EXTRA_DIST = xkbfile.pc.in autogen.sh
+
+EXTRA_DIST += ChangeLog
+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
commit 492cd9bfc642443d92f419964334f59b89329a36
Author: Daniel Drake <ddrake@brontes3d.com>
Date: Tue May 29 12:51:00 2007 -0800
Bug #11094: libxkbfile COPYING file
X.Org Bugzilla #11094 <https://bugs.freedesktop.org/show_bug.cgi?id=11094>
diff --git a/COPYING b/COPYING
index 7f33cbf..f070a71 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,66 @@
-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) 1994-1996 by Silicon Graphics Computer Systems, Inc.
-Please submit updated COPYING files to the Xorg bugzilla:
+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 Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS 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.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Copyright 1987, 1998 The Open Group
+
+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.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group 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 Open Group.
+
+
+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.
+
Reply to: