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

[Gabor Kelemen]

[Marc Deslauriers (mdeslaur)]

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

[Gabor Kelemen (kelemeng)]

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

[Sebastien Bacher (seb128)]

Thank you for your work!

=== 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 @@
  dh-autoreconf,
  gtk-doc-tools,
  autopoint,
+ dh-translations,
 Standards-Version: 3.9.2
 Section: graphics
 Homepage: http://www.freedesktop.org/software/colord/
 
=== 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 @@
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
 %:
-	dh $@ --parallel --with autoreconf
+	dh $@ --parallel --with autoreconf,translations