Update VERSION

[secnet.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index d3394444ec949d8c1a943bc7a59b0de0436e5ede..ecc6f27ed04a02649b310372a46a04fe24f4ebd2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:        all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.1.18
+VERSION:=0.2.1
 
 @SET_MAKE@
 
@@ -48,6 +48,7 @@ exec_prefix:=@exec_prefix@
 sbindir:=@sbindir@
 sysconfdir:=@sysconfdir@
 transform:=@program_transform_name@
+mandir:=@mandir@
 
 TARGETS:=secnet
 
@@ -57,30 +58,6 @@ OBJECTS:=secnet.o util.o conffile.yy.o conffile.tab.o conffile.o modules.o \
        process.o @LIBOBJS@ \
        hackypar.o
 
-DISTDIRS:=debian
-DISTFILES:=BUGS COPYING CREDITS INSTALL LICENSE.txt Makefile.in \
-       NEWS NOTES README TODO \
-       setup.mac uk.org.greenend.secnet.plist README.mac \
-       ac_prog_cc_no_writeable_strings.m4 \
-       conffile.c conffile.fl conffile.h conffile.y \
-       conffile_internal.h \
-       config.h.in configure \
-       configure.in depend.sh dh.c \
-       example.conf \
-       getopt.c getopt1.c getopt.h \
-       install-sh ipaddr.c ipaddr.h ipaddr.py linux log.c \
-       magic.h md5.c md5.h \
-       make-secnet-sites \
-       modules.c netlink.c netlink.h process.c process.h \
-       random.c resolver.c rsa.c \
-       secnet.c secnet.h serpent.c serpent.h serpentsboxes.h \
-       snprintf.c snprintf.h \
-       sha1.c site.c slip.c stamp-h.in transform.c tun.c udp.c \
-       unaligned.h util.c util.h \
-       hackypar.c hackypar.h
-DISTSUBDIRS:=debian/copyright debian/changelog debian/control \
-       debian/init debian/rules debian/compat debian/default
-
 %.c:   %.y
 
 %.yy.c:        %.fl
@@ -140,11 +117,15 @@ version.c: Makefile
        echo "char version[]=\"secnet $(VERSION)\";" >>$@.new
        mv -f $@.new $@
 
-install: all
+installdirs:
        $(INSTALL) -d $(prefix)/share/secnet $(sbindir)
+       $(INSTALL) -d $(mandir)/man8
+
+install: installdirs
        $(INSTALL_PROGRAM) secnet $(sbindir)/`echo secnet|sed '$(transform)'`
        $(INSTALL_PROGRAM) ${srcdir}/make-secnet-sites $(sbindir)/`echo make-secnet-sites|sed '$(transform)'`
        $(INSTALL) ${srcdir}/ipaddr.py $(prefix)/share/secnet/ipaddr.py
+       $(INSTALL) secnet.8 $(mandir)/man8/secnet.8
 
 clean:
        $(RM) -f *.o *.yy.c *.tab.[ch] $(TARGETS) core version.c
@@ -158,12 +139,44 @@ realclean:        clean
 distclean:     realclean
 
 pfname:=$(PACKAGE)-$(VERSION)
+tarfname:=../$(pfname).tar
 dist:
-       $(RM) -rf $(pfname)
-       mkdir $(pfname)
-       for i in $(DISTDIRS) ; do mkdir $(pfname)/$$i ; done
-       for i in $(DISTFILES) ; do ln -s ../$(srcdir)/$$i $(pfname)/ ; done
-       for i in $(DISTSUBDIRS) ; do ln -s ../../$(srcdir)/$$i $(pfname)/$$i ; done
-       tar hcf ../$(pfname).tar --exclude=CVS --exclude=.cvsignore $(pfname)
-       gzip -9f ../$(pfname).tar
-       $(RM) -rf $(pfname)
+       $(RM) -rf $(tarfname) $(tarfname).gz
+       git archive --format=tar --prefix=$(pfname)/ HEAD -o $(tarfname)
+       gzip -9f $(tarfname)
+
+# Release checklist:
+#  1. Check that the tree has what you want
+#
+#  2. Update VERSION (above) and debian/changelog
+#     but DO NOT COMMIT
+#
+#  3. Run
+#       ./configure
+#       make dist
+#     and check that the resulting tarball looks OK.
+#     Eg, untar it and build it, or have it reviewed.
+#
+#  3. Commit the updates to VERSION (above) and debian/changelog
+#
+#  4. git-tag -s v$(VERSION)
+#
+#  5. git-push origin
+#
+#  6. gpg --detach-sign ../secnet-$(VERSION).tar.gz
+#
+#  7. rsync -v ../secnet-$VERSION.tar.gz* \
+#        chiark:/home/ianmdlvl/public-html/secnet/download/
+#
+#  8. On chiark:
+#       tar zxf ~ianmdlvl/public-html/secnet/download/secnet-$(VERSION).tar.gz
+#       cd secnet-$(VERSION)
+#       debian/rules build
+#       fakeroot debian/rules binary
+#       cp ../secnet_0.1.18.1-1_i386.deb ~/public-html/secnet/download/
+#
+#  9. On chiark as user secnet:
+#       cd ~secnet/
+#       rsync ~ianmdlvl/public-html/secnet/download/secnet* .
+#
+#  9. write and post a release announcement