Hi,
Since it's been a month and a half that #737315 is not fixed, I have
uploaded buildbot to the delayed/7 queue to:
- fix the FTBFS
- rebuild with SQLAlchemy 0.9 as dependency (it's a transition currently
happening in Sid)
Attached is the debdiff. You'll notice that I had to move a .png and a
.ico file directly in the "docs" folder to make it possible to build (it
otherwise failed). A simple copy and adding the files names in
debian/source/include-binaries was enough.
If you do not agree with my fixes, feel free to upload a fixed version
before the 7 days of the delayed queue.
Cheers,
Thomas Goirand (zigo)
diff -Nru buildbot-0.8.8/debian/changelog buildbot-0.8.8/debian/changelog
--- buildbot-0.8.8/debian/changelog 2013-10-10 10:24:05.000000000 +0000
+++ buildbot-0.8.8/debian/changelog 2014-03-17 06:46:54.000000000 +0000
@@ -1,3 +1,11 @@
+buildbot (0.8.8-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuild with sqlalchemy 0.9.
+ * Added upstream doc patches to avoid FTBFS (Closes: #737315).
+
+ -- Thomas Goirand <z...@debian.org> Mon, 17 Mar 2014 06:22:09 +0000
+
buildbot (0.8.8-1) unstable; urgency=low
* New upstream release
diff -Nru
buildbot-0.8.8/debian/patches/add-whitespace-to-avoid-failure-with-sphinx-1.2.1.patch
buildbot-0.8.8/debian/patches/add-whitespace-to-avoid-failure-with-sphinx-1.2.1.patch
---
buildbot-0.8.8/debian/patches/add-whitespace-to-avoid-failure-with-sphinx-1.2.1.patch
1970-01-01 00:00:00.000000000 +0000
+++
buildbot-0.8.8/debian/patches/add-whitespace-to-avoid-failure-with-sphinx-1.2.1.patch
2014-03-17 06:34:35.000000000 +0000
@@ -0,0 +1,16 @@
+Description: add whitespace to avoid failure with Sphinx-1.2.1
+Origin: upstream,
https://github.com/buildbot/buildbot/commit/7ba629d27c377f9a4323024a64fd8a7d9f8f1934.patch
+Author: "Dustin J. Mitchell" <dus...@mozilla.com>
+Bug-Debian: http://bugs.debian.org/737315
+Date: Tue, 21 Jan 2014 21:20:58 -0500
+
+--- a/docs/manual/installation.rst
++++ b/docs/manual/installation.rst
+@@ -649,6 +649,7 @@ command line, like this
+ around. The default is 10.
+
+ .. option:: --allow-shutdown
++
+ Can also be passed directly to the BuildSlave constructor in
buildbot.tac. If
+ set, it allows the buildslave to initiate a graceful shutdown, meaning
that it
+ will ask the master to shut down the slave when the current build, if
any, is
diff -Nru buildbot-0.8.8/debian/patches/series
buildbot-0.8.8/debian/patches/series
--- buildbot-0.8.8/debian/patches/series 2013-10-10 10:24:05.000000000
+0000
+++ buildbot-0.8.8/debian/patches/series 2014-03-17 06:46:03.000000000
+0000
@@ -1,2 +1,4 @@
fix-interpreters.patch
fix-init-scripts.patch
+sphinx-doesnt-seem-to-support-relative-paths-for-log-anymore.patch
+add-whitespace-to-avoid-failure-with-sphinx-1.2.1.patch
diff -Nru
buildbot-0.8.8/debian/patches/sphinx-doesnt-seem-to-support-relative-paths-for-log-anymore.patch
buildbot-0.8.8/debian/patches/sphinx-doesnt-seem-to-support-relative-paths-for-log-anymore.patch
---
buildbot-0.8.8/debian/patches/sphinx-doesnt-seem-to-support-relative-paths-for-log-anymore.patch
1970-01-01 00:00:00.000000000 +0000
+++
buildbot-0.8.8/debian/patches/sphinx-doesnt-seem-to-support-relative-paths-for-log-anymore.patch
2014-03-17 06:43:34.000000000 +0000
@@ -0,0 +1,27 @@
+Description: sphinx doesn't seem to support relative paths for logos anymore
+Author: "Dustin J. Mitchell" <dus...@mozilla.com>
+Origin: upstream,
https://github.com/buildbot/buildbot/commit/a655a504309db8584ae582065fe27548a16c3dd3.patch
+Bug-Debian: http://bugs.debian.org/737315
+Date: Thu, 23 Jan 2014 16:32:25 -0500
+Last-Update: 2014-03-17
+
+--- buildbot-0.8.8.orig/docs/conf.py
++++ buildbot-0.8.8/docs/conf.py
+@@ -129,7 +129,7 @@ html_theme = 'agogo'
+
+ # The name of an image file (relative to this directory) to place at the top
+ # of the sidebar.
+-html_logo = os.path.join('_images', 'header-text-transparent.png')
++html_logo = 'header-text-transparent.png'
+
+ # The name of an image file (within the static path) to use as favicon of the
+ # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
+@@ -203,7 +203,7 @@ latex_documents = [
+
+ # The name of an image file (relative to this directory) to place at the top
of
+ # the title page.
+-latex_logo = os.path.join('_images', 'header-text-transparent.png')
++latex_logo = 'header-text-transparent.png'
+
+ # For "manual" documents, if this is true, then toplevel headings are parts,
+ # not chapters.
diff -Nru buildbot-0.8.8/debian/source/include-binaries
buildbot-0.8.8/debian/source/include-binaries
--- buildbot-0.8.8/debian/source/include-binaries 1970-01-01
00:00:00.000000000 +0000
+++ buildbot-0.8.8/debian/source/include-binaries 2014-03-17
06:49:33.000000000 +0000
@@ -0,0 +1,2 @@
+docs/header-text-transparent.png
+docs/buildbot.ico
Binary files /tmp/UTsoDee7Uq/buildbot-0.8.8/docs/buildbot.ico and
/tmp/Ou5wD1MQIz/buildbot-0.8.8/docs/buildbot.ico differ
Binary files /tmp/UTsoDee7Uq/buildbot-0.8.8/docs/header-text-transparent.png
and /tmp/Ou5wD1MQIz/buildbot-0.8.8/docs/header-text-transparent.png differ
