* Avoid .svn directories when installing from svn checkout.

diff --git a/Makefile.PL b/Makefile.PL
index 5bd1d64937d9b1df7c1bf7ba9fcba9941dc887f6..4f6b051797f72a6a3e7671b321ce0c6d340954ba 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -46,11 +46,9 @@ extra_clean:
        $(MAKE) -C po clean
 
 extra_install:
-       install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
-       $(CP) -a templates/* $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
-
-       install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
-       $(CP) -aL basewiki/* $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
+       install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
+       find basewiki templates \( -type f -or -type l \) ! -regex '.*\.svn.*' \
+               -exec cp --parents -aL {} $(DESTDIR)$(PREFIX)/share/ikiwiki \;
 
        install -d $(DESTDIR)$(PREFIX)/share/man/man1
        install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1

diff --git a/debian/changelog b/debian/changelog
index be764ee577d10502f92193279cbbd8e0950b22a2..d0b481a342f37fdb318b79e0943158ce2a4ca6f4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,9 @@ ikiwiki (1.51) UNRELEASED; urgency=low
     the footer border.
   * Due to template changes and style sheet changes that depend on them,
     wiki rebuilds are recommended on upgrade to this version.
+  * Avoid .svn directories when installing from svn checkout.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 26 Apr 2007 15:48:03 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 26 Apr 2007 18:47:38 -0400
 
 ikiwiki (1.50) unstable; urgency=low
 

diff --git a/doc/bugs/installing_from_svn_copies_.svn_directories.mdwn b/doc/bugs/installing_from_svn_copies_.svn_directories.mdwn
index a1c83269c71e6ab3c75fdd15af692bfd7ae5b36f..dec9160448544fab460c451241f60ff5b67cebb7 100644 (file)
--- a/doc/bugs/installing_from_svn_copies_.svn_directories.mdwn
+++ b/doc/bugs/installing_from_svn_copies_.svn_directories.mdwn
@@ -23,4 +23,6 @@ permission denied errors when I tried to make a change and install again.
 > The .svn directories can be avoided in the deb by setting
 > DH_ALWAYS_EXCLUDE=.svn in the environment before building.
 > I prefer to use that kind of hack exterior to a package rather than
-> putting in RCS-specific exclude hacks. --[[Joey]]
+> putting in RCS-specific exclude hacks. 
+> 
+> [[Done]] for the install from svn checkout case. --[[Joey]]