From e6392f4199532cfd61195e45b784a252879e4750 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@evo.keithp.com>
Date: Fri, 24 Feb 2006 02:15:27 +0100
Subject: Import changes from X.org repository

---
 .cvsignore        | 11 -----------
 .gitignore        | 11 +++++++++++
 ChangeLog         |  5 +++++
 Makefile.am       | 17 ++++++++---------
 configure.ac      |  9 ++++-----
 damageproto.pc.in |  6 +++---
 6 files changed, 31 insertions(+), 28 deletions(-)
 delete mode 100644 .cvsignore
 create mode 100644 .gitignore

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 48b24e3..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.log
-config.status
-configure
-damageext.pc
-install-sh
-missing
-mkinstalldirs
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..48b24e3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.log
+config.status
+configure
+damageext.pc
+install-sh
+missing
+mkinstalldirs
diff --git a/ChangeLog b/ChangeLog
index 62259e7..7f7620c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* configure.ac:
+	Update package version for X11R7 release.
+
 2005-01-16  Chris Larson <kergoth@handhelds.org>
 
 	* configure.ac: Fix to work with automake 1.9.x.
diff --git a/Makefile.am b/Makefile.am
index d4cd49b..726f5f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,17 +21,16 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-damageextincludedir = $(includedir)/X11/extensions
-damageextinclude_HEADERS = 	\
-	damageproto.h		\
+damagedir = $(includedir)/X11/extensions
+damage_HEADERS = \
+	damageproto.h \
 	damagewire.h
 
-
-damageextdocdir = $(datadir)/doc/damageext
-damageextdoc_DATA = protocol
-
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = damageext.pc
+pkgconfig_DATA = damageproto.pc
+
+damagedocdir = $(datadir)/doc/Damage
+damagedoc_DATA = protocol
 
-EXTRA_DIST = autogen.sh damageext.pc.in $(damageextdoc_DATA)
+EXTRA_DIST = autogen.sh damageproto.pc.in $(damagedoc_DATA)
 
diff --git a/configure.ac b/configure.ac
index 5ee310d..ce4e579 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,13 +24,12 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT([damageext], [1.0], [keithp@keithp.com], damageext)
-AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_INIT([DamageProto], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-PKG_CHECK_MODULES(FIXESEXT, fixesext)
+XORG_RELEASE_VERSION
 
 AC_OUTPUT([Makefile
-           damageext.pc])
+           damageproto.pc])
 
diff --git a/damageproto.pc.in b/damageproto.pc.in
index 079f039..25476b9 100644
--- a/damageproto.pc.in
+++ b/damageproto.pc.in
@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: DamageExt
-Description: X Damage extension headers
+Name: DamageProto
+Description: Damage extension headers
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @FIXESEXT_CFLAGS@
+Cflags: -I${includedir}
-- 
cgit v1.2.1