From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 27 Mar 2009 19:09:41 +0000 (-0400)
Subject: Merge branch 'master' into po
X-Git-Tag: 3.15~205
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/825e2b1378b1def4980e36642ed84999599eb017?ds=inline;hp=-c

Merge branch 'master' into po

Conflicts:
	debian/control
---

825e2b1378b1def4980e36642ed84999599eb017
diff --combined IkiWiki.pm
index 2640f85a2,ee07258ec..63da5d0dd
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@@ -533,7 -533,7 +533,7 @@@ sub loadplugins () 
  
  	run_hooks(getopt => sub { shift->() });
  	if (grep /^-/, @ARGV) {
- 		print STDERR "Unknown option: $_\n"
+ 		print STDERR "Unknown option (or missing parameter): $_\n"
  			foreach grep /^-/, @ARGV;
  		usage();
  	}
@@@ -639,8 -639,10 +639,10 @@@ sub pagetype ($) 
  	if ($file =~ /\.([^.]+)$/) {
  		return $1 if exists $hooks{htmlize}{$1};
  	}
- 	elsif ($hooks{htmlize}{basename($file)}{noextension}) {
- 		return basename($file);
+ 	my $base=basename($file);
+ 	if (exists $hooks{htmlize}{$base} &&
+ 	    $hooks{htmlize}{$base}{noextension}) {
+ 		return $base;
  	}
  	return;
  }
@@@ -1337,7 -1339,7 +1339,7 @@@ sub check_content (@) 
  		foreach my $line (split("\n", $params{content})) {
  			push @diff, $line if ! exists $old{$_};
  		}
 -		$params{content}=join("\n", @diff);
 +		$params{diff}=join("\n", @diff);
  	}
  
  	my $ok;
diff --combined debian/control
index c6170c441,8f48bf98a..bcfea7489
--- a/debian/control
+++ b/debian/control
@@@ -14,7 -14,7 +14,7 @@@ Package: ikiwik
  Architecture: all
  Depends: ${misc:Depends}, ${perl:Depends}, libtext-markdown-perl | markdown, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl
  Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38), libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl
- Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libhtml-tree-perl, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng, libtext-wikicreole-perl, po4a (>= 0.35-1), gettext
 -Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libhtml-tree-perl, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng, libtext-wikicreole-perl, libsort-naturally-perl
++Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libhtml-tree-perl, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng, libtext-wikicreole-perl, libsort-naturally-perl, po4a (>= 0.35-1), gettext
  Conflicts: ikiwiki-plugin-table
  Replaces: ikiwiki-plugin-table
  Provides: ikiwiki-plugin-table