libxxf86misc: Changes to 'debian-unstable'
.gitignore | 13 ++
ChangeLog | 259 ++++++++++++++++++++++++++++++++++++++++++++++---------
Makefile.am | 10 +-
README | 25 +++++
configure.ac | 11 +-
debian/changelog | 11 +-
debian/control | 3
man/.gitignore | 3
man/Makefile.am | 16 +--
src/.gitignore | 9 -
src/Makefile.am | 2
src/XF86Misc.c | 42 ++------
12 files changed, 303 insertions(+), 101 deletions(-)
New commits:
commit 0bd666764ba0ab22a20ddd99aef0e2ded7ec7ecd
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Nov 24 12:39:13 2009 +0200
Drop pre-dependency on x11-common from libxxf86misc-dev. This was needed for upgrades from sarge.
diff --git a/debian/changelog b/debian/changelog
index c17013b..1ba9a37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ libxxf86misc (1:1.0.2-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release.
* Bump the build-dep on xutils-dev (>= 1:7.5~1).
+ * Drop pre-dependency on x11-common from libxxf86misc-dev. This was
+ needed for upgrades from sarge.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 24 Nov 2009 12:36:08 +0200
diff --git a/debian/control b/debian/control
index 9357264..f6cf3b7 100644
--- a/debian/control
+++ b/debian/control
@@ -59,7 +59,6 @@ Package: libxxf86misc-dev
Section: libdevel
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libxxf86misc1 (= ${binary:Version}), libx11-dev, x11proto-xf86misc-dev
-Pre-Depends: x11-common (>= 1:7.0.0)
Description: X11 XFree86 miscellaneous extension library (development headers)
libXxf86misc provides an interface to the XFree86-Misc extension, which
allows client applications to query the current keyboard and mouse settings
commit b24f7f98f469beba825b8a618354d630baecef80
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Nov 24 12:37:35 2009 +0200
Bump the build-dep on xutils-dev (>= 1:7.5~1).
diff --git a/debian/changelog b/debian/changelog
index b7b86df..c17013b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ libxxf86misc (1:1.0.2-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release.
+ * Bump the build-dep on xutils-dev (>= 1:7.5~1).
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 24 Nov 2009 12:36:08 +0200
diff --git a/debian/control b/debian/control
index aa84dc7..9357264 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
quilt,
automake,
libtool,
- xutils-dev (>= 1:7.4+4)
+ xutils-dev (>= 1:7.5~1)
Standards-Version: 3.8.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxxf86misc
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxxf86misc.git
commit ea8130246bada6aa4d00b2d3fcd2a454a3267b1f
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Nov 24 12:36:56 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..ffe1a83
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,240 @@
+commit 74b475b59fd0da95f91e75d5f32276e87dda6f3f
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Oct 8 22:21:41 2009 -0700
+
+ libXxf86misc 1.0.2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 6f5d7342b4192db164913106b5630ebb91d067ca
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Oct 8 22:21:03 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 3337b434ffc664d02e763dfba7e56f5942ad9544
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Feb 2 20:34:37 2009 -0800
+
+ Add README with pointers to mailing list, bugzilla & git repos
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 860ee8b84e4df995ba241d16d9adbf5b7c77e5ae
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Mon Feb 2 14:30:51 2009 -0200
+
+ Janitor: ansification, make distcheck, compiler warnings, .gitignore.
+
+commit 6bc07578f11eecb1c67a6dd28861a0cbc03621c6
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sun Mar 9 08:49:52 2008 +0100
+
+ nuke RCS Ids
+
+commit b3b1c2f578fd68b3cea689876acf68807e2cb03a
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Dec 6 16:38:46 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit f4ed7977e3bd5a60df0d5df089a613462c04dc3f
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:53:51 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 2b2dbf791127a2d8a949546a5e6f5de3d3650b82
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jul 13 14:59:13 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit a2ff41b5721803eda53ef54bc5c7e3593724be1e
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu Apr 27 00:26:02 2006 +0000
+
+ Bump to 1.0.1
+
+commit 22e48fc3d8e8487592f451ae1b7590f2c519a2e3
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sun Feb 12 18:19:23 2006 +0000
+
+ Bug #5628 <https://bugs.freedesktop.org/show_bug.cgi?id=5628> Shadow pages
+ not created correctly when MANDIR & MANSUFFIX don't match.
+
+commit b679b8e1301f8667a326c03eb8c77ad5164f8c65
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:35 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit db2fdde2e48e58bfeace9a377a35b269120dcdd9
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:45 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 19c05a5b4bd42d9705333f528482195386c30f0f
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:45 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 9acf2665b699c19a38e90b3b46f91c950c91c8f3
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 04:41:52 2005 +0000
+
+ Add check and cflags for malloc(0) returning NULL.
+
+commit 23528bbea55e9307fb23f66d64d72d6ed0c68513
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:03:06 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 9115eddd12306b09e25f2f427fcbdb0d3ede4569
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Nov 19 07:15:44 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit 1d05751f145f3be2769426fc0df936f72f83dd56
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:12 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 5626a921068992168fd14a57f8d84a182cdca4e1
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 18 00:00:09 2005 +0000
+
+ Use @LIB_MAN_SUFFIX@ instead of $(LIB_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit c378ef530457652deaecea308fe4ca71b08163df
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 21:13:22 2005 +0000
+
+ Rename .shadows.DONE to shadows.DONE to avoid some make's thinking it's a
+ suffix rule (reported by Matthieu Herrb)
+
+commit 7a1230b8f5c39faaef4e58035faa1715bc6b4554
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Thu Oct 13 04:25:46 2005 +0000
+
+ Add generated man pages to .cvsignores
+
+commit b9ef575c4528a22404336d26a8691f0f1774a02b
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Wed Oct 12 02:05:28 2005 +0000
+
+ [lib/Xxf86misc]
+ Use sed to put version number in man page Add shadow man pages for man
+ pages that document multiple functions.
+
+commit aa62bb7d1da83bc18df406df0dff9cc2eff7d826
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Sep 26 20:52:04 2005 +0000
+
+ Simple whitespace change to change ownership of ,v file on server. Needed
+ to change permissions of this file.
+
+commit dee00077229d2bb91c6561587e84e86436346689
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:53 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 1ffe76acba6266c8f47af96d1f9bbc46d4b5dcf4
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jul 9 21:08:53 2005 +0000
+
+ Add .cvsignore files Switch _la_CFLAGS for AM_CFLAGS to clean up directory
+
+commit 69ae5c35260f8f92063a3e6953f51702c4f0b4eb
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Fri Jul 1 16:16:15 2005 +0000
+
+ spell freedesktop.org correctly
+
+commit 6303c89f331dc585bf28fd04f8a1018693e89569
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Fri Jun 10 22:38:47 2005 +0000
+
+ Apply patch from Jeff Smith (whydoubt@yahoo.com):
+ - Add file linking for Xxf86misc, Xxf86dga, and Xxf86vm.
+ - Check in build system for Xxf86misc, Xxf86dga, and Xxf86vm.
+
+commit 517aed7ebcd3a71177883b495c86a040483ac623
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:23:08 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 12bba3408db8460ac2161bacd640aad80214a332
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:33:12 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit e76d38fc568210a8e51ff91cc1c1108aaf3b4dd9
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:14 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 42998231f69e4b9f5e6d942bef5c1c65524937fb
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:46 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 7e6f2a280d503216f40d81f910164a33ab069a69
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:14 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 6f8f96c3be3918f62d530115f0577effc2f05367
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Thu Dec 4 22:03:15 2003 +0000
+
+ XFree86 4.3.99.901 (RC 1)
+
+commit 3798fcf79de232d0c7b0f7056662e1782f9671a0
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:16 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 8e3405356146c0cd8c60327173b92ec1f2c1c5dd
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:54 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 4dd2d68ec3d43170070810d8b2a5e18bbdc13079
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:49 2003 +0000
+
+ Initial revision
+
+commit 418e916d78dbbc723fc6a5bb0315cf44f30360fa
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:49 2003 +0000
+
+ R6.6 is the Xorg base-line
diff --git a/debian/changelog b/debian/changelog
index a342699..b7b86df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-libxxf86misc (1:1.0.1-4) UNRELEASED; urgency=low
+libxxf86misc (1:1.0.2-1) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Add a link to www.X.org and a reference to the upstream module
in the long description.
* Add upstream URL to debian/copyright.
@@ -10,7 +11,10 @@ libxxf86misc (1:1.0.1-4) UNRELEASED; urgency=low
* Run autoreconf on build; add build-deps on automake, libtool, xutils-dev.
* Handle parallel builds.
- -- Brice Goglin <bgoglin@debian.org> Sun, 02 Aug 2009 23:22:49 +0200
+ [ Timo Aaltonen ]
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 24 Nov 2009 12:36:08 +0200
libxxf86misc (1:1.0.1-3) unstable; urgency=low
commit 74b475b59fd0da95f91e75d5f32276e87dda6f3f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 8 22:21:41 2009 -0700
libXxf86misc 1.0.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index 82d4c0d..f9171be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.57])
-AC_INIT(libXxf86misc, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86misc)
+AC_INIT(libXxf86misc, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86misc)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 6f5d7342b4192db164913106b5630ebb91d067ca
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 8 22:21:03 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 2ad247e..82d4c0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,23 +4,23 @@ AC_INIT(libXxf86misc, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CWARNFLAGS, 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)
+# 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)
+
AM_CONFIG_HEADER(src/config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+
+XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XXF86MISC, xproto x11 xextproto xext xf86miscproto)
XORG_CHECK_MALLOC_ZERO
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
diff --git a/man/Makefile.am b/man/Makefile.am
index 4e1b1a4..40a9794 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -30,14 +30,12 @@ LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
libman_PRE = XF86Misc.man
-BUILT_SOURCES = shadows.DONE
-
EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@)
+ $(XF86Misc_shadowmen)
SED = sed
@@ -55,7 +53,7 @@ MAN_SUBSTS = \
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
.man.$(LIB_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
@@ -69,8 +67,7 @@ XF86Misc_shadows = \
XF86MiscGetKbdSettings \
XF86MiscSetKbdSettings
-shadows.DONE:
- -rm -f $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/XF86Misc.$(LIB_MAN_SUFFIX) > $$i; \
- done)
+XF86Misc_shadowmen = $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@)
+
+$(XF86Misc_shadowmen):
+ $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XF86Misc.$(LIB_MAN_SUFFIX) > $@
diff --git a/src/Makefile.am b/src/Makefile.am
index 715b82d..4f5b3f3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,6 @@ lib_LTLIBRARIES = libXxf86misc.la
libXxf86misc_la_SOURCES = XF86Misc.c
-AM_CFLAGS = $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS)
libXxf86misc_la_LIBADD = $(XXF86MISC_LIBS)
libXxf86misc_la_LDFLAGS = -version-number 1:1:0
commit 3337b434ffc664d02e763dfba7e56f5942ad9544
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 2 20:34:37 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/README b/README
new file mode 100644
index 0000000..e5a7b3d
--- /dev/null
+++ b/README
@@ -0,0 +1,25 @@
+libXxf86misc - Extension library for the XFree86-Misc X extension.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/lib/libXxf86misc
+
+ http://cgit.freedesktop.org/xorg/lib/libXxf86misc
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
commit 860ee8b84e4df995ba241d16d9adbf5b7c77e5ae
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon Feb 2 14:30:51 2009 -0200
Janitor: ansification, make distcheck, compiler warnings, .gitignore.
diff --git a/.gitignore b/.gitignore
index 64b9b9b..ad3d7ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,11 @@
+.deps
+.libs
aclocal.m4
autom4te.cache
compile
config.guess
+config.h
+config.h.in
config.log
config.status
config.sub
@@ -14,5 +18,13 @@ Makefile
Makefile.in
missing
mkinstalldirs
+stamp-h1
xxf86misc.pc
*~
+*.3
+*.o
+*.la
+*.lo
+libXxf86misc-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index d80a181..1b735d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,14 +3,12 @@ SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xxf86misc.pc
-EXTRA_DIST = xxf86misc.pc.in autogen.sh
-
-EXTRA_DIST += ChangeLog
+EXTRA_DIST = xxf86misc.pc.in 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)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index c821849..2ad247e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,11 +4,15 @@ AC_INIT(libXxf86misc, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_CWARNFLAGS, 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(src/config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XXF86MISC, xproto x11 xextproto xext xf86miscproto)
@@ -16,6 +20,7 @@ PKG_CHECK_MODULES(XXF86MISC, xproto x11 xextproto xext xf86miscproto)
XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 2d0f344..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.3*
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 07e6fa2..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-config.h
-config.h.in
-.deps
-.libs
-libXxf86misc.la
-*.lo
-Makefile
-Makefile.in
-stamp-h1
diff --git a/src/XF86Misc.c b/src/XF86Misc.c
index b0669d5..193224f 100644
--- a/src/XF86Misc.c
+++ b/src/XF86Misc.c
@@ -56,9 +56,7 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xf86misc_info)
* *
*****************************************************************************/
-Bool XF86MiscQueryExtension (dpy, event_basep, error_basep)
- Display *dpy;
- int *event_basep, *error_basep;
+Bool XF86MiscQueryExtension (Display *dpy, int *event_basep, int *error_basep)
{
XExtDisplayInfo *info = find_display (dpy);
@@ -71,10 +69,7 @@ Bool XF86MiscQueryExtension (dpy, event_basep, error_basep)
}
}
-Bool XF86MiscQueryVersion(dpy, majorVersion, minorVersion)
- Display* dpy;
- int* majorVersion;
- int* minorVersion;
+Bool XF86MiscQueryVersion(Display* dpy, int* majorVersion, int* minorVersion)
{
XExtDisplayInfo *info = find_display (dpy);
xXF86MiscQueryVersionReply rep;
@@ -119,9 +114,7 @@ XF86MiscSetClientVersion(Display *dpy)
return True;
}
-Bool XF86MiscGetMouseSettings(dpy, mouseinfo)
- Display* dpy;
- XF86MiscMouseSettings *mouseinfo;
+Bool XF86MiscGetMouseSettings(Display* dpy, XF86MiscMouseSettings *mouseinfo)
{
XExtDisplayInfo *info = find_display (dpy);
xXF86MiscGetMouseSettingsReply rep;
@@ -165,9 +158,7 @@ Bool XF86MiscGetMouseSettings(dpy, mouseinfo)
return True;
}
-Bool XF86MiscGetKbdSettings(dpy, kbdinfo)
- Display* dpy;
- XF86MiscKbdSettings *kbdinfo;
+Bool XF86MiscGetKbdSettings(Display* dpy, XF86MiscKbdSettings *kbdinfo)
{
XExtDisplayInfo *info = find_display (dpy);
xXF86MiscGetKbdSettingsReply rep;
@@ -195,9 +186,7 @@ Bool XF86MiscGetKbdSettings(dpy, kbdinfo)
return True;
}
-Bool XF86MiscSetMouseSettings(dpy, mouseinfo)
- Display* dpy;
- XF86MiscMouseSettings *mouseinfo;
+Bool XF86MiscSetMouseSettings(Display* dpy, XF86MiscMouseSettings *mouseinfo)
{
XExtDisplayInfo *info = find_display (dpy);
xXF86MiscSetMouseSettingsReq *req;
@@ -235,9 +224,7 @@ Bool XF86MiscSetMouseSettings(dpy, mouseinfo)
return True;
}
-Bool XF86MiscSetKbdSettings(dpy, kbdinfo)
- Display* dpy;
- XF86MiscKbdSettings *kbdinfo;
+Bool XF86MiscSetKbdSettings(Display* dpy, XF86MiscKbdSettings *kbdinfo)
{
XExtDisplayInfo *info = find_display (dpy);
xXF86MiscSetKbdSettingsReq *req;
@@ -258,9 +245,7 @@ Bool XF86MiscSetKbdSettings(dpy, kbdinfo)
return True;
}
-int XF86MiscSetGrabKeysState(dpy, enable)
- Display* dpy;
- Bool enable;
+int XF86MiscSetGrabKeysState(Display* dpy, Bool enable)
{
XExtDisplayInfo *info = find_display (dpy);
xXF86MiscSetGrabKeysStateReply rep;
@@ -284,9 +269,7 @@ int XF86MiscSetGrabKeysState(dpy, enable)
return rep.status;
}
-Bool XF86MiscGetFilePaths(dpy, filpaths)
- Display* dpy;
- XF86MiscFilePaths *filpaths;
+Bool XF86MiscGetFilePaths(Display* dpy, XF86MiscFilePaths *filpaths)
{
XExtDisplayInfo *info = find_display (dpy);
xXF86MiscGetFilePathsReply rep;
@@ -354,12 +337,9 @@ Bool XF86MiscGetFilePaths(dpy, filpaths)
return True;
}
-Status XF86MiscPassMessage(dpy, screen, msgtype, msgval, retmsg)
- Display* dpy;
- int screen;
- const char* msgtype;
- const char* msgval;
- char** retmsg;
+Status XF86MiscPassMessage(Display* dpy, int screen,
+ const char* msgtype, const char* msgval,
+ char** retmsg)
{
XExtDisplayInfo *info = find_display (dpy);
xXF86MiscPassMessageReply rep;
commit 6bc07578f11eecb1c67a6dd28861a0cbc03621c6
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 08:49:52 2008 +0100
nuke RCS Ids
diff --git a/man/Makefile.am b/man/Makefile.am
index 262fb31..4e1b1a4 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit b3b1c2f578fd68b3cea689876acf68807e2cb03a
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:38:46 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index a866050..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,59 +0,0 @@
-2006-04-26 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Bump to 1.0.1
-
-2006-02-12 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * man/Makefile.am:
- Bug #5628 <https://bugs.freedesktop.org/show_bug.cgi?id=5628>
- Shadow pages not created correctly when MANDIR & MANSUFFIX don't match.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-02 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- * src/Makefile.am:
- Add check and cflags for malloc(0) returning NULL.
-
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * xxf86misc.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-11 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * configure.ac:
- * man/Makefile.am:
- Use sed to put version number in man page
- Add shadow man pages for man pages that document multiple functions.
-
-2005-07-08 Keith Packard <keithp@keithp.com>
-
- * .cvsignore:
- * man/.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 cdfbd95..d80a181 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,3 +4,13 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xxf86misc.pc
EXTRA_DIST = xxf86misc.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 f4ed7977e3bd5a60df0d5df089a613462c04dc3f
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:53:51 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index b40641f..64b9b9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ Makefile.in
missing
mkinstalldirs
xxf86misc.pc
+*~
Reply to: