diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/NEWS | 28 | ||||
| -rw-r--r-- | debian/changelog | 201 | ||||
| -rw-r--r-- | debian/control | 135 | ||||
| -rw-r--r-- | debian/copyright | 110 | ||||
| -rw-r--r-- | debian/links (renamed from debian/link) | 2 | ||||
| -rwxr-xr-x | debian/postinst | 2 | ||||
| -rwxr-xr-x | debian/rules | 6 | ||||
| -rw-r--r-- | debian/tests/pkg-perl/smoke-env | 1 | ||||
| -rw-r--r-- | debian/tests/pkg-perl/syntax-skip | 4 | ||||
| -rw-r--r-- | debian/tests/pkg-perl/use-name | 1 | ||||
| -rw-r--r-- | debian/upstream/metadata | 5 |
11 files changed, 413 insertions, 82 deletions
diff --git a/debian/NEWS b/debian/NEWS index ff856e5f0..b2753c638 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,27 @@ +ikiwiki (3.20150610) unstable; urgency=low + + The new "emailauth" plugin allows users to authenticate using an email + address, without otherwise creating an account. + + The openid plugin now enables emailauth by default. Please include + emailauth in the disable_plugins setting if this is not desired. + Conversely, if emailauth is required on a wiki that does not enable + openid, you can list it in the enable_plugins setting. + + -- Simon McVittie <smcv@debian.org> Wed, 10 Jun 2015 21:56:56 +0100 + +ikiwiki (3.20150107) experimental; urgency=medium + + By default, this version of IkiWiki tells mobile browsers that its + layout is suitable for small screens. The default layout and the + actiontabs, blueview, goldtype and monochrome themes have been adjusted. + + If you have custom CSS that does not work in a small window (a typical + phone is 320 to 400 CSS pixels wide), please set the new responsive_layout + config option to 0. + + -- Simon McVittie <smcv@debian.org> Mon, 05 Jan 2015 23:48:42 +0000 + ikiwiki (3.20110122) unstable; urgency=low If you have custom CSS that uses "#feedlinks" or "#blogform", you will @@ -99,7 +123,7 @@ ikiwiki (3.13) unstable; urgency=low The `ikiwiki-transition deduplinks` command introduced in the last release was buggy. If you followed the NEWS file instructions - and ran it, you should run `ikiwiki -setup` to rebuild your wiki + and ran it, you should run `ikiwiki --setup` to rebuild your wiki to fix the problem. -- Joey Hess <joeyh@debian.org> Fri, 22 May 2009 13:04:02 -0400 @@ -197,7 +221,7 @@ ikiwiki (2.49) unstable; urgency=low Also, wikis that use the search plugin will need to be rebuilt, since the search form has changed. This will not be done automatically, but can be done by running `ikiwiki-mass-upgrade` as root, or - running `ikiwiki -setup` on individual setup files. + running `ikiwiki --setup` on individual setup files. -- Joey Hess <joeyh@debian.org> Wed, 04 Jun 2008 00:29:28 -0400 diff --git a/debian/changelog b/debian/changelog index 611e51843..4be8489dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,190 @@ -ikiwiki (3.20140912) UNRELEASED; urgency=medium +ikiwiki (3.20150615) UNRELEASED; urgency=medium + + [ Amitai Schlair ] + * meta test: Add tests for many behaviors of the directive. + * img test: Bail gracefully when ImageMagick is not present. + * meta: Fix [[!meta name=foo]] by closing the open quote. + * Avoid unescaped "{" in regular expressions + + [ Joey Hess ] + * emailauth: Added emailauth_sender config. + * Modified page.tmpl to to set html lang= and dir= when + values have been specified for them, which the po plugin does. + + [ Simon McVittie ] + * Run autopkgtest tests using autodep8 and the pkg-perl team's + infrastructure + * t/img.t: do not spuriously skip + * tests: consistently use done_testing instead of no_plan + * Wrap and sort control files (wrap-and-sort -abst) + * Add enough build-dependencies to run all tests, except for + non-git VCSs + * debian/copyright: update for the rename of openid-selector to + login-selector + * git: if no committer identity is known, set it to + "IkiWiki <ikiwiki.info>" in .git/config. This resolves commit errors + in versions of git that require a non-trivial committer identity. + * inline, trail: rename show, feedshow parameters to limit, feedlimit + (with backwards compatibility) + + -- Simon McVittie <smcv@debian.org> Mon, 15 Jun 2015 18:13:23 +0100 + +ikiwiki (3.20150614) unstable; urgency=medium + + * inline: change default sort order from age to "age title" for + determinism, partially fixing deterministic build for git-annex, + ikiwiki-hosting etc. (Closes: #785757) + * img: avoid ImageMagick misinterpreting filenames containing a colon + * img test: set old timestamp on source file that will change, so that + the test will pass even if it takes less than 1 second + + -- Simon McVittie <smcv@debian.org> Sun, 14 Jun 2015 18:13:23 +0100 + +ikiwiki (3.20150610) unstable; urgency=low + + [ Joey Hess ] + * New emailauth plugin lets users log in, without any registration, + by simply clicking on a link in an email. + * Re-remove google from openid selector; their openid provider is + gone for good. + * Make the openid selector display "Password" instead of "Other" + when appropriate, so users are more likely to click on it when + they don't have an openid. + * Converted openid-selector into a more generic loginselector helper + plugin. + * passwordauth: Don't allow registering accounts that look like openids. + * Make cgiurl output deterministic, not hash order. Closes: #785738 + Thanks, Daniel Kahn Gillmor + + [ Simon McVittie ] + * Do not enable emailauth by default, to avoid surprises on httpauth-only + sites. Enable it by default in openid instead, since it is essentially + a replacement for OpenIDs. + * Make the attachment plugin work with CGI.pm 4.x (Closes: #786586; + workaround for #786587 in libcgi-pm-perl) + * Add a public-domain email icon from tango-icon-theme + * Populate pagectime from either mtime or inode change time, + whichever is older, again for more reproducible builds + * debian: build the docwiki with LC_ALL=C.UTF-8 and TZ=UTC + * debian/copyright: consolidate permissive licenses + * debian/copyright: turn comments on provenance into Comment + * brokenlinks: sort the pages that link to the missing page, for + better reproducibility + * Add [[!meta date]] to news items and tips, since the git checkout + and build process can leave the checkout date in the tarball + release, leading to unstable sorting + * Sort backlinks deterministically, by falling back to sorting by href + if the link text is identical + * Add a $config{deterministic} option and use it for the docwiki + * haiku: if deterministic build is requested, return a hard-coded haiku + * polygen: if deterministic build is requested, use a well-known random seed + + -- Simon McVittie <smcv@debian.org> Wed, 10 Jun 2015 21:56:36 +0100 + +ikiwiki (3.20150329) experimental; urgency=high + + [ Joey Hess ] + * Fix NULL ptr deref on ENOMEM in wrapper. (Thanks, igli) + + [ Simon McVittie ] + * Really don't double-decode CGI submissions, even on Perl versions that + bundle an old enough Encode.pm for that not to be a problem: the + system might have a newer Encode.pm installed separately, like Fedora 20. + (Closes: #776181; thanks, Anders Kaseorg) + * If neither timezone nor TZ is set, set both to :/etc/localtime if + we're on a GNU system and that file exists, or GMT otherwise + * t/inline.t: accept translations of "Add a new post titled:" + (Closes: #779365) + * Consistently document command-line options as e.g. --refresh, not -refresh + + [ Amitai Schlair ] + * In VCS-committed anonymous comments, link to url. + + [ Joey Hess ] + * Fix XSS in openid selector. Thanks, Raghav Bisht. (Closes: #781483) + + -- Simon McVittie <smcv@debian.org> Sun, 29 Mar 2015 21:48:24 +0100 + +ikiwiki (3.20150107) experimental; urgency=medium + + [ Joey Hess ] + * Added ikiwiki-comment program. + * Add missing build-depends on libcgi-formbuilder-perl, needed for + t/relativity.t + * openid: Stop suppressing the email field on the Preferences page. + * Set Debian package maintainer to Simon McVittie as I'm retiring from + Debian. + + [ Simon McVittie ] + * calendar: add calendar_autocreate option, with which "ikiwiki --refresh" + can mostly supersede the ikiwiki-calendar command. + Thanks, Louis Paternault + * search: add more classes as a hook for CSS. Thanks, sajolida + * core: generate HTML5 by default, but keep avoiding new elements + like <section> that require specific browser support unless html5 is + set to 1. + * Tell mobile browsers to draw our pages in a device-sized viewport, + not an 800-1000px viewport designed to emulate a desktop/laptop browser. + * Add new responsive_layout option which can be set to 0 if your custom + CSS only works in a large viewport. + * style.css, actiontabs, blueview, goldtype, monochrome: adjust layout + below 600px ("responsive layout") so that horizontal scrolling is not + needed on smartphone browsers or other small viewports. + * core: new libdirs option alongside libdir. Thanks, Louis Paternault + + [ Amitai Schlair ] + * core: log a debug message before waiting for the lock. + Thanks, Mark Jason Dominus + * build: in po/Makefile, use the same $(MAKE) as the rest of the build. + Thanks, ttw + * blogspam: use the 2.0 JSON API (the 1.0 XML-RPC API has been EOL'd). + Closes: #774441 + + [ Joey Hess ] + * po: If msgmerge falls over on a problem po file, print a warning + message, but don't let this problem crash ikiwiki entirely. + + -- Simon McVittie <smcv@debian.org> Wed, 07 Jan 2015 09:13:58 +0000 + +ikiwiki (3.20141016) unstable; urgency=medium + + [ Joey Hess ] + * Fix crash that can occur when only_committed_changes is set and a + file is deleted from the underlay. + + [ Simon McVittie ] + * core: avoid dangerous use of CGI->param in list context, which led + to a security flaw in Bugzilla; as far as we can tell, ikiwiki + is not vulnerable to a similar attack, but it's best to be safe + * core: new reverse_proxy option prevents ikiwiki from trying to detect + how to make self-referential URLs by using the CGI environment variables, + for instance when it's deployed behind a HTTP reverse proxy + (Closes: #745759) + * core: the default User-Agent is now "ikiwiki/$version" to work around + ModSecurity rules assuming that only malware uses libwww-perl + * core: use protocol-relative URLs (e.g. //www.example.com/wiki) so that + https stays on https and http stays on http, particularly if the + html5 option is enabled + * core: avoid mixed content when a https cgiurl links to http static pages + on the same server (the static pages are assumed to be accessible via + https too) + * core: force the correct top URL in w3mmode + * google plugin: Use search form + * docwiki: replace Paypal and Flattr buttons with text links + * comments: don't record the IP address in the wiki if the user is + logged in via passwordauth or httpauth + * templates: add ARIA roles to some page elements, if html5 is enabled. + Thanks, Patrick + * debian: build-depend on libmagickcore-6.q16-2-extra | libmagickcore-extra + so we can thumbnail SVGs in the docwiki + * debian: explicitly depend and build-depend on libcgi-pm-perl + * debian: drop unused python-support dependency + * debian: rename debian/link to debian/links so the intended symlinks appear + * debian: fix some wrong paths in the copyright file + + -- Simon McVittie <smcv@debian.org> Thu, 16 Oct 2014 23:28:26 +0100 + +ikiwiki (3.20140916) unstable; urgency=low * Don't double-decode CGI submissions with Encode.pm >= 2.53, fixing "Error: Cannot decode string with wide characters". @@ -18,6 +204,19 @@ ikiwiki (3.20140912) UNRELEASED; urgency=medium * Fix aspect ratio when scaling small images, and add support for converting SVG and PDF graphics to PNG. Thanks, chrysn + - suggest ghostscript (required for PDF-to-PNG thumbnailing) + and libmagickcore-extra (required for SVG-to-PNG thumbnailing) + - build-depend on ghostscript so the test for scalable images can be run + * In the CGI wrapper, incorporate $config{ENV} into the environment + before executing Perl code, so that PERL5LIB can point to a + non-system-wide installation of IkiWiki. + Thanks, Lafayette Chamber Singers Webmaster + * filecheck: accept MIME types not containing ';' + * autoindex: index files in underlays if the resulting pages aren't + going to be committed. Closes: #611068 + * Add [[!templatebody]] directive so template pages don't have to be + simultaneously a valid template and valid HTML + * Add myself to Uploaders and release to Debian -- Simon McVittie <smcv@debian.org> Fri, 12 Sep 2014 21:23:58 +0100 diff --git a/debian/control b/debian/control index 2ab6207e0..88ed20562 100644 --- a/debian/control +++ b/debian/control @@ -1,48 +1,111 @@ Source: ikiwiki Section: web Priority: optional -Build-Depends: perl, debhelper (>= 9) -Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, - 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-libyaml-perl, python-support, librpc-xml-perl, - libcgi-session-perl -Maintainer: Joey Hess <joeyh@debian.org> -Uploaders: Josh Triplett <josh@freedesktop.org> +Build-Depends: + debhelper (>= 9), + perl, +Build-Depends-Indep: + dpkg-dev (>= 1.9.0), + ghostscript, + git (>= 1:1.7), + libcgi-formbuilder-perl, + libcgi-pm-perl, + libcgi-session-perl, + libfile-chdir-perl, + libfile-mimeinfo-perl, + libhtml-parser-perl, + libhtml-scrubber-perl, + libhtml-template-perl, + libmagickcore-6.q16-2-extra | libmagickcore-extra, + libnet-openid-consumer-perl, + librpc-xml-perl, + libtext-markdown-discount-perl, + libtimedate-perl, + liburi-perl (>= 1.36), + libxml-feed-perl, + libxml-parser-perl, + libxml-simple-perl, + libxml-twig-perl, + libyaml-libyaml-perl, + perlmagick, + po4a (>= 0.34), +Maintainer: Simon McVittie <smcv@debian.org> +Uploaders: + Josh Triplett <josh@freedesktop.org>, Standards-Version: 3.9.5 Homepage: http://ikiwiki.info/ Vcs-Git: git://git.ikiwiki.info/ +Testsuite: autopkgtest-pkg-perl Package: ikiwiki Architecture: all -Depends: ${misc:Depends}, ${perl:Depends}, - libtext-markdown-discount-perl, - libhtml-scrubber-perl, libhtml-template-perl, - libhtml-parser-perl, liburi-perl (>= 1.36), libyaml-libyaml-perl, libjson-perl -Recommends: gcc | c-compiler, - libc6-dev | libc-dev, - 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), - libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl, - libgravatar-url-perl, librpc-xml-perl, -Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, - xapian-omega (>= 1.0.5), libtext-wikiformat-perl, - python, python-docutils, polygen, tidy, libhtml-tree-perl, - libxml-feed-perl, libmailtools-perl, perlmagick, - libfile-mimeinfo-perl, file, - liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, - libtext-csv-perl, graphviz, libnet-amazon-s3-perl, - libsparkline-php, texlive, dvipng, libtext-wikicreole-perl, - libsort-naturally-perl, libtext-textile-perl, libhighlight-perl, - po4a (>= 0.35-1), gettext, libnet-inet6glue-perl, - libtext-multimarkdown-perl, libxml-writer-perl -Conflicts: ikiwiki-plugin-table -Replaces: ikiwiki-plugin-table -Provides: ikiwiki-plugin-table +Depends: + libhtml-parser-perl, + libhtml-scrubber-perl, + libhtml-template-perl, + libjson-perl, + libtext-markdown-discount-perl, + liburi-perl (>= 1.36), + libyaml-libyaml-perl, + ${misc:Depends}, + ${perl:Depends}, +Recommends: + gcc | c-compiler, + git (>= 1:1.7) | git-core (>= 1:1.5.0) | subversion | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs, + libauthen-passphrase-perl, + libc6-dev | libc-dev, + libcgi-formbuilder-perl (>= 3.05), + libcgi-pm-perl, + libcgi-session-perl (>= 4.14-1), + libcrypt-ssleay-perl, + libgravatar-url-perl, + liblwpx-paranoidagent-perl, + libmail-sendmail-perl, + libnet-openid-consumer-perl, + librpc-xml-perl, + libterm-readline-gnu-perl, + libtimedate-perl, + libxml-simple-perl, +Suggests: + dvipng, + file, + gettext, + ghostscript, + graphviz, + libfile-mimeinfo-perl, + libhighlight-perl, + libhtml-tree-perl, + liblocale-gettext-perl (>= 1.05-1), + libmagickcore-extra, + libmailtools-perl, + libnet-amazon-s3-perl, + libnet-inet6glue-perl, + libsearch-xapian-perl, + libsort-naturally-perl, + libsparkline-php, + libtext-csv-perl, + libtext-multimarkdown-perl, + libtext-textile-perl, + libtext-typography-perl, + libtext-wikicreole-perl, + libtext-wikiformat-perl, + libxml-feed-perl, + libxml-writer-perl, + perlmagick, + po4a (>= 0.35-1), + polygen, + python, + python-docutils, + texlive, + tidy, + viewvc | gitweb | viewcvs, + xapian-omega (>= 1.0.5), +Conflicts: + ikiwiki-plugin-table, +Replaces: + ikiwiki-plugin-table, +Provides: + ikiwiki-plugin-table, Description: a wiki compiler Ikiwiki converts a directory full of wiki pages into HTML pages suitable for publishing on a website. Unlike many wikis, ikiwiki does not have its diff --git a/debian/copyright b/debian/copyright index f3ea9e740..d6c66b303 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,11 +6,9 @@ Copyright: © 2006-2011 Joey Hess <joey@ikiwiki.info> License: GPL-2+ Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/* - ikiwiki.setup po/underlay/* + ikiwiki.setup po/underlays/* Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info> -License: other - Redistribution and use in source and compiled forms, with or without - modification, are permitted under any circumstances. No warranty. +License: permissive Files: IkiWiki/Plugin/bzr.pm Copyright: © 2008 Jelmer Vernooij <jelmer@samba.org> @@ -71,10 +69,6 @@ Files: IkiWiki/Plugin/img.pm Copyright: © 2006 Christian Mock <cm@tahina.priv.at> License: GPL-2+ -Files: IkiWiki/Plugin/topography.pm -Copyright: © 2006 Recai Oktaş <roktas@debian.org> -License: GPL-2+ - Files: IkiWiki/Plugin/map.pm Copyright: © 2006 Alessandro Dotti Contra License: GPL-2+ @@ -146,11 +140,11 @@ Copyright: © 2009 William Uther License: GPL-2+ Files: IkiWiki/Plugin/cvs.pm -Copyright: © 2009 Amitai Schlair +Copyright: © 2009 Amitai Schlair <http://www.schmonz.com/> License: BSD-2-clause Files: IkiWiki/Plugin/rsync.pm -Copyright: © 2009 Amitai Schlair +Copyright: © 2009 Amitai Schlair <http://www.schmonz.com/> License: BSD-2-clause Files: IkiWiki/Plugin/osm.pm @@ -180,45 +174,43 @@ Copyright: 2007 Damyan Ivanov <dam@modsodtsys.com> 2007 Daniel Nylander <po@danielnylander.se> 2009 Fernando González de Requena <fgrequena@gmail.com> 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> -License: other - Redistribution and use in source and compiled forms, with or without - modification, are permitted under any circumstances. No warranty. +License: permissive Files: doc/smileys/* Copyright: (c) 2000 - 2004 by Jürgen Hermann <jh@web.de> (c) 1999, 2000 Martin Pool <mbp@humbug.org.au> License: GPL-2+ - Smileys were copied from Moin Moin. +Comment: Smileys were copied from Moin Moin. Files: doc/smileys/neutral.png - doc/smileys/question.pn + doc/smileys/question.png Copyright: (c) 2002 phpBB Group License: GPL-2 - These smileys were copied from phpBB. +Comment: These smileys were copied from phpBB. Files: doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn Copyright: © 2007 Joey Hess <joeyh@ikiwiki.info>, LinuxWorld.com -Comment: +Comment: First published on LinuxWorld.com, a publication of Network World Inc., 118 Turnpike Rd., Southboro, MA 01772. . Republished with permission. License: GPL-2+ -Files: underlays/openid-selector/ikiwiki/openid/* +Files: underlays/login-selector/ikiwiki/login-selector/* Copyright: © 2008-2010 andyjm, david.j.boden -Comment: - From http://code.google.com/p/openid-selector/ +Comment: + Based on https://code.google.com/archive/p/openid-selector/ License: BSD-2-clause -Files: underlays/openid-selector/ikiwiki/openid/goa-* +Files: underlays/login-selector/ikiwiki/login-selector/goa-* Copyright: © 2011 Red Hat, Inc. License: LGPL-2.1+ Comment: taken from data/icons/16x16/ in gnome-online-accounts git -Files: underlays/openid-selector/ikiwiki/openid/wordpress.png +Files: underlays/login-selector/ikiwiki/login-selector/wordpress.png Copyright: © 2003-2013 "the contributors" License: GPL-2+ @@ -230,37 +222,34 @@ Files: icons/aol.svg icons/livejournal.svg icons/verisign.svg - underlays/openid-selector/ikiwiki/openid/aol.png - underlays/openid-selector/ikiwiki/openid/livejournal.png - underlays/openid-selector/ikiwiki/openid/verisign.png + underlays/login-selector/ikiwiki/login-selector/aol.png + underlays/login-selector/ikiwiki/login-selector/verisign.png Copyright: © 2014 Simon McVittie -License: other - Redistribution and use in source and compiled forms, with or without - modification, are permitted under any circumstances. No warranty. +License: permissive Files: underlays/jquery/* Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer © 2011 The Dojo Foundation License: GPL-2 -Files: underlays/attachments/ikiwiki/jquery-ui* +Files: underlays/attachment/ikiwiki/jquery-ui* Copyright: © 2008 Paul Bakaus © 2011 the jQuery UI Authors (http://jqueryui.com/about) License: GPL-2 -Files: underlays/attachments/ikiwiki/jquery.tmpl* +Files: underlays/attachment/ikiwiki/jquery.tmpl* Copyright: © Boris Moore License: GPL-2 -Files: underlays/attachments/ikiwiki/ +Files: underlays/attachment/ikiwiki/* Copyright: 2010, 2011 Sebastian Tschan Comment: blueimp / jQuery-File-Upload widget, from https://github.com/blueimp/jQuery-File-Upload License: Expat -Files: underlays/themes/blueview/style.css +Files: themes/blueview/style.css Copyright: © 2009,2010 Bernd Zeimetz © 2008 Yahoo! Inc. Comment: @@ -268,18 +257,31 @@ Comment: http://developer.yahoo.com/yui/license.html License: GPL-2+ -Files: underlays/themes/blueview/* +Files: themes/blueview/* Copyright: © 2009,2010 Bernd Zeimetz License: GPL-2+ -Files: underlays/themes/goldtype/* +Files: themes/goldtype/* Copyright: © Lars Wirzenius License: GPL-2+ -Files: underlays/themes/monochrome/* +Files: themes/monochrome/* Copyright: © 2012 Jon Dowland License: GPL-2+ +Files: + icons/internet-mail.svg + doc/wikiicons/email.png +Comment: + icon by Jakub Steiner and Andreas Nilsson, taken from + tango-icon-theme 0.8.90. +Copyright: none +License: public-domain + +License: permissive + Redistribution and use in source and compiled forms, with or without + modification, are permitted under any circumstances. No warranty. + License: BSD-2-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -328,7 +330,7 @@ License: Expat 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. + SOFTWARE. License: LGPL-2.1+ This library is free software; you can redistribute it and/or @@ -346,3 +348,39 @@ License: LGPL-2.1+ . On Debian systems, the complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. + +License: public-domain + Public Domain Dedication + . + Copyright-Only Dedication (based on United States law) or Public Domain + Certification + . + The person or persons who have associated work with this document (the + "Dedicator" or "Certifier") hereby either (a) certifies that, to the best + of his knowledge, the work of authorship identified is in the public + domain of the country from which the work is published, or (b) + hereby dedicates whatever copyright the dedicators holds in the work + of authorship identified below (the "Work") to the public domain. A + certifier, moreover, dedicates any copyright interest he may have in + the associated work, and for these purposes, is described as a + "dedicator" below. + . + A certifier has taken reasonable steps to verify the copyright + status of this work. Certifier recognizes that his good faith efforts + may not shield him from liability if in fact the work certified is not + in the public domain. + . + Dedicator makes this dedication for the benefit of the public at + large and to the detriment of the Dedicator's heirs and successors. + Dedicator intends this dedication to be an overt act of relinquishment + in perpetuity of all present and future rights under copyright law, + whether vested or contingent, in the Work. Dedicator understands that + such relinquishment of all rights includes the relinquishment of all + rights to enforce (by lawsuit or otherwise) those copyrights in the + Work. + . + Dedicator recognizes that, once placed in the public domain, the Work + may be freely reproduced, distributed, transmitted, used, modified, + built upon, or otherwise exploited by anyone for any purpose, commercial + or non-commercial, and in any way, including by methods that have not + yet been invented or conceived. diff --git a/debian/link b/debian/links index cb3793191..5989f4c7d 100644 --- a/debian/link +++ b/debian/links @@ -1,2 +1,2 @@ -usr/share/ikiwiki/examples usr/share/doc/ikiwiki/examples usr/share/common-licenses/GPL-2 usr/share/doc/ikiwiki/html/GPL +usr/share/ikiwiki/examples usr/share/doc/ikiwiki/examples diff --git a/debian/postinst b/debian/postinst index 76ad115ac..0a876ae08 100755 --- a/debian/postinst +++ b/debian/postinst @@ -10,5 +10,5 @@ if [ "$1" = configure ] && \ dpkg --compare-versions "$2" lt "$firstcompat"; then ikiwiki-mass-rebuild else - ikiwiki-mass-rebuild -refresh -wrappers + ikiwiki-mass-rebuild --refresh --wrappers fi diff --git a/debian/rules b/debian/rules index 0a7ce7a26..cf3087d1d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f %: - dh $@ + LC_ALL=C.UTF-8 TZ=UTC dh $@ override_dh_auto_configure: # keeps it out of /usr/local @@ -13,7 +13,3 @@ override_dh_compress: override_dh_auto_clean: # distclean moans about MANIFEST, this is quieter if [ -e Makefile ]; then $(MAKE) realclean; fi - -# Not intended for use by anyone except the author. -announcedir: - @echo ${HOME}/src/ikiwiki/doc/news diff --git a/debian/tests/pkg-perl/smoke-env b/debian/tests/pkg-perl/smoke-env new file mode 100644 index 000000000..774738148 --- /dev/null +++ b/debian/tests/pkg-perl/smoke-env @@ -0,0 +1 @@ +INSTALLED_TESTS=1 diff --git a/debian/tests/pkg-perl/syntax-skip b/debian/tests/pkg-perl/syntax-skip new file mode 100644 index 000000000..404e431d3 --- /dev/null +++ b/debian/tests/pkg-perl/syntax-skip @@ -0,0 +1,4 @@ +IkiWiki/Plugin/amazon_s3.pm +IkiWiki/Plugin/cvs.pm +IkiWiki/Plugin/monotone.pm +IkiWiki/Plugin/po.pm diff --git a/debian/tests/pkg-perl/use-name b/debian/tests/pkg-perl/use-name new file mode 100644 index 000000000..3d60011b3 --- /dev/null +++ b/debian/tests/pkg-perl/use-name @@ -0,0 +1 @@ +IkiWiki diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 000000000..1041dfaf7 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,5 @@ +Name: ikiwiki +Bug-Database: http://ikiwiki.info/bugs/ +Bug-Submit: http://ikiwiki.info/bugs/ +Changelog: http://ikiwiki.info/news/ +Donation: http://ikiwiki.info/tipjar/ |