Merge lp:~james-page/ubuntu/natty/xorg-docs/fix-682621 into lp:ubuntu/natty/xorg-docs

Proposed by James Page
Status: Merged
Approved by: Kees Cook
Approved revision: 9
Merged at revision: 9
Proposed branch: lp:~james-page/ubuntu/natty/xorg-docs/fix-682621
Merge into: lp:ubuntu/natty/xorg-docs
Diff against target: 80 lines (+11/-11)
4 files modified
debian/changelog (+9/-0)
debian/control (+2/-2)
debian/rules (+0/-1)
debian/xorg-docs.install (+0/-8)
To merge this branch: bzr merge lp:~james-page/ubuntu/natty/xorg-docs/fix-682621
Reviewer Review Type Date Requested Status
Kees Cook Approve
Dave Walker (community) Approve
Barry Warsaw (community) Approve
Review via email: mp+42214@code.launchpad.net

Description of the change

Removed dependency on fop (and generation of pdf documentation) to resolve FTBFS issues due to required dependencies not being in main archive.

HTML documentation is still generated.

To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote :

Hi James, thanks for the contribution to improve Ubuntu!

This looks good to me. I think it's fine to remove availability of the PDF given that the html is still available. I don't have permission to upload your change, but I'll see who I can round up for that.

One warning though: when I tried to build your branch in an schroot, it crashed my machine. I have no idea what happened, and maybe it was just coincidence because when I reboot and rebuilt, everything seemed fine.

review: Approve
Revision history for this message
Dave Walker (davewalker) wrote :

Locally built without issue here.

review: Approve
Revision history for this message
Kees Cook (kees) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-11-12 16:48:34 +0000
3+++ debian/changelog 2010-11-30 08:29:54 +0000
4@@ -1,3 +1,12 @@
5+xorg-docs (1:1.5.99.901-1ubuntu1) natty; urgency=low
6+
7+ * Remove fop dependency to Fix FTBFS (LP: #682621):
8+ + debian/rules: removed --with-fop option
9+ + debian/control: removed Build-Depends on fop
10+ + debian/xorg-docs.install: removed entries for *.pdf
11+
12+ -- James Page <james.page@canonical.com> Mon, 29 Nov 2010 13:51:52 +0000
13+
14 xorg-docs (1:1.5.99.901-1) unstable; urgency=low
15
16 [ Julien Cristau ]
17
18=== modified file 'debian/control'
19--- debian/control 2010-11-12 16:48:34 +0000
20+++ debian/control 2010-11-30 08:29:54 +0000
21@@ -1,7 +1,8 @@
22 Source: xorg-docs
23 Section: doc
24 Priority: optional
25-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
26+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
27+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
28 Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
29 Build-Depends:
30 debhelper (>= 5.0.0),
31@@ -13,7 +14,6 @@
32 autoconf,
33 xutils-dev (>= 1:7.5+5),
34 xmlto,
35- fop,
36 w3m,
37 Standards-Version: 3.8.3
38 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/doc/xorg-docs
39
40=== modified file 'debian/rules'
41--- debian/rules 2010-11-12 16:48:34 +0000
42+++ debian/rules 2010-11-30 08:29:54 +0000
43@@ -44,7 +44,6 @@
44 --enable-docs \
45 --enable-specs \
46 --with-xmlto \
47- --with-fop \
48 CFLAGS="$(CFLAGS)"
49 $(MAKE) -C build
50 >$@
51
52=== modified file 'debian/xorg-docs.install'
53--- debian/xorg-docs.install 2010-11-12 16:48:34 +0000
54+++ debian/xorg-docs.install 2010-11-30 08:29:54 +0000
55@@ -1,25 +1,17 @@
56 usr/share/doc/xorg-docs/MAINTAINERS
57 usr/share/doc/xorg-docs/*.html
58 usr/share/doc/xorg-docs/*.txt
59-usr/share/doc/xorg-docs/*.pdf
60 usr/share/doc/xorg-docs/graphics/*.html
61 usr/share/doc/xorg-docs/graphics/*.txt
62-usr/share/doc/xorg-docs/graphics/*.pdf
63 usr/share/doc/xorg-docs/fonts/*.html
64 usr/share/doc/xorg-docs/fonts/*.txt
65-usr/share/doc/xorg-docs/fonts/*.pdf
66 usr/share/doc/xorg-docs/input/*.html
67 usr/share/doc/xorg-docs/input/*.txt
68-usr/share/doc/xorg-docs/input/*.pdf
69 usr/share/doc/xorg-docs/specs/CTEXT/*.html
70 usr/share/doc/xorg-docs/specs/CTEXT/*.txt
71-usr/share/doc/xorg-docs/specs/CTEXT/*.pdf
72 usr/share/doc/xorg-docs/specs/ICCCM/*.html
73 usr/share/doc/xorg-docs/specs/ICCCM/*.txt
74-usr/share/doc/xorg-docs/specs/ICCCM/*.pdf
75 usr/share/doc/xorg-docs/specs/XLFD/*.html
76 usr/share/doc/xorg-docs/specs/XLFD/*.txt
77-usr/share/doc/xorg-docs/specs/XLFD/*.pdf
78 usr/share/doc/xorg-docs/specs/Xserver/*.html
79 usr/share/doc/xorg-docs/specs/Xserver/*.txt
80-usr/share/doc/xorg-docs/specs/Xserver/*.pdf

Subscribers

People subscribed via source and target branches

to all changes: