Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/Makefile.PL b/Makefile.PL
index ac4ec2644b919c125b29b9b25496e3684959f930..b0d56ee8234dad6b3645c158e4c0b65b59c80483 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -48,9 +48,9 @@ extra_clean:
        $(MAKE) -C po clean
 
 extra_install:
-       install -d $(DESTDIR)/etc/ikiwiki
-       install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
-       install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki
+       install -d $(DESTDIR)$(PREFIX)/etc/ikiwiki
+       install -m 0644 wikilist $(DESTDIR)$(PREFIX)/etc/ikiwiki
+       install -m 0644 auto.setup $(DESTDIR)$(PREFIX)/etc/ikiwiki
 
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
        for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
@@ -67,9 +67,12 @@ extra_install:
        done
        
        install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
-       for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* | grep -v demo`; do \
-               cp -a $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
-       done \
+       for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* ! -name \*demo\* -name \*.py`; do \
+               install -m 644 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
+       done
+       for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* ! -name \*demo\* ! -name \*.py`; do \
+               install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
+       done
 
        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 fe0bbec12b91dcab5107358acbac070cd90211f0..e8dfdb7f6cf0edf69f9fdddb8eaa334e272b7578 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (2.62) UNRELEASED; urgency=low
+
+  * Avoid using cp -a (again). (HenrikBrixAndersen)
+  * Add missing PREFIX to a few lines of the Makefile. (Thomas Keller)
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 21 Aug 2008 16:20:58 -0400
+
 ikiwiki (2.61) unstable; urgency=low
 
   * poll: Fix typo that broke plugin.

diff --git a/doc/bugs/Please_avoid_using___39__cp_-a__39___in_Makefile.PL.mdwn b/doc/bugs/Please_avoid_using___39__cp_-a__39___in_Makefile.PL.mdwn
index 08dff9536d138c2296f8633111da61b2d7e4a22e..07d5efeaddd2c94ad92734ac2e5aaa91bfef66a9 100644 (file)
--- a/doc/bugs/Please_avoid_using___39__cp_-a__39___in_Makefile.PL.mdwn
+++ b/doc/bugs/Please_avoid_using___39__cp_-a__39___in_Makefile.PL.mdwn
@@ -73,3 +73,5 @@ Please restore the old behaviour of using 'install' :-)
      
        install -d $(DESTDIR)$(PREFIX)/share/man/man1
        install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1
+
+[[tag done]]

diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn
index c8b963274edc2ada2cb2e585e6c188ed96691413..52a9fab8b3602a01a09a3bf5667418a1c91f83fb 100644 (file)
--- a/doc/css_market.mdwn
+++ b/doc/css_market.mdwn
@@ -27,9 +27,6 @@ files..)
     * You'll find a updated version of these templates [here](http://www.der-winnie.de/~winnie/configs/ikiwiki-templates.tar.gz). 
       These templates are known to work with ikiwiki 2.31, and since I'll install always the newest one on my server I'll will update them on a regular basis.
 
-        * What is the correct way to install the .tmpl files? -- [[JosephTurian]]
-
-
 * **[[02_Template.css]]**, contributed and adapted by [maxx](http://martin.wuertele.net/), [original](http://www.openwebdesign.org/viewdesign.phtml?id=3057)
   designed by [jarico](http://www.openwebdesign.org/userinfo.phtml?user=jcarico) 
   (License: public domain). You'll need a modified page.tmpl

diff --git a/doc/css_market/discussion.mdwn b/doc/css_market/discussion.mdwn
new file mode 100644 (file)
index 0000000..cba1313
--- /dev/null
+++ b/doc/css_market/discussion.mdwn
@@ -0,0 +1,7 @@
+What is the correct way to install the .tmpl files? -- [[JosephTurian]]
+
+> For themes that need them, you can set `templatedir` to some directory in
+> your setup file, and put the templates there. Or install directly overtop
+> ikiwiki's standard templates (in, eg `/usr/share/ikiwiki/templates`)
+> --[[Joey]]
+

diff --git a/doc/plugins/orphans/discussion.mdwn b/doc/plugins/orphans/discussion.mdwn
index be3b232673728d81e0b7f4840b6fbc2c06de9826..2b2532bfe44f0dccb16abc8701d9d0bec9b82d38 100644 (file)
--- a/doc/plugins/orphans/discussion.mdwn
+++ b/doc/plugins/orphans/discussion.mdwn
@@ -3,3 +3,9 @@ It seems that the orphans plugin doesn't recognize markdown-style links of the k
     [Pretty link name](realname)
 
 In my wiki, the page "realname" shows up as an orphan although it's being linked to.
+
+> Like anything in ikiwiki that deals with links, this only takes
+> [[WikiLinks|ikiwiki/wikilink]] into account. There should be no real
+> reason to use other link mechanisms provided by eg, markdown for internal
+> links in the wiki (indeed, using them is likely to cause broken links
+> when doing things like inlining or renaming pages). --[[Joey]]

diff --git a/doc/todo/Add_a_plugin_to_list_available_pre-processor_commands.mdwn b/doc/todo/Add_a_plugin_to_list_available_pre-processor_commands.mdwn
index 4ec9107e3aef2f653290d580b5b6b7f9e12d909e..edf71361b3a530037bbe62a51d0b9d806de6cfb6 100644 (file)
--- a/doc/todo/Add_a_plugin_to_list_available_pre-processor_commands.mdwn
+++ b/doc/todo/Add_a_plugin_to_list_available_pre-processor_commands.mdwn
@@ -1,5 +1,22 @@
 I've found myself wanting to know which [[plugins]] are switched on so I know which pre-processor commands I can use.  The attached [[patch]] adds a new plugin that generates the list of available plugins. -- [[Will]]
 
+> Good idea, I do see a few problems:
+> 
+> - preprocessor directives do not necessarily have the same name as the
+>   plugin that contains them (for example, the graphviz plugin adds a graph
+>   directive). Won't keys `%{IkiWiki::hooks{preprocess}}` work?
+> - "listplugins" is a bit misnamed since it only does preprocessor directives.
+> - comment was copied from version plugin and still mentions version :-)
+> - Seems like [[ikiwiki/formatting]] could benefit from including the
+>   list.. however, just a list of preprocessor directive names is not
+>   the most user-friendly thing that could be put on that page. It would
+>   be nice if there were also a short description and maybe an example of
+>   use. Seems like the place to include that info would be in the call
+>   to `hook()`.
+>   (Maybe adding that is more involved than you want to go though..)
+> 
+> --[[Joey]]
+
     #!/usr/bin/perl
     # Ikiwiki listplugins plugin.
     package IkiWiki::Plugin::listplugins;

diff --git a/doc/todo/Move_teximg_latex_preamble_to_config_file.mdwn b/doc/todo/Move_teximg_latex_preamble_to_config_file.mdwn
index 1077da2cd9489e1421ebe00c327c4883d25b2caf..130f8dd4ea53eea723be4b144e0581ccc92c4ae9 100644 (file)
--- a/doc/todo/Move_teximg_latex_preamble_to_config_file.mdwn
+++ b/doc/todo/Move_teximg_latex_preamble_to_config_file.mdwn
@@ -8,6 +8,12 @@ The patch also makes some other changes:
 
 -- [[Will]]
 
+> I like making this configurable. I do fear that changing what's included
+> by default could break some existing uses of teximg? That needs to be
+> considered, and either the breakage documented in NEWS, or avoided. Also,
+> if mchem is dropped, I think the suggests on texlive-science in
+> debian/control should probably go? --[[Joey]]
+
     diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm
     index 369c108..8c3379f 100644
     --- a/IkiWiki/Plugin/teximg.pm