Merge branch 'master' of ssh://git.ikiwiki.info

5 files changed, 22 insertions, 29 deletions

diff --git a/debian/control b/debian/control
index ad57a126f..4dbb39db3 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Build-Depends-Indep:
 Maintainer: Simon McVittie <smcv@debian.org>
 Uploaders:
  Josh Triplett <josh@freedesktop.org>,
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
 Homepage: https://ikiwiki.info/
 Vcs-Git: git://git.ikiwiki.info/
 Vcs-Browser: http://source.ikiwiki.branchable.com/?p=source.git;a=summary
diff --git a/debian/copyright b/debian/copyright
index b140feaa1..a25660adf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: native package
+Source: https://ikiwiki.info/git/
 
 Files: *
 Copyright: © 2006-2011 Joey Hess <joey@ikiwiki.info>
 License: GPL-2+
 
 Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/*
- ikiwiki.setup po/underlays/* underlays/javascript/*
+ po/underlays/* underlays/javascript/*
 Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>
 License: permissive
 
@@ -203,13 +203,6 @@ Comment:
  Based on https://code.google.com/archive/p/openid-selector/
 License: BSD-2-clause
 
-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/jquery/*
 Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
            © 2011 The Dojo Foundation
@@ -314,23 +307,6 @@ License: Expat
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- 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
  .
diff --git a/debian/ikiwiki.lintian-overrides b/debian/ikiwiki.lintian-overrides
index 5c101d2a4..08cb40edc 100644
--- a/debian/ikiwiki.lintian-overrides
+++ b/debian/ikiwiki.lintian-overrides
@@ -1,4 +1,2 @@
 ikiwiki: script-not-executable etc/ikiwiki/auto-blog.setup
 ikiwiki: script-not-executable etc/ikiwiki/auto.setup
-ikiwiki: spelling-error-in-changelog Moin Moin (duplicate word) Moin
-ikiwiki: spelling-error-in-copyright Moin Moin (duplicate word) Moin
diff --git a/doc/index.mdwn b/doc/index.mdwn
index 0122e489c..e0e401656 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,3 +1,5 @@
+[[!template id=links]]
+
 Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
 suitable for publishing on a website. Ikiwiki stores pages and history in a
 [[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
diff --git a/doc/todo/consider_using_python3_for_rst_plugin.mdwn b/doc/todo/consider_using_python3_for_rst_plugin.mdwn
new file mode 100644
index 000000000..5135d153a
--- /dev/null
+++ b/doc/todo/consider_using_python3_for_rst_plugin.mdwn
@@ -0,0 +1,17 @@
+Python 2 is officially unsupported after 2020, which is before the expected end-of-life
+date of the next round of long-term-stable distributions like Debian 10 and Ubuntu 18.04,
+so those distributions are encouraging all software that can migrate to Python 3 to do so.
+
+The down side of this is that it would make it harder to use the `rst` plugin on
+very old OS releases, or on OSs where Python 3 is available but doesn't have a `python3`
+symbolic link (if such OSs exist - [PEP 394](https://www.python.org/dev/peps/pep-0394/)
+says they shouldn't), or in shared hosting environments where Python 2 is installed but
+Python 3 isn't. (Mitigation: switching it to `python` or `python2` is a 1-line change.)
+
+For today's upload to Debian, I switched the `#!` line in the [[plugins/rst]] plugin
+to `#!/usr/bin/python3`. In upstream ikiwiki it would probably be more appropriate
+to use `#!/usr/bin/env python3`, and it would certainly be more appropriate to do it
+by changing the source rather than by using `sed` after installation. I didn't apply that
+change upstream immediately to give other maintainers a chance to comment. Thoughts?
+
+--[[smcv]]