From: intrigeri <intrigeri@boum.org>
Date: Tue, 30 Dec 2008 17:24:36 +0000 (+0100)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.15~322
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/21add7ffa87a5e622d18bdbb24c638c15bdb3800?hp=--cc

Merge commit 'upstream/master' into prv/po

Conflicts:

	debian/control
	debian/copyright
	doc/ikiwiki/pagespec.mdwn

Signed-off-by: intrigeri <intrigeri@boum.org>
---

21add7ffa87a5e622d18bdbb24c638c15bdb3800
diff --cc debian/control
index 04283532b,0db972ff7..3becad3c9
--- a/debian/control
+++ b/debian/control
@@@ -12,9 -12,9 +12,9 @@@ Vcs-Browser: http://git.ikiwiki.info/?p
  
  Package: ikiwiki
  Architecture: all
- Depends: ${perl:Depends}, markdown | libtext-markdown-perl, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl
+ 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
- Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, 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, po4a
 -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
++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, po4a
  Conflicts: ikiwiki-plugin-table
  Replaces: ikiwiki-plugin-table
  Provides: ikiwiki-plugin-table
diff --cc debian/copyright
index fe5db8af8,b9ea89d81..1f189f314
--- a/debian/copyright
+++ b/debian/copyright
@@@ -108,10 -112,12 +112,16 @@@ Files: google.p
  Copyright: Copyright (C) 2008 Peter Simons <simons@cryp.to>
  License: GPL-2+
  
+ Files: comments.pm
+ Copyright: 
+  © 2006-2008 Joey Hess <joey@ikiwiki.info>
+  © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
+ License: GPL-2+
+ 
 +Files: po.pm
- Copyright: (C) 2008 intrigeri <intrigeri@boum.org>
++Copyright: © 2008 intrigeri <intrigeri@boum.org>
 +License: GPL-2+
 +
  Files: doc/logo/*
  Copyright: © 2006 Recai Oktaş <roktas@debian.org>
  License: GPL-2+