debian-policy

Merge lp:~logan/debian-policy/fix-ftbfs into lp:~ubuntu-core-dev/debian-policy/ubuntu

  1. fix-ftbfs
  2. Merge into ubuntu
Proposed by Logan Rosen on 2016-03-23
Status: Merged
Merged at revision: 340
Proposed branch: lp:~logan/debian-policy/fix-ftbfs
Merge into: lp:~ubuntu-core-dev/debian-policy/ubuntu
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~logan/debian-policy/fix-ftbfs
Reviewer Review Type Date Requested Status
Colin Watson 2016-03-23 Approve on 2016-05-05
Review via email: mp+289853@code.launchpad.net
To post a comment you must log in.
Colin Watson (cjwatson) :
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 2009-06-19 14:34:10 +0000
3+++ debian/changelog 2016-03-23 03:05:08 +0000
4@@ -1,3 +1,10 @@
5+ubuntu-policy (3.8.2.0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Build-depend on sp to provide the nsgmls command, which is required for
8+ the Makefile. Fixes an FTBFS upon rebuild.
9+
10+ -- Logan Rosen <logan@ubuntu.com> Tue, 22 Mar 2016 21:40:41 -0500
11+
12 ubuntu-policy (3.8.2.0ubuntu1) karmic; urgency=low
13
14 * Resynchronise with Debian. Remaining changes:
15
16=== modified file 'debian/control'
17--- debian/control 2009-06-19 14:00:29 +0000
18+++ debian/control 2016-03-23 03:05:08 +0000
19@@ -5,7 +5,7 @@
20 XSBC-Original-Maintainer: Debian Policy List <debian-policy@lists.debian.org>
21 Uploaders: Manoj Srivastava <srivasta@debian.org>, Russ Allbery <rra@debian.org>, Colin Watson <cjwatson@debian.org>, Bill Allombert <ballombe@debian.org>
22 Standards-Version: 3.8.1
23-Build-Depends-Indep: sgml-data (>= 2.0), debiandoc-sgml (>= 1.1.47), texlive, texlive-latex-extra, groff, bsdmainutils, pstoedit, jade, docbook-xml (>= 3.1.1), docbook-dsssl, tidy, links (>= 0.90) | elinks
24+Build-Depends-Indep: sgml-data (>= 2.0), debiandoc-sgml (>= 1.1.47), texlive, texlive-latex-extra, groff, bsdmainutils, pstoedit, jade, docbook-xml (>= 3.1.1), docbook-dsssl, tidy, links (>= 0.90) | elinks, sp
25 XS-Debian-Vcs-Browser: http://git.debian.org/?p=dbnpolicy/policy.git
26 XS-Debian-Vcs-Git: git://git.debian.org/git/dbnpolicy/policy.git
27 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/debian-policy/ubuntu

Subscribers

People subscribed via source and target branches