* 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.

diff --git a/debian/changelog b/debian/changelog
index cabed403a3ce8333eadaa78b0eb8ec46b0aa98b4..7a3c300741a7ced88a9fc5977fbc10de78dec293 100644 (file)
--- 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 bb40de4fe37e7e4fb3a84733e8eb732a2b51ca49..02a2e159125103d683001f8791dd7b408e39cdf9 100644 (file)
--- 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