Merge lp:~stolowski/unity-lens-files/merge-trunk into lp:~unity-team/unity-lens-files/libunity7-compatible

[Paweł Stołowski]

Merged trunk.

Merged trunk.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:260
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-files-libunity7-compatible-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-files-libunity7-compatible-raring-amd64-ci/8

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-files-libunity7-compatible-ci/8/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-03-13 11:19:10 +0000
+++ debian/control	2013-05-09 14:29:26 +0000
@@ -13,7 +13,8 @@
                libunity-dev (>= 6.91),
                zeitgeist-core (>= 0.5.0-0ubuntu2),
                dh-autoreconf,
-Standards-Version: 3.9.3
+               dh-translations,
+Standards-Version: 3.9.4
 Homepage: https://launchpad.net/unity-lens-files
 # If you aren't a member of ~unity-team but need to upload packaging changes,
 # just go ahead.  ~unity-team will notice and sync up the code again.

=== modified file 'debian/rules'
--- debian/rules	2012-11-08 22:50:09 +0000
+++ debian/rules	2013-05-09 14:29:26 +0000
@@ -4,7 +4,7 @@
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
 
 %:
-	dh $@ --with autoreconf
+	dh $@ --with autoreconf,translations
 
 override_dh_autoreconf:
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh