diff options
| -rw-r--r-- | IkiWiki/Plugin/aggregate.pm | 2 | ||||
| -rw-r--r-- | debian/NEWS | 7 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | debian/postinst | 2 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 44 | ||||
| -rwxr-xr-x | t/pagespec_match.t | 2 |
6 files changed, 33 insertions, 26 deletions
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index c3cbbae05..2a4d10411 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -66,7 +66,7 @@ sub needsbuild (@) { #{{{ loadstate(); # if not already loaded foreach my $feed (values %feeds) { - if (exists $pagesources{$page} && + if (exists $pagesources{$feed->{sourcepage}} && grep { $_ eq $pagesources{$feed->{sourcepage}} } @$needsbuild) { # Mark all feeds originating on this page as removable; # preprocess will unmark those that still exist. diff --git a/debian/NEWS b/debian/NEWS index 43c8b3ca2..c3ed55c03 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -5,6 +5,10 @@ ikiwiki (2.30) unstable; urgency=low now a static page, not a CGI. Users can subscribe to its rss/atom feeds. Custom RecentChanges pages can be easily set up that display only changes to a subset of pages, or only changes by a subset of users. + + All wikis need to be rebuilt on upgrade to this version. If you listed your + wiki in /etc/ikiwiki/wikilist this will be done automatically when the + Debian package is upgraded. Or use ikiwiki-mass-rebuild to force a rebuild. With this excellent new RecentChanges support, the mail notification system is showing its age (and known to be variously buggy and underimplemented for @@ -12,6 +16,9 @@ ikiwiki (2.30) unstable; urgency=low from this version. If you were subscribed to commit mails, you should be able to accomplish the same thing by subscribing to a RecentChanges feed. + The "svnrepo" and "notify" fields in setup files are no longer used, and + silently ignored. You may want to remove them from your setup file. + -- Joey Hess <joeyh@debian.org> Tue, 29 Jan 2008 17:18:31 -0500 ikiwiki (2.20) unstable; urgency=low diff --git a/debian/changelog b/debian/changelog index 77202ed1f..ec8f7f1b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (2.21) UNRELEASED; urgency=low +ikiwiki (2.30) UNRELEASED; urgency=low [ Joey Hess ] * Old versions of git-init don't support --git-dir or GIT_DIR with diff --git a/debian/postinst b/debian/postinst index 018e04f78..26c44a88b 100755 --- a/debian/postinst +++ b/debian/postinst @@ -4,7 +4,7 @@ set -e # Change this when some incompatible change is made that requires # rebuilding all wikis. -firstcompat=2.1 +firstcompat=2.30 if [ "$1" = configure ] && \ dpkg --compare-versions "$2" lt "$firstcompat"; then diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 027e10e8a..cb25d0475 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: 2008-01-29 17:15-0500\n" +"POT-Creation-Date: 2008-01-29 17:42-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" @@ -67,67 +67,67 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:82 +#: ../IkiWiki/Plugin/aggregate.pm:83 #, perl-format msgid "missing %s parameter" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:110 +#: ../IkiWiki/Plugin/aggregate.pm:111 msgid "new feed" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:124 +#: ../IkiWiki/Plugin/aggregate.pm:125 msgid "posts" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:126 +#: ../IkiWiki/Plugin/aggregate.pm:127 msgid "new" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:237 #, perl-format msgid "expiring %s (%s days old)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:243 +#: ../IkiWiki/Plugin/aggregate.pm:244 #, perl-format msgid "expiring %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:270 #, perl-format msgid "processed ok at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:275 #, perl-format msgid "checking feed %s ..." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:279 +#: ../IkiWiki/Plugin/aggregate.pm:280 #, perl-format msgid "could not find feed at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:294 +#: ../IkiWiki/Plugin/aggregate.pm:295 msgid "feed not found" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:305 +#: ../IkiWiki/Plugin/aggregate.pm:306 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:311 +#: ../IkiWiki/Plugin/aggregate.pm:312 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:317 +#: ../IkiWiki/Plugin/aggregate.pm:318 msgid "feed crashed XML::Feed!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:391 +#: ../IkiWiki/Plugin/aggregate.pm:392 #, perl-format msgid "creating new page %s" msgstr "" @@ -146,20 +146,20 @@ msgstr "" msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:40 +#: ../IkiWiki/Plugin/edittemplate.pm:41 msgid "template not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:43 +#: ../IkiWiki/Plugin/edittemplate.pm:44 msgid "match not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:48 +#: ../IkiWiki/Plugin/edittemplate.pm:49 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:110 +#: ../IkiWiki/Plugin/edittemplate.pm:111 msgid "failed to process" msgstr "" @@ -240,15 +240,15 @@ msgstr "" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:118 +#: ../IkiWiki/Plugin/meta.pm:119 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:142 +#: ../IkiWiki/Plugin/meta.pm:143 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:155 +#: ../IkiWiki/Plugin/meta.pm:156 msgid "redir cycle is not allowed" msgstr "" diff --git a/t/pagespec_match.t b/t/pagespec_match.t index cb98ab149..038472967 100755 --- a/t/pagespec_match.t +++ b/t/pagespec_match.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More tests => 54; +use Test::More tests => 52; BEGIN { use_ok("IkiWiki"); } |