X-Debbugs-CC: Jakub Wilk <jw...@debian.org>
Here's a patch that follows the first piece of Jakub's advice.
diff -u update-manager-0.200.5/debian/changelog
update-manager-0.200.5/debian/changelog
--- update-manager-0.200.5/debian/changelog
+++ update-manager-0.200.5/debian/changelog
@@ -1,3 +1,11 @@
+update-manager (0.200.5-2+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Avoid manipulating the documentation build directory to not step on
+ sphinx's toes (closes: #655804).
+
+ -- Marcin Owsiany <porri...@debian.org> Sat, 22 Sep 2012 15:34:35 +0100
+
update-manager (0.200.5-2) unstable; urgency=medium
* locale.format_suffix.patch: replace locale.format() calls with
diff -u update-manager-0.200.5/debian/rules update-manager-0.200.5/debian/rules
--- update-manager-0.200.5/debian/rules
+++ update-manager-0.200.5/debian/rules
@@ -14,11 +14,12 @@
-mkdir -p $(CURDIR)/doc/source/_static
$(MAKE) -C $(CURDIR)/doc html
mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/update-manager-doc
- -rm $(CURDIR)/doc/build/html/_static/jquery.js
- ln -s /usr/share/javascript/jquery/jquery.js \
- $(CURDIR)/doc/build/html/_static/jquery.js
cp -r $(CURDIR)/doc/build/html \
$(CURDIR)/debian/tmp/usr/share/doc/update-manager-doc
+# Avoid manipulating the documentation build directory: Bug#655804
+ -rm
$(CURDIR)/debian/tmp/usr/share/doc/update-manager-doc/html/_static/jquery.js
+ ln -s /usr/share/javascript/jquery/jquery.js \
+
$(CURDIR)/debian/tmp/usr/share/doc/update-manager-doc/html/_static/jquery.js
# copied from CDBS; I cannot use gnome.mk, for it includes autotools.mk
# although this package does not use autotools; the build, thus, fails.
only in patch2:
unchanged:
--- update-manager-0.200.5.orig/debian/pycompat
+++ update-manager-0.200.5/debian/pycompat
@@ -0,0 +1 @@
+2
The pycompat thing was added automatically by the build AFAICT.
--
Marcin Owsiany <porri...@debian.org> http://marcin.owsiany.pl/
GnuPG: 2048R/02F946FC 35E9 1344 9F77 5F43 13DD 6423 DBF4 80C6 02F9 46FC
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
