import appres version 1.0.1

2007-03-03 10:19:00 +00:00 · 2007-03-03 10:19:00 +00:00 · a00bce1d44
commit a00bce1d44
parent 45c07b00ec
6 changed files with 213 additions and 19 deletions
--- a/app/appres/ChangeLog
+++ b/app/appres/ChangeLog
@ -1,25 +1,188 @@
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 85be6045ff92bb02d6516f1348fe01c9fa596826
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Jan 22 18:05:40 2007 -0800

-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    Version bump: 1.0.1

-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 9e489e45820f59461a897f889d3cb32307166937
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Jan 2 14:22:47 2007 -0800

-	* Makefile.am:
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+    Replace static ChangeLog with dist-hook to generate from git log

-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 88deaf1f2fdfee347331de6b589a28552d9c3dbd
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Jan 2 13:56:37 2007 -0800

-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
+    Add *~ to .gitignore

-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 777d0667ad74adbd33a523a67aa039092562c0f0
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Jan 2 13:45:01 2007 -0800

-	* configure.ac:
-	Update package version number for RC1 release.
+    renamed: .cvsignore -> .gitignore

-2005-09-23  Kristian Høgsberg  <krh@redhat.com>
+commit 8609dd477c39b0e28a152ca2406156074d673564
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date:   Tue Jan 2 13:42:43 2007 -0800

-	* AUTHORS:
-	* COPYING:
-	* README: Add some content to these.
+    Bug 9510: Unbalanced group in command synopis in appres.1 man page
+    
+    <https://bugs.freedesktop.org/show_bug.cgi?id=9510>
+
+commit 2b4940097934165ce6c195d5d01ed7dde7be2dbf
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:01 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit fc5462bc53e9dcb216861a3fddc4974106761712
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Dec 6 22:48:15 2005 +0000
+
+    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit cf84153a21b01c254932a241700d61cf59eaeda4
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:14 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit 4f49292876806a5d3a01c6d67705175421a9ff08
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Nov 28 22:01:36 2005 +0000
+
+    Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+        update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 91673d2a3296bfc8facecd1f64d96f4497ddf87c
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Mon Nov 21 10:34:54 2005 +0000
+
+    Another pass at .cvsignores for apps.
+
+commit 3077b85aded5db9dda7840487a9e57027a7bf705
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Sun Nov 20 22:08:47 2005 +0000
+
+    Add/improve .cvsignore files for apps.
+
+commit c083eb4a05060b1a4cadb86c0c8b4ec47fa5388f
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Oct 18 22:00:42 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit 1709f7d3d390848f629c860a7de2986b3583448c
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Oct 17 23:56:18 2005 +0000
+
+    Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+        work better with BSD make
+
+commit 33f5d2737a2d85b643e8f208bbef89c6474d561e
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Fri Oct 14 00:25:40 2005 +0000
+
+    Use sed to fill in variables in man page
+
+commit 61d84d9c527921b252706b251ce29caac4eb5ad4
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Fri Sep 23 20:34:52 2005 +0000
+
+    Add some content to these.
+
+commit f2b72b79fbac8ed885d1cb8823cc500a91aa7408
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Aug 1 20:25:27 2005 +0000
+
+    Install man pages to section 1 instead of section m (Patch from Donnie
+        Berkholz)
+
+commit c6545e9800143613082d86cb3f428fc06e00fa09
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:28 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 11e6dfcc25a1d4a05323ea81cf69e217b5c854da
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Jul 27 00:38:04 2005 +0000
+
+    Include the man page when making dist
+
+commit 130050b5985f1de5990f20cc36cc98db7cc6ffb1
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Wed Jul 20 19:31:47 2005 +0000
+
+    Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+        configure cache, you cache it, and the cached value is probably wrong.
+
+commit 12bd22f44d4cd3864f87aeb371dce2307c2eb884
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Fri Jul 1 16:55:14 2005 +0000
+
+    More freedestkop->freedesktop typo fixes
+
+commit e6418cf03e9a7f835a7ee7d958ea6a1d4318f7b5
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Wed Jun 22 23:52:44 2005 +0000
+
+    - Add script that can generate the build system for applications
+    - Add build system for appres
+
+commit 0bb4b31a8aa87da2b2e859780d8d6a6cf7a1db77
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 19:54:31 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit c193a35e00d0ce9ad263e608d421b951ff180022
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:34:49 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 9973841b4c8d7ef87f82ce27c37c823874a68d09
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:12:50 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 6c0fcbd7434381151c9dbc2f14d43253b21dbf79
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:36:15 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit a4fcf5e1478051ccf213151696d3dbae7ab64e41
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:23:53 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 8d41f164a8c99099d7a81e2e0e6d236a23073014
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Tue Nov 25 19:29:01 2003 +0000
+
+    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit d5ef6e985dca01181d021567255d5c212585213c
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:57 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 541fcb6c9e1bbf65885b1c2c2e27609544fe62d6
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 15:54:52 2003 +0000
+
+    R6.6 is the Xorg base-line
--- a/app/appres/Makefile.am
+++ b/app/appres/Makefile.am
@ -34,9 +34,18 @@ appmandir = $(APP_MAN_DIR)

 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)

-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
 CLEANFILES = $(appman_DATA)

+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
+
 SED = sed

 # Strings to replace in man pages
--- a/app/appres/appres.man
+++ b/app/appres/appres.man
@ -30,7 +30,7 @@
 appres \- list X application resource database
 .SH SYNOPSIS
 .B "appres"
-[[class [instance]] [\-1] [toolkitoptions] 
+[class [instance]] [\-1] [toolkitoptions] 
 .SH DESCRIPTION
 .PP
 The \fIappres\fP program prints the resources seen by an application
--- a/app/appres/autogen.sh
+++ b/app/appres/autogen.sh
@ -0,0 +1,13 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
+
--- a/app/appres/config.h.in
+++ b/app/appres/config.h.in
@ -18,5 +18,14 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION

+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
 /* Version number of package */
 #undef VERSION
--- a/app/appres/configure.ac
+++ b/app/appres/configure.ac
@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.

 AC_PREREQ([2.57])
-AC_INIT(appres,[1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],appres)
+AC_INIT(appres,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],appres)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE