* Re-organise dependencies and recommends now that recommends are installed

  by default.

6 files changed, 27 insertions, 15 deletions

diff --git a/debian/NEWS b/debian/NEWS
index e119da45b..203f31e1a 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-ikiwiki (2.16) UNRELEASED; urgency=low
+ikiwiki (2.16) unstable; urgency=low
 
   Many of the pages in ikiwiki's basewiki have been moved and renamed in this
   release, to avoid the basewiki including pages with names like "blog".
diff --git a/debian/changelog b/debian/changelog
index f3ea40d20..1708e7581 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (2.16) UNRELEASED; urgency=low
+ikiwiki (2.16) unstable; urgency=low
 
   * Major basewiki reorganisation. Most pages moved into ikiwiki/ subdirectory
     to avoid polluting the main namespace, and some were further renamed.
@@ -56,8 +56,10 @@ ikiwiki (2.16) UNRELEASED; urgency=low
   * brokenlinks: Don't list the same link multiple times. (%links might
     contain multiple copies of the same link)
   * git: Correct display of multiline commit messages in recentchanges.
+  * Re-organise dependencies and recommends now that recommends are installed
+    by default.
 
- -- Joey Hess <joeyh@debian.org>  Mon, 03 Dec 2007 14:47:36 -0500
+ -- Joey Hess <joeyh@debian.org>  Sun, 16 Dec 2007 16:55:23 -0500
 
 ikiwiki (2.15) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 45f1dd1f1..7a2f7ccb4 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,9 @@ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki
 
 Package: ikiwiki
 Architecture: all
-Depends: ${perl:Depends}, libxml-simple-perl, markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, libcgi-formbuilder-perl (>= 3.05), 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, liblwpx-paranoidagent-perl
-Suggests: viewvc | viewcvs, 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
+Depends: ${perl:Depends}, markdown, libhtml-template-perl, libhtml-parser-perl, liburi-perl
+Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core | tla | mercurial, libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libhtml-scrubber-perl, libcgi-formbuilder-perl (>= 3.05), libtime-duration-perl, libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl
+Suggests: viewvc | gitweb | viewcvs, hyperestraier, 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
 Conflicts: ikiwiki-plugin-table
 Replaces: ikiwiki-plugin-table
 Provides: ikiwiki-plugin-table
diff --git a/doc/install.mdwn b/doc/install.mdwn
index 06da9920f..6fdc8bb9e 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -7,17 +7,22 @@ Ikiwiki is a perl program, and needs a recent version of perl such as
 
 Ikiwiki requires the [[cpan Text::Markdown]], [[cpan URI]],
 [[cpan HTML::Parser]], and [[cpan HTML::Template]] perl modules be
-installed, and also uses the following perl modules if available: 
-[[cpan CGI::Session]], [[cpan CGI::FormBuilder]] (version 3.05 or newer),
-[[cpan Mail::Sendmail]], [[cpan Time::Duration]], [[cpan TimeDate]],
-[[cpan HTML::Scrubber]], [[cpan RPC::XML]], [[cpan XML::Simple]],
-[[cpan XML::Feed]], [[cpan File::MimeInfo]], [[cpan Locale::gettext]]
-(version 1.04 or newer).
+installed.
+
+It also uses the following perl modules if available: [[cpan
+CGI::Session]], [[cpan CGI::FormBuilder]] (version 3.05 or newer), [[cpan
+Mail::Sendmail]], [[cpan Time::Duration]], [[cpan TimeDate]], [[cpan
+HTML::Scrubber]], [[cpan RPC::XML]], [[cpan XML::Simple]], [[cpan
+XML::Feed]], [[cpan File::MimeInfo]], [[cpan Locale::gettext]] (version
+1.04 or newer).
+
+It's recommended you have a C compiler, as ikiwiki uses one to build
+wrappers.
 
 Various [[plugins]] use other libraries and utlities; see their individual
 documentation for details.
 
-The Debian packages depend on an appropriate set of these modules.
+The Debian packages depend on and recommend an appropriate set of packages.
 
 While Fedora 7 doesn't have an ikiwiki package, you can install needed
 perl modules using this command:
diff --git a/doc/todo/Debian_package_could_Recommend_gcc_+_libc6-dev__44___not_Depend.mdwn b/doc/todo/Debian_package_could_Recommend_gcc_+_libc6-dev__44___not_Depend.mdwn
index 7e579c6d7..ee55de8b9 100644
--- a/doc/todo/Debian_package_could_Recommend_gcc_+_libc6-dev__44___not_Depend.mdwn
+++ b/doc/todo/Debian_package_could_Recommend_gcc_+_libc6-dev__44___not_Depend.mdwn
@@ -1,4 +1,7 @@
-IkiWiki doesn't actually need a C compiler etc. except for CGI (and other wrappers?). As it's perfectly possible to use IkiWiki without the CGI mode, would it be possible to make the Debian package Recommend gcc/libc6-dev/etc., rather than Depending on them?
+IkiWiki doesn't actually need a C compiler etc. except for CGI (and other
+wrappers?). As it's perfectly possible to use IkiWiki without the CGI mode,
+would it be possible to make the Debian package Recommend
+gcc/libc6-dev/etc., rather than Depending on them?
 
 > My approach with the dependencies of the package is to depend on
 > everything that is needed to use ikiwiki for a fairly full-featured wiki (but
@@ -14,4 +17,6 @@ IkiWiki doesn't actually need a C compiler etc. except for CGI (and other wrappe
 > installed by apt. That will be sorting itself out over the next month or
 > so. --[[Joey]]
 
+> [[done]]
+
 [[wishlist]]
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 94570c720..6fe6fc7b6 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-16 16:44-0500\n"
+"POT-Creation-Date: 2007-12-16 16:55-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"