diff options
| author | intrigeri <intrigeri@boum.org> | 2010-08-02 11:18:35 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-08-02 11:18:35 +0200 |
| commit | 22d982243716bb04f56e4e78e573e3ec49077309 (patch) | |
| tree | 840c33fd504f5942f808c9c63b268ea1d20a5f93 /debian | |
| parent | 5948bb01cb45f715befd107356873a3d3bb1d7d9 (diff) | |
| parent | e083e4caa8175c4ccc45dd06e9b9cd784dcbbc94 (diff) | |
Merge remote branch 'upstream/master' into prv/po
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 5645b34d4..25123cecc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low * meta: Allow syntax closer to html meta to be used. * Add new disable hook, allowing plugins to perform cleanup after they have been disabled. + * Use Digest::SHA built into perl rather than external Digest::SHA1 + to simplify dependencies. Closes: #591040 -- Joey Hess <joeyh@debian.org> Fri, 23 Jul 2010 14:00:32 -0400 diff --git a/debian/control b/debian/control index 0562a4a99..049a685b0 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-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, + libtext-csv-perl, graphviz, libnet-amazon-s3-perl, libsparkline-php, texlive, dvipng, libtext-wikicreole-perl, libsort-naturally-perl, libtext-textile-perl, libhighlight-perl, po4a (>= 0.35-1), gettext, libyaml-perl |