Adapt for new shipper conventions.

diff --git a/Makefile b/Makefile
index fe93aaf5ff3cd52598efacd065df9cf9fc5d135c..7bece52def25daa8c8102ff64bfc165fa2c6a3dc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,8 +43,7 @@ endif
        rm -f $(DESTDIR)/usr/share/man/man1/irkerhook.1
 
 clean:
-       rm -f irkerd.8 irkerhook.1 irker-*.tar.gz *~
-       rm -f SHIPPER.* *.html
+       rm -f irkerd.8 irkerhook.1 irker-*.tar.gz *~ *.html
 
 PYLINTOPTS = --rcfile=/dev/null --reports=n --include-ids=y --disable="C0103,C0111,C0301,R0201,R0902,R0903,R0912,R0913,R0914,R0915,E1101,W0201,W0212,W0621,W0702,F0401"
 pylint:
@@ -69,5 +68,4 @@ irker-$(VERS).tar.gz: $(SOURCES) irkerd.8 irkerhook.1
 dist: irker-$(VERS).tar.gz
 
 release: irker-$(VERS).tar.gz irkerd.html irkerhook.html install.html security.html hacking.html
-       shipper -u -m -t; make clean
-       git push && git push --tags
+       shipper version=$(VERS) | sh -e -x

diff --git a/control b/control
index 0fd4d5ae00f2ca8d8c95f5bce11f541d47728fdb..1975734229a1986f9524b4e4a9a437cac3aff20a 100644 (file)
--- a/control
+++ b/control
@@ -17,9 +17,12 @@ XBS-Destinations: freecode
 
 Homepage: http://www.catb.org/~esr/irker
 
+XBS-HTML-Template: index.html
+
 XBS-IRC-Channel: irc://chat.freenode.net/#irker
 
 XBS-Logo: irker-logo.png
 
 XBS-Project-Tag-List: IRC, client
 
+XBS-VC-Tag-Template: %(version)s