diff options
| author | joshtriplett <joshtriplett@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-04-10 06:46:54 +0000 |
|---|---|---|
| committer | joshtriplett <joshtriplett@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-04-10 06:46:54 +0000 |
| commit | d4c489ed93cf41702eccc49b453189ed71790bd7 (patch) | |
| tree | 5f6e9670f48ae09bc0b36145457b4e3772eb6955 /debian | |
| parent | 13c7a51f1f4b2f809681c4e2651bf0d3992a863e (diff) | |
* Conflicts/Replaces/Provides the unofficial ikiwiki-plugin-table
package, because ikiwiki now provides the table plugin, and thus has
a file overlap with ikiwiki-plugin-table.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index cabed403a..7a3c30074 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,12 @@ ikiwiki (1.50) UNRELEASED; urgency=low Josh Triplett for the idea. * Optimise displaytime, trimming maybe 6% off the build time. - -- Joey Hess <joeyh@debian.org> Mon, 09 Apr 2007 21:42:14 -0400 + [ Josh Triplett ] + * Conflicts/Replaces/Provides the unofficial ikiwiki-plugin-table + package, because ikiwiki now provides the table plugin, and thus has + a file overlap with ikiwiki-plugin-table. + + -- Josh Triplett <josh@freedesktop.org> Mon, 09 Apr 2007 23:46:18 -0700 ikiwiki (1.49) unstable; urgency=low diff --git a/debian/control b/debian/control index bb40de4fe..02a2e1591 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,9 @@ Architecture: all Depends: ${perl:Depends}, libxml-simple-perl, markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, libcgi-formbuilder-perl (>= 3.02.02), libtime-duration-perl, libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl, gcc | c-compiler, libc6-dev | libc-dev, libhtml-parser-perl, liburi-perl Recommends: subversion | git-core | tla | mercurial, hyperestraier, libnet-openid-consumer-perl Suggests: viewvc | viewcvs, librpc-xml-perl, libtext-wikiformat-perl, python-docutils, polygen, tidy, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), graphviz +Conflicts: ikiwiki-plugin-table +Replaces: ikiwiki-plugin-table +Provides: ikiwiki-plugin-table Description: a wiki compiler ikiwiki converts a directory full of wiki pages into HTML pages suitable for publishing on a website. Unlike many wikis, ikiwiki does not have its |