summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-10-17 17:48:52 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-10-17 17:48:52 +0000
commita2a65751a2bd22b461221b2cc61141576f1ec677 (patch)
tree3b7b034fcfad0b325a2956dae1548c6b20fceae4
parent99a95f51bfe1221e5b8ebec9b0c4d299772de8fb (diff)
* Patch from Pawel Tecza to cp -a the templates in the Makefile.
-rwxr-xr-xMakefile.PL2
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.PL b/Makefile.PL
index 1acb4bcf7..b27e6cef3 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -32,7 +32,7 @@ extra_clean:
extra_install:
install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
- $(CP) templates/* $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
+ $(CP) -a templates/* $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
$(CP) -a basewiki/* $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
diff --git a/debian/changelog b/debian/changelog
index c0c5d53e1..9f41ead38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (1.31) UNRELEASED; urgency=low
+
+ * Patch from Pawel Tecza to cp -a the templates in the Makefile.
+
+ -- Joey Hess <joeyh@debian.org> Tue, 17 Oct 2006 13:48:26 -0400
+
ikiwiki (1.30) unstable; urgency=low
* Add no_override parameter to hook().