urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'debian-testing' 

Conflicts:
	debian/changelog
master
Joey Hess 2010-08-15 12:01:16 -04:00
parent 522c88c277 77aaf95d5d
commit 91f5697025
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -13,7 +13,7 @@ ikiwiki (3.20100815) unstable; urgency=medium
* Fix po test suite to not assume ikiwiki's underlay is already installed.
Closes: #593047
-- Joey Hess <joeyh@debian.org> Sun, 15 Aug 2010 11:45:40 -0400
-- Joey Hess <joeyh@debian.org> Sun, 15 Aug 2010 11:42:55 -0400
ikiwiki (3.20100804) unstable; urgency=low

4
doc/news/version_3.20100815.mdwn 100644
View File

@ -0,0 +1,4 @@
ikiwiki 3.20100815 released with [[!toggle text="these changes"]]
[[!toggleable text="""
* Fix po test suite to not assume ikiwiki's underlay is already installed.
Closes: #[593047](http://bugs.debian.org/593047)"""]]

2
ikiwiki.spec
View File

@ -1,5 +1,5 @@
Name: ikiwiki
Version: 3.20100804
Version: 3.20100815
Release: 1%{?dist}
Summary: A wiki compiler

2
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-08-04 09:22-0400\n"
"POT-Creation-Date: 2010-08-15 11:48-0400\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"