x11proto-fontcache: Changes to 'upstream-unstable'
.gitignore | 4 ++++
ChangeLog | 4 ----
Makefile.am | 12 +++++++++++-
README | 24 ++++++++++++++++++++++++
configure.ac | 7 +++++--
5 files changed, 44 insertions(+), 7 deletions(-)
New commits:
commit 79b075876c6874f1ad6605962973f2865b2a082a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 2 19:30:03 2009 -0700
fontcacheproto 0.1.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index d49c4a5..774933e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([FontcacheProto], [0.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([FontcacheProto], [0.1.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_DEFAULT_OPTIONS
commit 7c8e261c218ff5c0a2806a429725dba437241970
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 2 19:26:08 2009 -0700
Add pointers to mailing list, git repo, and wiki to README
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/README b/README
new file mode 100644
index 0000000..fe3acc9
--- /dev/null
+++ b/README
@@ -0,0 +1,24 @@
+
+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/proto/fontcacheproto
+
+ http://cgit.freedesktop.org/xorg/proto/fontcacheproto
+
+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 6388965137d61913cbb1b8b3b718e6fd359052cc
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 2 19:20:34 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 e651af7..d49c4a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,10 @@ AC_PREREQ([2.57])
AC_INIT([FontcacheProto], [0.1.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
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
AC_OUTPUT([Makefile
fontcacheproto.pc])
commit 211eb4c16534f83527df992c4f68936254455e7b
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 9d56da6..8bb07ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ install-sh
missing
fontcacheproto.pc
*~
+fontcacheproto-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index b0ad38a..c7d1b45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ fontcache_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fontcacheproto.pc
-EXTRA_DIST = autogen.sh fontcacheproto.pc.in
+EXTRA_DIST = fontcacheproto.pc.in
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
@@ -15,6 +15,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 24e9808..e651af7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,11 @@ AC_PREREQ([2.57])
AC_INIT([FontcacheProto], [0.1.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
fontcacheproto.pc])
commit a3055497adbbdf626db22176cedb7795e5684567
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:39:00 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 77328db..b0ad38a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,3 +8,13 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fontcacheproto.pc
EXTRA_DIST = autogen.sh fontcacheproto.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 f4d701aa7c2d2ece96e3701747cedaee0ad57a44
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:54:03 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index 554145d..9d56da6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ configure
install-sh
missing
fontcacheproto.pc
+*~
Reply to: