README shipped; Changelog added.

diff --git a/Changelog b/Changelog
new file mode 100644 (file)
index 0000000..bf4c27d
--- /dev/null
+++ b/Changelog
@@ -0,0 +1,16 @@
+userv (0.55.1); urgency=low
+
+  * README file now shipped.
+  * Added this Changelog, and configure gets version number from it.
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Sun, 21 Sep 1997 23:58:32 +0100
+
+userv (0.55)
+
+  * Initial release
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Sun, 21 Sep 1997 23:52:50 +0100
+
+# Local variables:
+# mode: debian-changelog
+# End:

diff --git a/Makefile.in b/Makefile.in
index 2b2e0d9fe06fbfd9b23414dd8f1f9f254d055ad2..337858dd88104b8924c9be96cc91cd56bb73faa2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,7 +16,7 @@
 #  along with userv; if not, write to the Free Software
 #  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-VERSION=0.55
+VERSION=@VERSION@
 
 CC=@CC@
 CFLAGS=@CFLAGS@ $(XCFLAGS) -DVERSION='"$(VERSION)"'
@@ -44,9 +44,10 @@ SOURCES=     Makefile.in configure.in acconfig.h                     \
                overlord.c process.c servexec.c                         \
                daemon.h debug.c parser.c lib.c lib.h                   \
                language.i4 lexer.l.m4 tokens.h.m4
-ALSOSHIP=      system.default system.override \
+ALSOSHIP=      README INSTALL Changelog COPYING \
+               system.default system.override \
                spec.sgml.in overview.fig overview.ps \
-               COPYING INSTALL buildship install-sh .cvsignore
+               buildship install-sh .cvsignore
 GENSHIP=       lexer.l lexer.c tokens.h configure config.h.in \
                spec.sgml spec.html spec.ps overview.ps
 

diff --git a/buildship b/buildship
index 84cde9218afeeedec51297f9ea263455601b2cdf..e10562b2c09eba7ca89e416f3976f00ecb2f7bc7 100755 (executable)
--- a/buildship
+++ b/buildship
@@ -2,7 +2,7 @@
 # to release, check out a fresh copy and then run this
 
 set -e
-version=`sed -n 's/^VERSION=\(.*\) *$/\1/p' Makefile.in`
+version="`sed -n '/^userv (.*)/!d; s/^userv (//; s/).*//; p; q' Changelog`"
 targz=userv-$version.tar.gz
 tag=`echo release-$version | sed -e 's/\./-/g'`
 

diff --git a/configure.in b/configure.in
index fb5a128a2b7f052aaa11907b453c0e2343df551d..86ce18feb3e64dc1d3865ed24cfc0e74357e4c34 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -130,4 +130,8 @@ if test "${GCC-no}" = yes; then
 fi
 [CFLAGS="`echo $CFLAGS $CWARNS | sed -e 's/-O[0-9]*/$(OPTIMISE)/'`"]
 
+AC_SUBST(VERSION)
+VERSION="`sed -n '/^userv (.*)/!d; s/^userv (//; s/).*//; p; q' Changelog`"
+echo will build version $VERSION
+
 AC_OUTPUT(Makefile)