From 2d2b1980fbe7746624fac3de96a35fb7da7ef16d Mon Sep 17 00:00:00 2001 From: james Date: Wed, 27 Feb 2008 15:17:55 +0000 Subject: [PATCH 1/1] *** empty log message *** --- Makefile.am | 16 +++++++++++++--- configure.in | 4 +++- maintainer/tag | 11 ++++++++++- version-md5sums | 1 + version-micro | 2 +- 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3022ef0..e341690 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,9 @@ # $Id$ # # $Log$ +# Revision 1.5 2008/02/27 15:17:55 james +# *** empty log message *** +# # Revision 1.4 2008/02/27 15:04:32 james # *** empty log message *** # @@ -30,7 +33,11 @@ man1_MANS=sympathy.man bin_SCRIPTS = libsympathy-config clean-local: - -rm -f libsympathy-config version.sed + -rm -f libsympathy-config version.sed sympathy.man + +sympathy.man: sympathy.man.src version.sed + @SED@ -f version.sed < sympathy.man.src > sympathy.man || rm -f sympathy.man + libsympathy-config.src:libsympathy-config.src.in libsympathy-config:libsympathy-config.src version.sed @@ -43,17 +50,20 @@ VF=${shell cat ${VFD}/version-files} VFS=${VF:%=${VFD}/%} VCHK=${shell cat ${VFS} | @MD5SUM@ | @AWK@ '{print $$1 }' } VNUM=${shell @GREP@ ${VCHK} ${VFD}/version-md5sums | @AWK@ '{ print $$2 }' } +VSTP=${shell @GREP@ ${VCHK} ${VFD}/version-stamps | @AWK@ '{ print $$2 }' } VDEF=${shell echo `cat ${VFD}/version-major`.`cat ${VFD}/version-minor`.`cat ${VFD}/version-micro` } -EXTRA_DIST=version-files version-major version-minor version-micro version-md5sums +EXTRA_DIST=version-files version-major version-minor version-micro version-md5sums version-stamps version.sed: $(VFD)/version-files $(VFD)/version-major \ $(VFD)/version-minor $(VFD)/version-micro \ - $(VFD)/version-md5sums ${VFS} Makefile + $(VFD)/version-md5sums $(VFD)/version-stamps ${VFS} Makefile if [ .${VNUM} = . ]; then \ echo "s/%VERSION%/${VDEF}-E/g" > version.sed; \ + echo "s/%VERSION%/After ${VSTP}/g" > version.sed; \ else \ echo "s/%VERSION%/${VNUM}/g" > version.sed; \ + echo "s/%VERSIONSTAMP%/${VSTP}/g" > version.sed; \ fi protos: diff --git a/configure.in b/configure.in index 2cb5773..89f2fae 100644 --- a/configure.in +++ b/configure.in @@ -8,6 +8,9 @@ dnl dnl $Id$ dnl dnl $Log$ +dnl Revision 1.4 2008/02/27 15:17:56 james +dnl *** empty log message *** +dnl dnl Revision 1.3 2008/02/27 15:04:32 james dnl *** empty log message *** dnl @@ -134,6 +137,5 @@ AC_OUTPUT([Makefile src/sympathy.h.head test/Makefile apps/Makefile - sympathy.man libsympathy-config.src],[chmod +x libsympathy-config.src]) diff --git a/maintainer/tag b/maintainer/tag index 7da9b6b..fb3a72c 100755 --- a/maintainer/tag +++ b/maintainer/tag @@ -8,6 +8,12 @@ # $Id$ # # $Log$ +# Revision 1.4 2008/02/27 15:17:56 james +# *** empty log message *** +# +# Revision 1.3 2008/02/27 09:50:15 james +# *** empty log message *** +# # Revision 1.2 2008/02/27 09:49:25 james # *** empty log message *** # @@ -35,7 +41,10 @@ MICRO=$[ `cat version-micro` + 1 ] echo $MICRO > version-micro +STP=`date '+"%B %d, %Y"'` + echo "$CHK ${MAJOR}.${MINOR}.${MICRO}" >> version-md5sums +echo "$STP ${MAJOR}.${MINOR}.${MICRO}" >> version-stamps cvs commit -m "" -cvs tag libsympathy-$MAJOR_$MINOR_$MICRO . +cvs tag libsympathy-${MAJOR}_${MINOR}_${MICRO} . diff --git a/version-md5sums b/version-md5sums index da376e0..6ecfd40 100644 --- a/version-md5sums +++ b/version-md5sums @@ -5,3 +5,4 @@ ac9d93b50970b366e4531b4ea5a1c986 1.1.0 0ea0fc96142920321bfa5354dc6b9da9 1.1.1 b1b1d8caa83556877bb96487f0c6a934 1.1.2 f844259e45d571cf913580d8851ee261 1.1.3 +88cd008326dcedb9dee8011ce2697e6a 1.1.4 diff --git a/version-micro b/version-micro index 00750ed..b8626c4 100644 --- a/version-micro +++ b/version-micro @@ -1 +1 @@ -3 +4 -- 2.30.2