x11-apps: Changes to 'debian-unstable'
debian/changelog | 27
debian/control | 4
debian/copyright | 6
debian/rules | 2
debian/x11-apps.menu | 98 ++
xcalc/COPYING | 51 +
xcalc/ChangeLog | 245 ++++++-
xcalc/Makefile.am | 14
xcalc/Makefile.in | 74 --
xcalc/XCalc-color.ad | 157 ++++
xcalc/aclocal.m4 | 24
xcalc/compile | 142 ----
xcalc/config.guess | 32
xcalc/config.h.in | 9
xcalc/config.sub | 28
xcalc/configure | 47 +
xcalc/configure.ac | 2
xcalc/mkinstalldirs | 158 ----
xclock/ChangeLog | 347 +++++++++-
xclock/Clock.c | 105 +++
xclock/INSTALL | 236 -------
xclock/Makefile.am | 14
xclock/Makefile.in | 167 ++--
xclock/aclocal.m4 | 1544 +++++++++++++++++++++++----------------------
xclock/compile | 142 ----
xclock/config.h.in | 15
xclock/config.sub | 14
xclock/configure | 558 +++++++---------
xclock/configure.ac | 7
xclock/depcomp | 64 +
xclock/install-sh | 348 +++++++---
xclock/missing | 61 +
xclock/mkinstalldirs | 158 ----
xclock/xclock.c | 17
xclock/xclock.man | 19
xconsole/ChangeLog | 407 +++++++++++-
xconsole/Makefile.am | 9
xconsole/Makefile.in | 37 -
xconsole/aclocal.m4 | 24
xconsole/compile | 142 ----
xconsole/config.guess | 32
xconsole/config.h.in | 48 +
xconsole/config.sub | 28
xconsole/configure | 1060 ++++++++++++++++++++++++++++++-
xconsole/configure.ac | 10
xconsole/mkinstalldirs | 158 ----
xconsole/xconsole.c | 19
xcursorgen/ChangeLog | 248 ++++++-
xcursorgen/Makefile.am | 21
xcursorgen/Makefile.in | 48 -
xcursorgen/aclocal.m4 | 24
xcursorgen/compile | 142 ----
xcursorgen/config.guess | 32
xcursorgen/config.h.in | 10
xcursorgen/config.sub | 28
xcursorgen/configure | 106 +--
xcursorgen/configure.ac | 4
xcursorgen/mkinstalldirs | 158 ----
xcursorgen/xcursorgen.c | 16
xcursorgen/xcursorgen.man | 30
xmag/ChangeLog | 280 +++++++-
xmag/INSTALL | 236 -------
xmag/Makefile.am | 12
xmag/Makefile.in | 199 ++---
xmag/aclocal.m4 | 1548 +++++++++++++++++++++++-----------------------
xmag/compile | 142 ----
xmag/config.h.in | 18
xmag/config.sub | 14
xmag/configure | 383 ++++++-----
xmag/configure.ac | 4
xmag/depcomp | 64 +
xmag/install-sh | 348 +++++++---
xmag/missing | 61 +
xmag/mkinstalldirs | 158 ----
xmag/xmag.c | 36 -
xmag/xmag.man | 2
xman/INSTALL | 236 -------
xman/Makefile.in | 221 +++---
xman/aclocal.m4 | 196 +++--
xman/compile | 142 ----
xman/config.h.in | 9
xman/config.sub | 14
xman/configure | 171 +++--
xman/configure.ac | 2
xman/depcomp | 64 +
xman/install-sh | 348 +++++++---
xman/main.c | 2
xman/man.c | 2
xman/man.h | 2
xman/misc.c | 2
xman/missing | 61 +
xman/mkinstalldirs | 158 ----
xman/vendor.c | 2
xman/vendor.h | 10
94 files changed, 7159 insertions(+), 5765 deletions(-)
New commits:
commit a4c07f2f911b0b651dbb05369e6337e0b69b88e4
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Sep 14 23:17:55 2007 +0200
Prepare changelog for upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 6f2cc0b..46565c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.2+1) UNRELEASED; urgency=low
+x11-apps (7.3+1) unstable; urgency=low
[ Julien Cristau ]
* xclock 1.0.3.
@@ -16,8 +16,9 @@ x11-apps (7.2+1) UNRELEASED; urgency=low
* xcalc 1.0.2.
* xconsole 1.0.3.
* xcursorgen 1.0.2.
+ * Add myself to Uploaders, and remove Branden with his permission.
- -- Brice Goglin <bgoglin@debian.org> Fri, 17 Aug 2007 09:59:26 +0200
+ -- Brice Goglin <bgoglin@debian.org> Fri, 14 Sep 2007 23:14:57 +0200
x11-apps (0.1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index c90759d..1c7f0d6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11-apps
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Julien Cristau <jcristau@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends: debhelper (>= 5.0.0), pkg-config, libpng12-dev, libx11-dev (>= 2:1.0.0-1),
libxaw7-dev (>= 1:1.0.1-1), libxcursor-dev (>= 1.1.5.2-1), libxext-dev (>= 1:1.0.0-1),
libxft-dev (>= 2.1.8.2-6), libxkbfile-dev (>= 1:1.0.1-1), libxmuu-dev (>= 1:1.0.1-1),
commit 5fe0066e0cb4f903e148cc58ac9a0166e1b71b47
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Aug 22 00:22:13 2007 +0200
xcursorgen 1.0.4
diff --git a/debian/changelog b/debian/changelog
index 8b0cd13..6f2cc0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ x11-apps (7.2+1) UNRELEASED; urgency=low
xditview, xeyes, xedit, xload, xlogo, xmag, xman and xwd.
* xcalc 1.0.2.
* xconsole 1.0.3.
+ * xcursorgen 1.0.2.
-- Brice Goglin <bgoglin@debian.org> Fri, 17 Aug 2007 09:59:26 +0200
diff --git a/xcursorgen/ChangeLog b/xcursorgen/ChangeLog
index 4270fe9..cd9e3b2 100644
--- a/xcursorgen/ChangeLog
+++ b/xcursorgen/ChangeLog
@@ -1,47 +1,235 @@
-2006-04-26 Adam Jackson <ajax@freedesktop.org>
+commit 5aca565a857da642bc3f9dc89e88bfa3c1b13f11
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 20 18:14:28 2007 -0700
- * configure.ac:
- Bump to 1.0.1
+ Version bump: 1.0.2
-2006-04-03 Adam Jackson <ajax@freedesktop.org>
+commit ea7f29dd3104c23f2533e45395852202dc588d36
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 20 18:11:58 2007 -0700
- * xcursorgen.c:
- Bug #3270: Fix rounding errors.
+ Set version string in man page
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit bdbbaa94ea75511dd7f5dd8573b6772dab56e55e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 20 17:52:25 2007 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Use strdup instead of malloc/strlen/strcpy
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e5c1a83c1b8f71615d2fe724456bc044d9799efa
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 20 17:48:19 2007 -0700
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Correct help flag in usage message (-?, not -h)
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a6cc06762ae726765db2d5f76ce8f9464fb6dab8
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 20 17:46:28 2007 -0700
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Add options/flags to man page & other man page cleanups
-2005-11-12 Alan Coopersmith <alan.coopersmith@sun.com>
+commit 3392d92ac031ac5796a1ebce816366c25f10e18a
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 20 16:42:23 2007 -0700
- * Makefile.am:
- * configure.ac:
- Bug #5021 <https://bugs.freedesktop.org/show_bug.cgi?id=5021>
- Patch #3786 <https://bugs.freedesktop.org/attachment.cgi?id=3786>
- xcursorgen installs manpages into 'man1' instead of 'man1x'
+ Remove unused AC_TYPE_SIGNAL from configure.ac
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c2c7f8b3f8301f3f47af514627631acdb5aae109
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 20 16:40:19 2007 -0700
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Use PACKAGE_VERSION for --version output
-2005-10-20 Eric Anholt <anholt@FreeBSD.org>
+commit fb4fc37392c441e5e970ac68fc366758dac4a560
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 20 16:35:42 2007 -0700
- * Makefile.am:
- Fix spelling of man1_MANS so the manpage gets installed. (Bill Crawford)
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-07-09 Keith Packard <keithp@keithp.com>
+commit 1dc83c571d81288ea3eea6032a3c3f8880b77442
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 20 15:16:02 2007 -0700
- * .cvsignore:
- Add .cvsignore files
+ Change xcursorgen_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+
+commit 50d163d5ec3a5ab6d9defe883f6b96aec5e7c481
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue Dec 12 15:46:57 2006 -0800
+
+ Coverity #624: RESOURCE_LEAK: Returned without freeing storage "fp"
+
+commit c7b1efdc8ee552b97e43ff985b531cc8f0d155a0
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue Dec 12 15:38:56 2006 -0800
+
+ renamed: .cvsignore -> .gitignore
+
+commit 92171a05977622f2233bbd9fa63408fd85d637de
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue Dec 12 15:33:55 2006 -0800
+
+ Coverity #621: RESOURCE_LEAK: Returned without freeing storage "curr"
+
+ free(curr) in error path when second malloc fails.
+
+commit bf8160df027e3c4335e8473cf7aae8c1d21546cf
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri May 19 18:33:36 2006 +0000
+
+ Bump to 1.0.1
+
+commit c3eb5d737f8281a3c7ffaf592c443d41a47f5c40
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Apr 3 22:06:24 2006 +0000
+
+ Bug #3270: Fix rounding errors.
+
+commit b7b26fefc1b334672e84a16c8caf5edd2b85f294
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:05 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit ab065281c8875bba88c2b9adb492a9977ea39ed0
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:20 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit ae1b20a0473e596754eae33bab0fedeb692f381b
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:19 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 46218fc220339a616694ea0310a173d50ef7bf12
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:01:40 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 f3a8d8e594e16f9c9b9b89215eb297232da936e0
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:34:59 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 21e0bf931f260b7c1dbc4724b2698a1cd1143e79
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Sun Nov 20 22:08:51 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 15664a0e83dad641da695c6b35965c08e8b6935d
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sat Nov 12 17:52:00 2005 +0000
+
+ Bug #5021 <https://bugs.freedesktop.org/show_bug.cgi?id=5021> Patch #3786
+ <https://bugs.freedesktop.org/attachment.cgi?id=3786> xcursorgen
+ installs manpages into 'man1' instead of 'man1x'
+
+commit 0c9649fc7598ac601f4bc67253c7caf3ae1bd04b
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:09:20 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 4ef9256645536bc4200f4611014176de65231bde
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Thu Oct 20 23:28:50 2005 +0000
+
+ Update ChangeLog for last fix, including attribution: Fix spelling of
+ man1_MANS so the manpage gets installed. (Bill Crawford)
+
+commit e1aafb476b2fd87b5c8d998f78a268b218db95db
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Thu Oct 20 23:20:13 2005 +0000
+
+ Fix spelling of man1_MANS so the manpage gets installed.
+
+commit 0075a0d8b02c0bf069cb28d569341be0efabd831
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:31 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 d1e8b882f87ed8f6e335daff461ea1427f92c8c9
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jul 9 23:36:22 2005 +0000
+
+ Add .cvsignore files
+
+commit 36faf2957f84e050486a9ca187f22c82867e383d
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Jul 6 05:39:42 2005 +0000
+
+ Set version to 1.0.
+
+commit 74a7675c0608d7e1b9a22263b907ce7804bb3250
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Jul 6 05:35:51 2005 +0000
+
+ Add xcursorgen build system.
+
+commit a750fa933a7d54c971badb401a23fcd020da315b
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Dec 3 22:21:22 2004 +0000
+
+ Check malloc return values.
+
+commit 4b9f8a6bb5e2bd7129339264aab23f3818ff4952
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:54:41 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 67c2de8d39f56345bd5a5b40b8bd93a5a6aac9de
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:35:01 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 11ad36a7b30edcab5d75fc3b96ab6f5b28295ac5
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:55 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit a72ceed75bbb818736df95fc0756e40469416bb1
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:36:16 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 3a6cb640d6a1a86e8586d998f97538df0cca6e14
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:58 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 7c4674de0645c6deab515b153f86520967bd0a4f
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:29:04 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit b3bfcbc826cc3316c1068724633897abb11d8118
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:58 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 439e6e965ce471e53cd740549743fea761c46dda
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:58 2003 +0000
+
+ Initial revision
diff --git a/xcursorgen/Makefile.am b/xcursorgen/Makefile.am
index f7119fd..1e5010e 100644
--- a/xcursorgen/Makefile.am
+++ b/xcursorgen/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = xcursorgen
xcursorgen_SOURCES = xcursorgen.c
-xcursorgen_CFLAGS = @XCURSORGEN_CFLAGS@
+AM_CFLAGS = @XCURSORGEN_CFLAGS@
xcursorgen_LDADD = @XCURSORGEN_LIBS@
@@ -11,10 +11,25 @@ appmandir = $(APP_MAN_DIR)
appman_PRE = xcursorgen.man
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
CLEANFILES = $(appman_DATA)
+MAINTAINERCLEANFILES = ChangeLog
-MAN_SUBSTS = -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|'
+.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
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+ XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+ -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
diff --git a/xcursorgen/Makefile.in b/xcursorgen/Makefile.in
index 12942e5..4ccb0c1 100644
--- a/xcursorgen/Makefile.in
+++ b/xcursorgen/Makefile.in
@@ -56,7 +56,7 @@ CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
-am_xcursorgen_OBJECTS = xcursorgen-xcursorgen.$(OBJEXT)
+am_xcursorgen_OBJECTS = xcursorgen.$(OBJEXT)
xcursorgen_OBJECTS = $(am_xcursorgen_OBJECTS)
xcursorgen_DEPENDENCIES =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
@@ -193,14 +193,23 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
xcursorgen_SOURCES = xcursorgen.c
-xcursorgen_CFLAGS = @XCURSORGEN_CFLAGS@
+AM_CFLAGS = @XCURSORGEN_CFLAGS@
xcursorgen_LDADD = @XCURSORGEN_LIBS@
appmandir = $(APP_MAN_DIR)
appman_PRE = xcursorgen.man
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
CLEANFILES = $(appman_DATA)
-MAN_SUBSTS = -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|'
+MAINTAINERCLEANFILES = ChangeLog
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+XORGMANNAME = X Version 11
+MAN_SUBSTS = \
+ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+ -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g'
+
SUFFIXES = .$(APP_MAN_SUFFIX) .man
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -290,7 +299,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcursorgen-xcursorgen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcursorgen.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -305,20 +314,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-xcursorgen-xcursorgen.o: xcursorgen.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xcursorgen_CFLAGS) $(CFLAGS) -MT xcursorgen-xcursorgen.o -MD -MP -MF "$(DEPDIR)/xcursorgen-xcursorgen.Tpo" -c -o xcursorgen-xcursorgen.o `test -f 'xcursorgen.c' || echo '$(srcdir)/'`xcursorgen.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xcursorgen-xcursorgen.Tpo" "$(DEPDIR)/xcursorgen-xcursorgen.Po"; else rm -f "$(DEPDIR)/xcursorgen-xcursorgen.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xcursorgen.c' object='xcursorgen-xcursorgen.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xcursorgen_CFLAGS) $(CFLAGS) -c -o xcursorgen-xcursorgen.o `test -f 'xcursorgen.c' || echo '$(srcdir)/'`xcursorgen.c
-
-xcursorgen-xcursorgen.obj: xcursorgen.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xcursorgen_CFLAGS) $(CFLAGS) -MT xcursorgen-xcursorgen.obj -MD -MP -MF "$(DEPDIR)/xcursorgen-xcursorgen.Tpo" -c -o xcursorgen-xcursorgen.obj `if test -f 'xcursorgen.c'; then $(CYGPATH_W) 'xcursorgen.c'; else $(CYGPATH_W) '$(srcdir)/xcursorgen.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xcursorgen-xcursorgen.Tpo" "$(DEPDIR)/xcursorgen-xcursorgen.Po"; else rm -f "$(DEPDIR)/xcursorgen-xcursorgen.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xcursorgen.c' object='xcursorgen-xcursorgen.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xcursorgen_CFLAGS) $(CFLAGS) -c -o xcursorgen-xcursorgen.obj `if test -f 'xcursorgen.c'; then $(CYGPATH_W) 'xcursorgen.c'; else $(CYGPATH_W) '$(srcdir)/xcursorgen.c'; fi`
uninstall-info-am:
install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL)
@@ -415,6 +410,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -544,6 +542,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -599,8 +598,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
+ dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-compile distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-appmanDATA install-binPROGRAMS install-data \
@@ -613,6 +612,13 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
uninstall-info-am
+.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
+
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/xcursorgen/aclocal.m4 b/xcursorgen/aclocal.m4
index 398f56a..2d86b12 100644
--- a/xcursorgen/aclocal.m4
+++ b/xcursorgen/aclocal.m4
@@ -159,7 +159,7 @@ path to pkg-config.
_PKG_TEXT
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -216,7 +216,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.2
+ [XORG_MACROS_version=1.1.5
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -620,7 +620,8 @@ dnl
# --------------------
# Adds --with/without-release-string and changes the PACKAGE and
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
@@ -633,6 +634,23 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+ [`echo $PACKAGE_VERSION | cut -d . -f 1`],
+ [Major version of this package])
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+ [$PVM],
+ [Minor version of this package])
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
+ [$PVP],
+ [Patch version of this package])
])
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
diff --git a/xcursorgen/compile b/xcursorgen/compile
deleted file mode 100755
index 1b1d232..0000000
--- a/xcursorgen/compile
+++ /dev/null
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/xcursorgen/config.guess b/xcursorgen/config.guess
index 396482d..0f0fe71 100755
--- a/xcursorgen/config.guess
+++ b/xcursorgen/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2007-03-06'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -780,7 +781,7 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -790,12 +791,15 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -950,6 +954,9 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa:Linux:*:*)
+ echo xtensa-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1215,15 @@ EOF
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff --git a/xcursorgen/config.h.in b/xcursorgen/config.h.in
index bddcf36..1ca4092 100644
--- a/xcursorgen/config.h.in
+++ b/xcursorgen/config.h.in
@@ -18,8 +18,14 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
/* Version number of package */
#undef VERSION
diff --git a/xcursorgen/config.sub b/xcursorgen/config.sub
index 387c18d..5defff6 100755
--- a/xcursorgen/config.sub
+++ b/xcursorgen/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2007-01-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@ case $basic_machine in
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -276,6 +276,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -284,7 +285,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -323,7 +324,7 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -367,7 +368,7 @@ case $basic_machine in
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -909,6 +910,10 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -920,6 +925,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1214,7 +1222,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1366,6 +1374,9 @@ else
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
spu-*)
os=-elf
;;
@@ -1406,6 +1417,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
diff --git a/xcursorgen/configure b/xcursorgen/configure
index 7c88c0a..b7b6f20 100755
--- a/xcursorgen/configure
+++ b/xcursorgen/configure
Reply to: