From aee4621bae3c3596cc4fb97c84920b7e619b2f3d Mon Sep 17 00:00:00 2001 From: joey Date: Wed, 4 Apr 2007 00:40:57 +0000 Subject: [PATCH 1/1] * Fix a bug in the img plugin that caused thumbnailed files to not be * Make the OpenID library a reccommendation of the Debian package, rather than just a suggests, since OpenID is enabled by default. --- debian/changelog | 6 ++++-- debian/control | 4 ++-- ...e_doesn__39__t_pull_in_packages_required_for_openid.mdwn | 6 +++++- doc/roadmap.mdwn | 2 +- po/ikiwiki.pot | 4 ++-- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index a19295619..ee7af7399 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,10 +17,12 @@ ikiwiki (1.49) UNRELEASED; urgency=low on and supported creating it (especially Tumov). This adds a "usedirs" option that makes ikiwiki use foo/index.html instead of foo.html as output page names. It is not yet enabled by default. - * Fix a big in the img plugin that caused thumbnailed files to not be + * Fix a bug in the img plugin that caused thumbnailed files to not be tracked properly. + * Make the OpenID library a reccommendation of the Debian package, rather + than just a suggests, since OpenID is enabled by default. - -- Joey Hess Sun, 01 Apr 2007 15:37:17 -0400 + -- Joey Hess Tue, 03 Apr 2007 20:40:27 -0400 ikiwiki (1.48) unstable; urgency=low diff --git a/debian/control b/debian/control index 4406963d3..8130977d0 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,8 @@ XS-Vcs-Svn: svn://svn.kitenet.net/ikiwiki/trunk Package: ikiwiki 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 -Suggests: viewvc | viewcvs, librpc-xml-perl, libtext-wikiformat-perl, python-docutils, polygen, tidy, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libnet-openid-consumer-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1) +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) 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 diff --git a/doc/bugs/debian_package_doesn__39__t_pull_in_packages_required_for_openid.mdwn b/doc/bugs/debian_package_doesn__39__t_pull_in_packages_required_for_openid.mdwn index 20643b125..e1c297162 100644 --- a/doc/bugs/debian_package_doesn__39__t_pull_in_packages_required_for_openid.mdwn +++ b/doc/bugs/debian_package_doesn__39__t_pull_in_packages_required_for_openid.mdwn @@ -2,4 +2,8 @@ I installed version 1.48-1 of Debian package of ikiwiki. When I went to login w I assume that these should be pulled in by default since OpenID is enabled by default? --- Adam. \ No newline at end of file +-- Adam. + +> I'm going to promote it from a Suggests to a Recommends, that should get +> it installed by default and still let it not be installed by users who +> don't want it. [[done]] --[[Joey]] diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn index 3eb7dccc2..8c10aa228 100644 --- a/doc/roadmap.mdwn +++ b/doc/roadmap.mdwn @@ -35,7 +35,7 @@ Released 29 April 2006. features and make other changes to the default configuration. Some things I'm considering: -* Makeng OpenID the default auth method. +* Making OpenID the default auth method. * Dropping GlobLists. However, they can lurk in preferences settings in wikis, which may make getting rid of them hard, and it may be worth keeping them so users can list pages without anding them together. diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 757aec0b3..a68da073c 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-04-01 16:43-0400\n" +"POT-Creation-Date: 2007-04-02 14:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -165,7 +165,7 @@ msgstr "" msgid "RPC::XML::Client not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:97 +#: ../IkiWiki/Plugin/linkmap.pm:98 msgid "failed to run dot" msgstr "" -- 2.44.0