Colord

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

  1. bug855144
  2. Merge into raring
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: mp+131909@code.launchpad.net
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 request...is 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
1=== modified file 'debian/control'
2--- debian/control 2012-09-12 18:28:06 +0000
3+++ debian/control 2012-10-29 13:46:25 +0000
4@@ -21,6 +21,7 @@
5 dh-autoreconf,
6 gtk-doc-tools,
7 autopoint,
8+ dh-translations,
9 Standards-Version: 3.9.2
10 Section: graphics
11 Homepage: http://www.freedesktop.org/software/colord/
12
13=== modified file 'debian/rules'
14--- debian/rules 2012-09-12 18:28:06 +0000
15+++ debian/rules 2012-10-29 13:46:25 +0000
16@@ -49,4 +49,4 @@
17 NOCONFIGURE=1 dh_autoreconf ./autogen.sh
18
19 %:
20- dh $@ --parallel --with autoreconf
21+ dh $@ --parallel --with autoreconf,translations

Subscribers

People subscribed via source and target branches

to all changes: