xbitmaps: Changes to 'upstream-unstable'
.gitignore | 10 ++++++++++
COPYING | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
ChangeLog | 22 ----------------------
Makefile.am | 12 ++++++++++++
black6 | 4 ++++
box6 | 4 ++++
configure.ac | 10 ++++++----
7 files changed, 86 insertions(+), 34 deletions(-)
New commits:
commit 193b9cc84f98af912e15fe7dc8bd16537b6a5f46
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 12 22:10:25 2009 -0700
xbitmaps 1.1.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index 5327bb1..2385477 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT(xbitmaps, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xbitmaps)
+AC_INIT(xbitmaps, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xbitmaps)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 67ff90dc164d24bcc5efd7ae0eabdc674e7d7bda
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 12 22:07:50 2009 -0700
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index 0716aed..5327bb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,14 +3,13 @@ AC_INIT(xbitmaps, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=x
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: 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)
-
AM_CONFIG_HEADER(config.h)
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
+# Require xorg-macros 1.3 or later: 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
AC_OUTPUT([
Makefile
commit 1af293c2c0a1c058313a77074e62633c429d6b72
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 12 22:04:01 2009 -0700
Move black6 & box6 bitmaps from xmh module
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/Makefile.am b/Makefile.am
index 4c2f01a..bfd436d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,9 @@ dist_bitmap_DATA = \
1x1 \
2x2 \
black \
+ black6 \
boxes \
+ box6 \
calculator \
cntr_ptr \
cntr_ptrmsk \
diff --git a/black6 b/black6
new file mode 100644
index 0000000..4e5384e
--- /dev/null
+++ b/black6
@@ -0,0 +1,4 @@
+#define black6_width 6
+#define black6_height 6
+static char black6_bits[] = {
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
diff --git a/box6 b/box6
new file mode 100644
index 0000000..83ac4a7
--- /dev/null
+++ b/box6
@@ -0,0 +1,4 @@
+#define box6_width 6
+#define box6_height 6
+static char box6_bits[] = {
+ 0x3f, 0x21, 0x21, 0x21, 0x21, 0x3f};
commit 234a598e41331bb29c10b77ac747e3009be37d27
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Jan 27 15:23:52 2009 -0200
Correct make distcheck.
diff --git a/.gitignore b/.gitignore
index 8d7c959..160e62d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,17 @@
+Makefile
Makefile.in
aclocal.m4
autom4te.cache
+config.h
config.h.in
+config.log
+config.status
configure
install-sh
missing
+stamp-h1
*~
+xbitmaps-*.tar.*
+xbitmaps.pc
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 293bc51..4c2f01a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,6 +85,6 @@ 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)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 5d95d99..0716aed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,16 @@
-# $XdotOrg: $
-
AC_PREREQ([2.57])
AC_INIT(xbitmaps, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xbitmaps)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: 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)
+
AM_CONFIG_HEADER(config.h)
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([
Makefile
commit 315699dafe12d8aefe52d230209d07a23ce1dd77
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Apr 1 11:21:59 2008 -0700
Create COPYING file from notice in terminal & X11R6.6 release notes
Bitmaps are unchanged from X11R6.6 (and much earlier X11 releases actually),
so this notice should still apply
diff --git a/COPYING b/COPYING
index 7f33cbf..c80ef7d 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,54 @@
-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) 1998 The Open Group
-Please submit updated COPYING files to the Xorg bugzilla:
+All rights reserved.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+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.
-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
+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.
+
+X Window System is a trademark of The Open Group.
+
+Copyright 1988 by Evans & Sutherland Computer Corporation,
+Salt Lake City, Utah
+
+ 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 permis-
+sion notice appear in supporting documentation, and that the
+name of Evans & Sutherland not be used in advertising or publi-
+city pertaining to distribution of the software without specif-
+ic, written prior permission.
+
+EVANS & SUTHERLAND DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILI-
+TY AND FITNESS, IN NO EVENT SHALL EVANS & SUTHERLAND BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAM-
+AGES 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 PER-
+FORMANCE OF THIS SOFTWARE.
-http://lists.freedesktop.org/mailman/listinfo/xorg
commit c6333fd4d5d71f022f3449fa7334db1887c9d2d9
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:37:35 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index b843ca5..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,22 +0,0 @@
-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-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for RC1 release.
-
-2005-10-05 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * Makefile.am: Add missing xlogo64 and xsnow files
-
-2005-07-11 Daniel Stone <daniel@freedesktop.org>
-
- * Initial autotooling.
diff --git a/Makefile.am b/Makefile.am
index a703d7d..293bc51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,3 +78,13 @@ dist_bitmap_DATA = \
xlogo32 \
xlogo64 \
xsnow
+
+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 9e1b04c09b7e29d469004532c815ef1d23519673
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:51:58 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index d61fb80..8d7c959 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ config.h.in
configure
install-sh
missing
+*~
Reply to: