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

Proposed by Paweł Stołowski on 2013-05-09
Status: Merged
Approved by: Michal Hruby on 2013-05-09
Approved revision: 260
Merged at revision: 260
Proposed branch: lp:~stolowski/unity-lens-files/merge-trunk
Merge into: lp:~unity-team/unity-lens-files/libunity7-compatible
Diff against target: 26 lines (+3/-2)
2 files modified
debian/control (+2/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~stolowski/unity-lens-files/merge-trunk
Reviewer Review Type Date Requested Status
Michal Hruby (community) 2013-05-09 Approve on 2013-05-09
PS Jenkins bot (community) continuous-integration Approve on 2013-05-09
Review via email: mp+163154@code.launchpad.net

Commit message

Merged trunk.

Description of the change

Merged trunk.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
13 libunity-dev (>= 6.91),13 libunity-dev (>= 6.91),
14 zeitgeist-core (>= 0.5.0-0ubuntu2),14 zeitgeist-core (>= 0.5.0-0ubuntu2),
15 dh-autoreconf,15 dh-autoreconf,
16Standards-Version: 3.9.316 dh-translations,
17Standards-Version: 3.9.4
17Homepage: https://launchpad.net/unity-lens-files18Homepage: https://launchpad.net/unity-lens-files
18# If you aren't a member of ~unity-team but need to upload packaging changes,19# If you aren't a member of ~unity-team but need to upload packaging changes,
19# just go ahead. ~unity-team will notice and sync up the code again.20# just go ahead. ~unity-team will notice and sync up the code again.
2021
=== 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 @@
4export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed4export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
55
6%:6%:
7 dh $@ --with autoreconf7 dh $@ --with autoreconf,translations
88
9override_dh_autoreconf:9override_dh_autoreconf:
10 NOCONFIGURE=1 dh_autoreconf ./autogen.sh10 NOCONFIGURE=1 dh_autoreconf ./autogen.sh

Subscribers

People subscribed via source and target branches