diff options
| author | Keith Packard <keithp@evo.keithp.com> | 2006-02-24 02:15:27 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@evo.keithp.com> | 2006-02-24 02:15:27 +0100 |
| commit | e6392f4199532cfd61195e45b784a252879e4750 (patch) | |
| tree | a5f27720df2be6974170519b53423ab75aaaa9b4 | |
| parent | 1a28d9a791ed918172286110e0dcffe458489b1a (diff) | |
| download | xorg-proto-damageproto-e6392f4199532cfd61195e45b784a252879e4750.tar.gz | |
Import changes from X.org repository
| -rw-r--r-- | .gitignore (renamed from .cvsignore) | 0 | ||||
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 17 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | damageproto.pc.in | 6 |
5 files changed, 20 insertions, 17 deletions
@@ -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} |