Merge lp:~kelemeng/colord/bug855144 into lp:ubuntu/raring/colord

Proposed by Gabor Kelemen
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~kelemeng/colord/bug855144
Merge into: lp:ubuntu/raring/colord
Diff against target: 21 lines (+2/-1)
2 files modified
debian/control (+1/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~kelemeng/colord/bug855144
Reviewer Review Type Date Requested Status
Gabor Kelemen (community) Needs Resubmitting
Marc Deslauriers Needs Information
Ubuntu branches Pending
Review via email:
To post a comment you must log in.
Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

There are three patches in the bug, but only two changes in this merge one of the patches missing, or is it not necessary?

review: Needs Information
Revision history for this message
Gabor Kelemen (kelemeng) wrote :

The third patch changed po/POTFILES.[in|skip] but that change is not necessary in raring, as the upstream source contains it.

review: Needs Resubmitting
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thank you for your work!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2012-09-12 18:28:06 +0000
+++ debian/control 2012-10-29 13:46:25 +0000
@@ -21,6 +21,7 @@
21 dh-autoreconf,21 dh-autoreconf,
22 gtk-doc-tools,22 gtk-doc-tools,
23 autopoint,23 autopoint,
24 dh-translations,
24Standards-Version: 3.9.225Standards-Version: 3.9.2
25Section: graphics26Section: graphics
=== modified file 'debian/rules'
--- debian/rules 2012-09-12 18:28:06 +0000
+++ debian/rules 2012-10-29 13:46:25 +0000
@@ -49,4 +49,4 @@
49 NOCONFIGURE=1 dh_autoreconf ./autogen.sh49 NOCONFIGURE=1 dh_autoreconf ./
52 dh $@ --parallel --with autoreconf52 dh $@ --parallel --with autoreconf,translations


People subscribed via source and target branches

to all changes: