Merge lp:~noskcaj/ubuntu/trusty/hardinfo/ftbfs into lp:ubuntu/trusty/hardinfo

Proposed by Jackson Doak
Status: Merged
Merge reported by: Dmitry Shachnev
Merged at revision: not available
Proposed branch: lp:~noskcaj/ubuntu/trusty/hardinfo/ftbfs
Merge into: lp:ubuntu/trusty/hardinfo
Diff against target: 25 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/trusty/hardinfo/ftbfs
Reviewer Review Type Date Requested Status
Dmitry Shachnev Approve
Ubuntu branches Pending
Review via email: mp+200245@code.launchpad.net

Description of the change

Fix ftbfs

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

Looks good to me.

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 2012-12-20 14:56:55 +0000
3+++ debian/changelog 2014-01-01 08:36:52 +0000
4@@ -1,3 +1,9 @@
5+hardinfo (0.5.1-1.2ubuntu2) trusty; urgency=medium
6+
7+ * Add missing B-dep on liblzma-dev. LP: #1232271
8+
9+ -- Jackson Doak <noskcaj@ubuntu.com> Wed, 01 Jan 2014 18:57:02 +1100
10+
11 hardinfo (0.5.1-1.2ubuntu1) raring; urgency=low
12
13 * Merge from Debian testing. Ubuntu remaining changes :
14
15=== modified file 'debian/control'
16--- debian/control 2012-12-20 14:56:55 +0000
17+++ debian/control 2014-01-01 08:36:52 +0000
18@@ -3,7 +3,7 @@
19 Priority: optional
20 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
21 XSBC-Original-Maintainer: Agney Lopes Roth Ferraz <agney@debian.org>
22-Build-Depends: debhelper (>> 5.0.0), libgtk2.0-dev, pciutils (>=1:2.1.11-10), libsoup2.4-dev, libffi-dev, quilt
23+Build-Depends: debhelper (>> 5.0.0), libgtk2.0-dev, pciutils (>=1:2.1.11-10), libsoup2.4-dev, libffi-dev, quilt, liblzma-dev
24 Standards-Version: 3.8.3.0
25 Homepage: http://hardinfo.berlios.de/
26

Subscribers

People subscribed via source and target branches

to all changes: