user debian-rele...@lists.debian.org usertag 895401 + bsp-2019-02-de-berlin thank you
Hi all, Greetings from the BSP at the DCSO office in Berlin. > Whilst working on the Reproducible Builds effort [0], we noticed > that libmypaint could not be built reproducibly due to it > including the full build path in the documentation. I have incorporated this fix and will upload a non-maintainer upload (libmypaint_1.3.0-2.1) to DELAYED with a 5 day delay. See attached patch for an overview of the total changeset. Cheers Sascha
diff --git a/debian/changelog b/debian/changelog index 3bc3051..6a01797 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +libmypaint (1.3.0-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Remove unused Sphinx extension. Thanks to Dmitry Shachnev for the hint. + Closes: #918850 + * Make build reproducible. Thanks to Chris Lamb for the patch. + Closes: #895401 + * Reference correct homepage. Thanks to Chris Lamb for the patch. + Closes: #895402 + + -- Sascha Steinbiss <sa...@debian.org> Sat, 09 Feb 2019 12:22:40 +0100 + libmypaint (1.3.0-2) unstable; urgency=medium * Add Conflicts: mypaint-data to libmypaint-common. See bug 894757 diff --git a/debian/control b/debian/control index ed96ddf..afe2bd0 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: autoconf-archive, Standards-Version: 4.1.3 Vcs-Browser: https://salsa.debian.org/multimedia-team/libmypaint Vcs-Git: https://salsa.debian.org/multimedia-team/libmypaint.git -Homepage: https://github.com/Jehan/mypaint-brushes +Homepage: https://github.com/Jehan/mypaint Package: libmypaint-1.3-0 Architecture: any diff --git a/debian/patches/disable-sphinx-math-extension.patch b/debian/patches/disable-sphinx-math-extension.patch new file mode 100644 index 0000000..19286b3 --- /dev/null +++ b/debian/patches/disable-sphinx-math-extension.patch @@ -0,0 +1,17 @@ +Description: remove unused Sphinx extension + This package uses a deprecated and later removed Sphinx extension + that led to a FTBFS with recent Sphinx versions. + Since it wasn't used in the documentation anyway, it should be safe to remove. +Author: Sascha Steinbiss <sa...@debian.org> +Last-Update: 2019-02-09 +--- a/doc/source/conf.py ++++ b/doc/source/conf.py +@@ -27,7 +27,7 @@ + + # Add any Sphinx extension module names here, as strings. They can be extensions + # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig', 'sphinx.ext.viewcode'] ++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.ifconfig', 'sphinx.ext.viewcode'] + + # Breathe setup, for integrating doxygen content + extensions.append('breathe') diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch new file mode 100644 index 0000000..8a0b6a5 --- /dev/null +++ b/debian/patches/reproducible-build.patch @@ -0,0 +1,15 @@ +Description: Make the build reproducible +Author: Chris Lamb <la...@debian.org> +Last-Update: 2018-04-11 + +--- libmypaint-1.3.0.orig/doc/Doxyfile ++++ libmypaint-1.3.0/doc/Doxyfile +@@ -119,7 +119,7 @@ INLINE_INHERITED_MEMB = NO + # path before files name in the file list and in the header files. If set + # to NO the shortest path that makes the file name unique will be used. + +-FULL_PATH_NAMES = YES ++FULL_PATH_NAMES = NO + + # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag + # can be used to strip a user-defined part of the path. Stripping is diff --git a/debian/patches/series b/debian/patches/series index 1e8becf..e298399 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ dont-require-m4macros.patch +reproducible-build.patch +disable-sphinx-math-extension.patch