From 08a99d601bf7ba62b02ec3189cc8fade646ff230 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Thu, 21 Nov 2013 01:52:35 -0500
Subject: [PATCH] Adapt for new shipper conventions.

---
 Makefile | 6 ++----
 control  | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index fe93aaf..7bece52 100644
--- 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 0fd4d5a..1975734 100644
--- 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
-- 
2.26.2