* Apply patch from Pawel to avoid using -L in Makefile as it's not available

  in older finds.

diff --git a/Makefile.PL b/Makefile.PL
index 73c4950cb436c603152b56b4027975087727f5c1..5514a98ceb67615cd40af8fae7412cfea9b647be 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -47,9 +47,9 @@ extra_clean:
 
 extra_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
-       for dir in `find -L basewiki templates -type d ! -regex '.*\.svn.*'`; do \
+       for dir in `find basewiki templates -follow -type d ! -regex '.*\.svn.*'`; do \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
-               for file in `find -L $$dir -maxdepth 1 -type f`; do \
+               for file in `find $$dir -follow -maxdepth 1 -type f`; do \
                        install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                done; \
        done

diff --git a/debian/changelog b/debian/changelog
index 36ef576069da472bf8b23bcbdfcb7768fb4260dc..6a4737aedd2a626d91dfee59ec17283e89c76eb7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,10 @@ ikiwiki (2.1) UNRELEASED; urgency=low
 
   [ Joey Hess ]
   * Updated Czech translation from Miroslav Kure.
+  * Apply patch from Pawel to avoid using -L in Makefile as it's not available
+    in older finds.
 
- -- Joey Hess <joeyh@debian.org>  Wed, 09 May 2007 16:01:28 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 10 May 2007 14:56:07 -0400
 
 ikiwiki (2.00) unstable; urgency=low
 

diff --git a/doc/bugs/find:_invalid_predicate___96__-L__39__.mdwn b/doc/bugs/find:_invalid_predicate___96__-L__39__.mdwn
index ea2cfcdea6af148bd6323fee1a53319b82cb9a64..283fc3fb3c8ca1b1df6c805fb183e4b4cf8b84a0 100644 (file)
--- a/doc/bugs/find:_invalid_predicate___96__-L__39__.mdwn
+++ b/doc/bugs/find:_invalid_predicate___96__-L__39__.mdwn
@@ -19,4 +19,6 @@ because it seems that my `find` doesn't support `-L` option. I had to patch
                 done; \
         done
 
--- Pawel
\ No newline at end of file
+-- Pawel
+
+[[applied|done]], thanks --[[Joey]]

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index f55e8c6afa5b401d53ef0e226f92222ca9b40ca9..dd3dfd704bfa1c63309a777f8ccd9f2dd54502ff 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-08 20:47-0400\n"
+"POT-Creation-Date: 2007-05-10 14:57-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -241,19 +241,19 @@ msgstr ""
 msgid "All pages are linked to by other pages."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:147
+#: ../IkiWiki/Plugin/passwordauth.pm:155
 msgid "Account creation successful. Now you can Login."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:150
+#: ../IkiWiki/Plugin/passwordauth.pm:158
 msgid "Error creating account."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:171
+#: ../IkiWiki/Plugin/passwordauth.pm:179
 msgid "Failed to send mail"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:173
+#: ../IkiWiki/Plugin/passwordauth.pm:181
 msgid "Your password has been emailed to you."
 msgstr ""
 
@@ -563,11 +563,11 @@ msgstr ""
 msgid "usage: ikiwiki [options] source dest"
 msgstr ""
 
-#: ../IkiWiki.pm:107
+#: ../IkiWiki.pm:108
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:154 ../IkiWiki.pm:155
+#: ../IkiWiki.pm:155 ../IkiWiki.pm:156
 msgid "Error"
 msgstr ""
 
@@ -575,7 +575,7 @@ msgstr ""
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.
-#: ../IkiWiki.pm:631
+#: ../IkiWiki.pm:632
 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr ""