Fix installation of templates (closes: #686928). Thanks to Mike Gabriel.

diff --git a/Makefile b/Makefile
index da8de6085d0c1fc8611bdd633d77350c9d003bd0..7d427c61722a2209bbeb020c99d2bc07adbe401d 100644 (file)
--- 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 988e5fe35eb7788407275150db7830bc04ed3b64..9ecd4404c1e9c560f779a4a387119aed334e2b34 100644 (file)
--- 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 534b0b300a011516cfc6d62a83d772a77c7dc5c1..f33b23404203c7e91b050cfbfb0c022fe71253c0 100644 (file)
--- 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/*