diff options
| author | intrigeri <intrigeri@boum.org> | 2009-06-06 14:03:40 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-06-06 14:03:40 +0200 |
| commit | 86edd73d169600875a10a635ef8df4a644545b0d (patch) | |
| tree | 1216eb826f2da7a1c11d84395f25468d1acfa69c /debian/control | |
| parent | 17b3d73f6e65d6a754633902b0dd4716d53b03a9 (diff) | |
| parent | e40d2a6b2b1bdf677f11cc4a71595acf609d1e75 (diff) | |
| download | ikiwiki-86edd73d169600875a10a635ef8df4a644545b0d.tar ikiwiki-86edd73d169600875a10a635ef8df4a644545b0d.tar.gz | |
Merge commit 'upstream/master' into pub/po
Conflicts:
debian/changelog
debian/control
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/control b/debian/control index 05ccd0df3..5205ed749 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,8 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-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, libtext-textile-perl, po4a (>= 0.35-1), gettext + libsort-naturally-perl, libtext-textile-perl, libhighlight-perl, + po4a (>= 0.35-1), gettext Conflicts: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table Provides: ikiwiki-plugin-table |