From 31846ba4e9b2364c520ba3bc6dbf18b0709d64f8 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 14 Jan 2015 22:11:05 +0000 Subject: [PATCH] wheezy release candidate --- debian/changelog | 7 +++++-- ikiwiki.spec | 2 +- po/ikiwiki.pot | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 817ca0df2..576756c54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,7 @@ -ikiwiki (3.20120629.1) UNRELEASED; urgency=medium +ikiwiki (3.20120629.1) wheezy; urgency=medium + + Backport blogspam plugin from experimental, because the version in + wheezy is no longer unusable: [ Joey Hess ] * Set Debian package maintainer to Simon McVittie as I'm retiring from @@ -8,7 +11,7 @@ ikiwiki (3.20120629.1) UNRELEASED; urgency=medium * blogspam: use the 2.0 JSON API (the 1.0 XML-RPC API has been EOL'd). Closes: #774441 - -- Joey Hess Mon, 20 Oct 2014 12:04:49 -0400 + -- Simon McVittie Wed, 14 Jan 2015 22:10:48 +0000 ikiwiki (3.20120629) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index 596b465f8..22f098a18 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20120629 +Version: 3.20120629.1 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 9f22d2146..c51b5aaaa 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: 2012-06-29 10:17-0400\n" +"POT-Creation-Date: 2015-01-07 21:10+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -188,7 +188,7 @@ msgstr "" msgid "creating index page %s" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:118 +#: ../IkiWiki/Plugin/blogspam.pm:139 msgid "" "Sorry, but that looks like spam to blogspam: " -- 2.39.2