x11proto-resource: Changes to 'upstream-unstable'
.gitignore | 4 ++++
ChangeLog | 4 ----
Makefile.am | 12 +++++++++++-
XResproto.h | 1 -
configure.ac | 6 +++++-
5 files changed, 20 insertions(+), 7 deletions(-)
New commits:
commit 11843ce15572214833063a26ac87a2fa6ab74bca
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 25 16:13:15 2009 +1000
resourceproto 1.1.0
diff --git a/configure.ac b/configure.ac
index 443af33..ea4b061 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([ResourceProto], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([ResourceProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CHANGELOG
commit 2388aa12158fca3d8c38ee59ecc5cf35eafa7d57
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 25 16:29:38 2009 +1000
Remove RCS tags.
diff --git a/XResproto.h b/XResproto.h
index 2f5563b..9c2abd4 100644
--- a/XResproto.h
+++ b/XResproto.h
@@ -1,7 +1,6 @@
/*
Copyright (c) 2002 XFree86 Inc
*/
-/* $XFree86: xc/include/extensions/XResproto.h,v 1.1 2002/03/04 19:31:35 mvojkovi Exp $ */
#ifndef _XRESPROTO_H
#define _XRESPROTO_H
commit 0a4fd7fc0cf0f56fbe112bd14725560adfa67b73
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Jan 27 20:06:28 2009 -0200
Janitor: Correct make distcheck and dont distribute autogen.sh
diff --git a/.gitignore b/.gitignore
index 4c1936c..92eae22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ install-sh
missing
resourceproto.pc
*~
+resourceproto-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index e2df548..1a96794 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ resource_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = resourceproto.pc
-EXTRA_DIST = autogen.sh resourceproto.pc.in
+EXTRA_DIST = resourceproto.pc.in
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
@@ -13,6 +13,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 2ca4646..443af33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,11 @@ AC_PREREQ([2.57])
AC_INIT([ResourceProto], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+# 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)
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
resourceproto.pc])
commit 40fded7637faa3548052cbf419d48ea081b1b5cb
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:39:06 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index c722b51..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
diff --git a/Makefile.am b/Makefile.am
index 65ebd56..e2df548 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,3 +6,13 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = resourceproto.pc
EXTRA_DIST = autogen.sh resourceproto.pc.in
+
+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 2740cf052e07fef8808991863409829bab22f016
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:54:15 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index e6dd0d9..4c1936c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ configure
install-sh
missing
resourceproto.pc
+*~
Reply to: