diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 59 | ||||
| -rw-r--r-- | debian/control | 11 | ||||
| -rw-r--r-- | debian/copyright | 18 |
3 files changed, 82 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index f8de0d3e9..c8db76966 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,62 @@ +ikiwiki (3.20120202) unstable; urgency=low + + * mdwn: Added nodiscount setting, which can be used to avoid using the + markdown discount engine, when maximum compatability is needed. + * Switch to YAML::XS to work around insanity in YAML::Mo. Closes: #657533 + * cvs: Ensure text files are added in non-binary mode. (Amitai Schlair) + * cvs: Various cleanups and testing. (Amitai Schlair) + * calendar: Fix strftime encoding bug. + * shortcuts: Fixed a broken shortcut to wikipedia (accidentially + made into a shortcut to wikiMedia). + * Various portability improvements. (Amitai Schlair) + + -- Joey Hess <joeyh@debian.org> Thu, 02 Feb 2012 21:42:40 -0400 + +ikiwiki (3.20120115) unstable; urgency=low + + * Make backlink(.) work. Thanks, Giuseppe Bilotta. + * mdwn: Workaround discount's eliding of <style> blocks. + * attachment: Fix utf-8 display bug. + + -- Joey Hess <joeyh@debian.org> Sun, 15 Jan 2012 16:19:25 -0400 + +ikiwiki (3.20120109) unstable; urgency=low + + * mdwn: Can use the discount markdown library, via the + Text::Markdown::Discount perl module. This is preferred if available + since it's the fastest currently supported markdown library, speeding up + ikiwiki's markdown rendering by a factor of 40. + (However, when multimarkdown is enabled, Text::Markdown::Multimarkdown + is still used.) + * On Debian, depend on libtext-markdown-discount. + + -- Joey Hess <joeyh@debian.org> Mon, 09 Jan 2012 11:49:14 -0400 + +ikiwiki (3.20111229) unstable; urgency=low + + * Consume all stdin when rcs_receive short-circuits, + to avoid git SIGPIPE race. + * Add path and path_natural sort orders (smcv) + * Test coverage can be checked with `make coverage` (smcv) + * tag: encode categories using numeric values. (tango) + + -- Joey Hess <joeyh@debian.org> Thu, 29 Dec 2011 12:00:53 -0400 + +ikiwiki (3.20111107) unstable; urgency=low + + * img: Bugfix to width/height tags for scaled down image when only + one dimension was provided. Thanks, Per Carlson. + * editpage: Fix FormattingHelp link on Discussion pages. + * The umask setting can now be set to private, group, or public, + avoiding the need to enter octal correctly which is particularly + difficult in yaml setup files. (smcv) + * graphviz: Support urls embedded in the graph, by having graphviz + generate an imagemap. + * graphviz: Support wikilinks embedded in the graph. + (Sponsored by The TOVA Company.) + + -- Joey Hess <joeyh@debian.org> Wed, 30 Nov 2011 16:31:48 -0400 + ikiwiki (3.20111106) unstable; urgency=low * searchquery.tmpl: Track escaping change in upstream template. diff --git a/debian/control b/debian/control index 03b3ea8b3..9403dfb44 100644 --- a/debian/control +++ b/debian/control @@ -3,27 +3,26 @@ Section: web Priority: optional Build-Depends: perl, debhelper (>= 7.0.50) Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, - libtext-markdown-perl | markdown, + libtext-markdown-discount-perl, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl (>= 1.36), perlmagick, po4a (>= 0.34), - libfile-chdir-perl, libyaml-perl, python-support + libfile-chdir-perl, libyaml-libyaml-perl, python-support Maintainer: Joey Hess <joeyh@debian.org> Uploaders: Josh Triplett <josh@freedesktop.org> Standards-Version: 3.9.2 Homepage: http://ikiwiki.info/ Vcs-Git: git://git.ikiwiki.info/ -Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki Package: ikiwiki Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, - libtext-markdown-perl | markdown, + libtext-markdown-discount-perl, libhtml-scrubber-perl, libhtml-template-perl, - libhtml-parser-perl, liburi-perl (>= 1.36), libyaml-perl, libjson-perl + libhtml-parser-perl, liburi-perl (>= 1.36), libyaml-libyaml-perl, libjson-perl Recommends: gcc | c-compiler, libc6-dev | libc-dev, - subversion | git-core (>= 1:1.5.0) | git (>= 1:1.7) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs, + git (>= 1:1.7) | git-core (>= 1:1.5.0) | subversion | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs, libxml-simple-perl, libnet-openid-consumer-perl, libcrypt-ssleay-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), diff --git a/debian/copyright b/debian/copyright index 72074d813..74418281d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -271,3 +271,21 @@ License: GPL-2+ The full text of the GPL is distributed as doc/GPL in ikiwiki's source, and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems. +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. |