wheezy release candidate

diff --git a/debian/changelog b/debian/changelog
index 817ca0df259dca58ce00e3b680a1c6e315c89224..576756c544ccd2566a36127185d2fc2a6594a60d 100644 (file)
--- 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
 
   [ 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
 
   * blogspam: use the 2.0 JSON API (the 1.0 XML-RPC API has been EOL'd).
     Closes: #774441
 

- -- Joey Hess <joeyh@debian.org>  Mon, 20 Oct 2014 12:04:49 -0400
+ -- Simon McVittie <smcv@debian.org>  Wed, 14 Jan 2015 22:10:48 +0000

 
 ikiwiki (3.20120629) unstable; urgency=low
 
 
 ikiwiki (3.20120629) unstable; urgency=low
 

diff --git a/ikiwiki.spec b/ikiwiki.spec
index 596b465f8c1fc50d66e37f456222f5494e47bd28..22f098a18db7cf06e308b6b1571846435b4ebc82 100644 (file)
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
 Name:           ikiwiki

-Version: 3.20120629
+Version: 3.20120629.1

 Release:        1%{?dist}
 Summary:        A wiki compiler
 
 Release:        1%{?dist}
 Summary:        A wiki compiler
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 9f22d2146fcc36b18fd9cd0868c3492da8502041..c51b5aaaa5c341e9bcab2c62884f06fe574ea084 100644 (file)
--- 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"
 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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"


@@ -188,7 +188,7 @@ msgstr ""
 msgid "creating index page %s"
 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 <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "