* Patch from Paul Tötterman to use CP in the Makefile.

diff --git a/Makefile.PL b/Makefile.PL
index ead7f5dc545057a80c43d6f374cbb4bd65ec4cb5..1acb4bcf76022866e4303702c8d974f14737c710 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -32,10 +32,10 @@ extra_clean:
 
 extra_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
-       cp templates/* $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
+       $(CP) templates/* $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
 
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
-       cp -a basewiki/* $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
+       $(CP) -a basewiki/* $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
 
        install -d $(DESTDIR)$(PREFIX)/share/man/man1
        install ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1

diff --git a/debian/changelog b/debian/changelog
index fd48a61352cfe007a14e869e780b071d91901bdb..a6c7821f5ab0d6e8660743f7da77efc51eeaf0d4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (1.29) UNRELEASED; urgency=low
+
+  * Patch from Paul Tötterman to use CP in the Makefile.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 28 Sep 2006 19:10:58 -0400
+
 ikiwiki (1.28) unstable; urgency=low
 
   * inline: Add ability to sort by page name, based on a patch from