.gitignore | 4 +
ChangeLog | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
Makefile.am | 12 +++-
README | 24 ++++++++
configure.ac | 7 +-
debian/changelog | 9 +++
debian/compat | 2
debian/control | 3 -
8 files changed, 217 insertions(+), 9 deletions(-)
New commits:
commit 76d2b4053b428ded17ff96e6ac583f13fdbd66e2
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Fri Nov 20 17:40:28 2009 +0200
Update the ChangeLog.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..70753a2
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,163 @@
+commit 79b075876c6874f1ad6605962973f2865b2a082a
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Fri Oct 2 19:30:03 2009 -0700
+
+ fontcacheproto 0.1.3
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
+
+commit 7c8e261c218ff5c0a2806a429725dba437241970
+Author: Alan Coopersmith <alan.coopersm...@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.coopersm...@sun.com>
+
+commit 6388965137d61913cbb1b8b3b718e6fd359052cc
+Author: Alan Coopersmith <alan.coopersm...@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.coopersm...@sun.com>
+
+commit 211eb4c16534f83527df992c4f68936254455e7b
+Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
+Date: Tue Jan 27 20:06:28 2009 -0200
+
+ Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit a3055497adbbdf626db22176cedb7795e5684567
+Author: James Cloos <cl...@jhcloos.com>
+Date: Thu Dec 6 16:39:00 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit f4d701aa7c2d2ece96e3701747cedaee0ad57a44
+Author: James Cloos <cl...@jhcloos.com>
+Date: Mon Sep 3 05:54:03 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 7e722460a355cbf22d554c7cfc69e7ce03454f06
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Fri Jul 14 18:56:13 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit a51ca6a8a428b5be64dc5ad0ad13ff29350768ca
+Author: Kevin E Martin <k...@kem.org>
+Date: Thu Dec 15 00:24:37 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit cc6820d803058730369b94f0b62d590d309355cc
+Author: Kevin E Martin <k...@kem.org>
+Date: Wed Oct 19 02:48:14 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit edf62f591f28a217b9bc0781e118ce6f762c3fcb
+Author: Eric Anholt <anh...@freebsd.org>
+Date: Tue Aug 2 19:19:38 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit 455a177ede4620d9effa1fb167a9e07e747ebd48
+Author: Kevin E Martin <k...@kem.org>
+Date: Fri Jul 29 21:22:55 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 83c131b8611f32f9a292a629d13629c6200b5984
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Sat May 21 03:50:53 2005 +0000
+
+ Change version to 0.1.
+
+commit 1bee3aeab31877963efc323700e19aa259520c88
+Author: Adam Jackson <a...@nwnk.net>
+Date: Thu May 19 00:22:39 2005 +0000
+
+ revert last change, didn't do right thing at all, sorry for the noise
+
+commit 5901343a49c424da552a7ef40b53d01b1b77b291
+Author: Adam Jackson <a...@nwnk.net>
+Date: Thu May 19 00:10:17 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit 6da9cb33ea4b587f47fcb0a4e086943afb5f6039
+Author: Josh Triplett <j...@speakeasy.net>
+Date: Sat May 14 08:39:45 2005 +0000
+
+ Add COPYING file for Fontcache.
+
+commit 32157c7dc40ecf148db657ee8e6c01cf4e23ebb4
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Date: Mon May 9 18:20:04 2005 +0000
+
+ Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit 4653ec6e4e4f1917eb374c5ca8211993c76e643d
+Author: Kevin E Martin <k...@kem.org>
+Date: Fri May 6 01:46:30 2005 +0000
+
+ Initial build system files for proto module.
+
+commit cc2328e65469115c32617c2c7434e5110e383d4c
+Author: Egbert Eich <e...@suse.de>
+Date: Fri Apr 23 18:43:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit e15f038c34265c2f984be29b4323786362f3724e
+Author: Egbert Eich <e...@suse.de>
+Date: Sun Mar 14 08:31:36 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 47edd8743037411048cf5122eb911b916ccf2fba
+Author: Egbert Eich <e...@suse.de>
+Date: Wed Mar 3 12:10:54 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 5f059cd0b8c545917405b434ae570a57a31c0267
+Author: Egbert Eich <e...@suse.de>
+Date: Thu Feb 26 13:35:13 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 0bd7bac3ccb3ef436ff8f306ec03cac6252e210d
+Author: Egbert Eich <e...@suse.de>
+Date: Thu Feb 26 09:22:28 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit e9dacf494c059dc3e66a564378679146ff55ed3e
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Tue Nov 25 19:28:02 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit fd314bc875543d6f017cc1910f97e2e723248770
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Fri Nov 14 16:48:43 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit d5552d5100a83653e00cd0f5296dc4557e52754a
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Fri Nov 14 16:48:43 2003 +0000
+
+ Initial revision
commit 031e62eed62a3c6b94e9d08fc8730b1b05fa81c1
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Fri Nov 20 16:58:42 2009 +0200
Drop Pre-Depends on x11-common. This was needed for upgrades from sarge.
diff --git a/debian/changelog b/debian/changelog
index e161837..a411285 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11proto-fontcache (0.1.3-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.3.
* Bump debhelper compat level to 5.
+ * Drop Pre-Depends on x11-common. This was needed for upgrades from sarge.
-- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 20 Nov 2009 16:05:07 +0200
diff --git a/debian/control b/debian/control
index 84b2ce9..5d6d779 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/proto/x11proto-fontcache.git
Package: x11proto-fontcache-dev
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: x11-common (>= 1:7.0.0)
Description: X11 font cache extension wire protocol
This package provides development headers describing the wire protocol
for the Fontcache extension, used to configure the caching of core fonts.
commit 32da19a32b991cc7594a17a2b57ac99a1b7788d8
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Fri Nov 20 16:52:13 2009 +0200
Bump debhelper compat level to 5.
diff --git a/debian/changelog b/debian/changelog
index 7684d42..e161837 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11proto-fontcache (0.1.3-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.3.
+ * Bump debhelper compat level to 5.
-- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 20 Nov 2009 16:05:07 +0200
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
commit e40aa561b09fa9d77e95668a20386697bf9cf384
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Fri Nov 20 16:51:44 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index e38e35d..7684d42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x11proto-fontcache (0.1.3-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 20 Nov 2009 16:05:07 +0200
diff --git a/debian/control b/debian/control
index 22c097d..84b2ce9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Andres Salomon
<dilin...@debian.org>, Julien Cristau <jcris...@debian.org>
Build-Depends: debhelper (>= 4.0.0)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-fontcache
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-fontcache.git
commit da47ff1c3d668c0077f2a3ad351bb7e8956d6ed8
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Fri Nov 20 16:51:22 2009 +0200
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index a674c48..e38e35d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-fontcache (0.1.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 20 Nov 2009 16:05:07 +0200
+
x11proto-fontcache (0.1.2-5) unstable; urgency=low
[ Brice Goglin ]
commit 79b075876c6874f1ad6605962973f2865b2a082a
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri Oct 2 19:30:03 2009 -0700
fontcacheproto 0.1.3
Signed-off-by: Alan Coopersmith <alan.coopersm...@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.coopersm...@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.coopersm...@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.coopersm...@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.coopersm...@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 <p...@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 <cl...@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 <cl...@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
+*~
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
