Finalise 0.4.5

[secnet.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7ac915a182a536cf182257ae6ac1418900e588fe..c7f437bf51ca8a1e99f8838dee4052df01c4c5c8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,7 +5,7 @@
 #
 # secnet is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version d of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # secnet is distributed in the hope that it will be useful, but
@@ -20,7 +20,7 @@
 .PHONY:        all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.4.0~beta1
+VERSION:=0.4.5
 
 @SET_MAKE@
 
@@ -127,6 +127,8 @@ conffile.yy.h:      conffile.yy.c
 conffile.tab.c:        conffile.y
 # End of manual dependencies section
 
+conffile.yy.o: ALL_CFLAGS += -Wno-sign-compare
+
 secnet:        $(OBJECTS)
        $(MAKE) version.o # *.o $(filter-out %.o, $^)
        $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) version.o $(LDLIBS)
@@ -146,7 +148,7 @@ check: eax-aes-test.confirm eax-serpent-test.confirm \
 
 version.c: Makefile
        echo "#include \"secnet.h\"" >$@.new
-       @set -ex; if test -e .git; then \
+       @set -ex; if test -e .git && type -p git >/dev/null; then \
                v=$$(git describe --match 'v*'); v=$${v#v}; \
                if ! git diff --quiet HEAD; then v="$$v+"; fi; \
        else \
@@ -164,7 +166,7 @@ eax-%-test.confirm: eax-%-test eax-%-test.vectors
 
 check-ipaddrset: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
        $(srcdir)/ipaddrset-test.py >ipaddrset-test.new
-       diff -u ipaddrset-test.expected ipaddrset-test.new
+       diff -u $(srcdir)/ipaddrset-test.expected ipaddrset-test.new
 
 .PRECIOUS: eax-%-test
 
@@ -187,7 +189,7 @@ install: installdirs
        $(INSTALL_DATA) ${srcdir}/ipaddrset.py $(prefix)/share/secnet/ipaddrset.py
        $(INSTALL_SCRIPT) ${srcdir}/polypath-interface-monitor-linux \
                $(datarootdir)/secnet/.
-       $(INSTALL_DATA) secnet.8 $(mandir)/man8/secnet.8
+       $(INSTALL_DATA) ${srcdir}/secnet.8 $(mandir)/man8/secnet.8
 
 install-force:
        rm -f $(STALE_PYTHON_FILES)
@@ -212,6 +214,9 @@ dist:
        gzip -9f $(tarfname)
 
 # Release checklist:
+#
+#  0. Use this checklist from Makefile.in
+#
 #  1. Check that the tree has what you want
 #
 #  2. Update VERSION (above) and debian/changelog
@@ -225,9 +230,9 @@ dist:
 #
 #  3. Commit the updates to VERSION (above) and debian/changelog
 #
-#  4. git-tag -m "secnet $VERSION" -s v$VERSION
+#  4. git-tag -m "secnet $VERSION" -s v${VERSION//\~/_}
 #
-#  5. git-push origin v$VERSION v${VERSION}~0:master
+#  5. git-push origin v${VERSION//\~/_} v${VERSION//\~/_}~0:master
 #
 #  6. Run, again,
 #       make dist
@@ -237,17 +242,28 @@ dist:
 #  8. rsync -v ../secnet-$VERSION.tar.gz* \
 #        chiark:/home/ianmdlvl/public-html/secnet/download/
 #
-#  9. On chiark:
+#  9. In zealot's squeeze chroot:
+#       rm -rf ../d; mkdir ../d; cd ../d
+#       tar zxf ../secnet-$VERSION.tar.gz
+#       cd secnet-$VERSION
+#       dpkg-buildpackage -F -uc -us -rfakeroot
+#       rsync -vP ../secnet_${VERSION}_i386.deb ianmdlvl@chiark:public-html/secnet/download/
+#
+#  9a. On chiark as ianmdlvl:
+#       cd ~ianmdlvl/secnet-build/
 #       tar zxf ~ianmdlvl/public-html/secnet/download/secnet-$VERSION.tar.gz
 #       cd secnet-$VERSION
-#       debian/rules build
-#       fakeroot debian/rules binary
-#       mv ../secnet_${VERSION}_i386.deb ~ianmdlvl/public-html/secnet/download/
+#       dpkg-buildpackage -a -uc -us -rfakeroot
+#       mv ../secnet_${VERSION}_i386.deb ~ianmdlvl/public-html/secnet/download/backport/
 #
 #  10. On chiark as user secnet:
 #       cd ~secnet/public-html/release/
 #       mkdir $VERSION
 #       cd $VERSION
 #       ln -s /home/ianmdlvl/public-html/secnet/download/secnet?$VERSION* .
+#       mkdir polypath-backport
+#       ln -s /home/ianmdlvl/public-html/secnet/download/backport/secnet?$VERSION* polypath-backport/.
+#       ln -s /home/ianmdlvl/public-html/secnet/download/backport/*adns* polypath-backport/.
 #
 #  11. write and post a release announcement
+#       find -type l | sort | xargs sha256sum