On Fri, 17 Jul 2015 20:20:22 +0300, Dmitry Shachnev wrote: > morse-simulator FTBFS with Sphinx 1.3 (which is available in experimental) > > The 'default' theme has been renamed to 'classic', so the template file > is now classic/layout.html.
Sphinx 1.3 is now in unstable, so I bumped the severity to serious. I have attached the minimal debdiff that fixes the build faulure. -- Dmitry Shachnev
diff -ruN a/debian/changelog b/debian/changelog --- a/debian/changelog 2015-04-27 19:57:10.000000000 +0300 +++ b/debian/changelog 2015-08-15 21:58:32.000000000 +0300 @@ -1,3 +1,10 @@ +morse-simulator (1.2.2-2) UNRELEASED; urgency=medium + + * Update morse-theme for Sphinx 1.3 (closes: #792711). + - Bump python3-sphinx build-dependency. + + -- Dmitry Shachnev <mity...@debian.org> Sat, 15 Aug 2015 21:57:29 +0300 + morse-simulator (1.2.2-1) unstable; urgency=medium * Upload to unstable diff -ruN a/debian/control b/debian/control --- a/debian/control 2014-12-30 15:34:42.000000000 +0300 +++ b/debian/control 2015-08-15 21:57:20.000000000 +0300 @@ -4,7 +4,7 @@ Maintainer: Debian Science Team <debian-science-maintain...@lists.alioth.debian.org> Uploaders: Sylvestre Ledru <sylves...@debian.org>, Séverin Lemaignan <seve...@guakamole.org> Build-Depends: debhelper (>= 8.0.0), cmake, python3-dev, - python3-sphinx, pkg-config, python-concurrent.futures + python3-sphinx (>= 1.3), pkg-config, python-concurrent.futures Standards-Version: 3.9.6 Homepage: http://morse.openrobots.org/ X-Python3-Version: >= 3.2 diff -ruN a/debian/patches/series b/debian/patches/series --- a/debian/patches/series 2014-12-30 15:32:58.000000000 +0300 +++ b/debian/patches/series 2015-08-15 21:55:20.000000000 +0300 @@ -0,0 +1 @@ +sphinx13_theme_rename.diff diff -ruN a/debian/patches/sphinx13_theme_rename.diff b/debian/patches/sphinx13_theme_rename.diff --- a/debian/patches/sphinx13_theme_rename.diff 1970-01-01 03:00:00.000000000 +0300 +++ b/debian/patches/sphinx13_theme_rename.diff 2015-08-15 21:57:09.000000000 +0300 @@ -0,0 +1,17 @@ +Description: update base template for Sphinx 1.3 + The 'default' theme has been renamed to 'classic' in Sphinx 1.3. +Author: Dmitry Shachnev <mity...@debian.org> +Forwarded: no +Last-Update: 2015-08-15 + +--- a/doc/morse-theme/templates/layout.html ++++ b/doc/morse-theme/templates/layout.html +@@ -1,7 +1,7 @@ + {# + MORSE Sphinx template + #} +-{% extends "default/layout.html" %} ++{% extends "classic/layout.html" %} + + {% block rootrellink %} + <li><a href="{{ pathto(master_doc) }}">{{ project }}</a>{{ reldelim1 }}
signature.asc
Description: OpenPGP digital signature
