From f11e4c207194b7eaa54b2eec48bd571296d232c7 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Fri, 7 Sep 2012 10:43:39 -0700
Subject: [PATCH] Fix installation of templates (closes: #686928). Thanks to
 Mike Gabriel.

---
 Makefile                   | 6 +++---
 debian/changelog           | 2 ++
 debian/debbugs-web.install | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index da8de60..7d427c6 100644
--- a/Makefile
+++ b/Makefile
@@ -102,8 +102,8 @@ $(var_dir)/spool/db-h $(scripts_dir) $(examples_dir) $(man8_dir); \
 	$(install_data) misc/updateseqs $(var_dir)/spool
 
 	# install the templates
-	$(foreach dir, $(wildcard templates/*/*), $(exec -d $(install_exec) $(template_dir)/$(patsubst templates/%,%,$(dir))))
-	$(foreach tmpl, $(wildcard templates/*/*/*.tmpl), $(exec $(install_data) $(tmpl) $(template_dir)/$(patsubst templates/%,%,$(tmpl))))
+	$(foreach dir, $(wildcard templates/*/*), $(install_exec) -d $(templates_dir)/$(patsubst templates/%,%,$(dir));)
+	$(foreach tmpl, $(wildcard templates/*/*/*.tmpl), $(install_data) $(tmpl) $(templates_dir)/$(patsubst templates/%,%,$(tmpl));)
 
 
-.PHONY: test build
\ No newline at end of file
+.PHONY: test build
diff --git a/debian/changelog b/debian/changelog
index 988e5fe..9ecd440 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ debbugs (2.4.2~exp2) experimental; urgency=low
   * Fix spacing in owner block (closes: #670411)
   * Fix double encoding issues (closes: #672432)
   * Fix encoding in cgi
+  * Fix installation of templates (closes: #686928). Thanks to Mike
+    Gabriel.
 
   [Thanks to Arnout Engelen: ]
   * Add Homepage (closes: #670555).
diff --git a/debian/debbugs-web.install b/debian/debbugs-web.install
index 534b0b3..f33b234 100644
--- a/debian/debbugs-web.install
+++ b/debian/debbugs-web.install
@@ -1,3 +1,4 @@
 var/lib/debbugs/www/*
 var/lib/debbugs/www/cgi/*
-etc/debbugs/html
\ No newline at end of file
+etc/debbugs/html
+usr/share/debbugs/templates/*
-- 
2.39.2