Merge lp:~mhr3/unity-lens-friends/libunity7-bump into lp:~unity-team/unity-lens-friends/libunity7-compatible

Proposed by Michal Hruby
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 60
Merged at revision: 59
Proposed branch: lp:~mhr3/unity-lens-friends/libunity7-bump
Merge into: lp:~unity-team/unity-lens-friends/libunity7-compatible
Diff against target: 60 lines (+21/-3)
3 files modified
debian/changelog (+19/-2)
debian/control (+1/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~mhr3/unity-lens-friends/libunity7-bump
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+160073@code.launchpad.net

Commit message

Bump version

Description of the change

Bump version, so the one present in distro isn't considered "newer".

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-04-01 09:08:04 +0000
+++ debian/changelog 2013-04-22 11:18:26 +0000
@@ -1,4 +1,21 @@
1unity-lens-friends (0.1.1bzr13.03.26-0ubuntu1) UNRELEASED; urgency=low1unity-lens-friends (0.1.2-0ubuntu1) UNRELEASED; urgency=low
2
3 * Bump version
4
5 -- Michal Hruby <michal.hruby@canonical.com> Mon, 22 Apr 2013 12:14:33 +0100
6
7unity-lens-friends (0.1.1bzr13.04.12-0ubuntu1) raring; urgency=low
8
9 [ Sebastien Bacher ]
10 * debian/control:
11 - Build-Depends on dh-translations
12 - updated Standards-Version
13 * debian/rules:
14 - use --with translations to get a template at build time
15
16 -- Ken VanDine <ken.vandine@canonical.com> Fri, 12 Apr 2013 12:34:03 -0400
17
18unity-lens-friends (0.1.1bzr13.03.26-0ubuntu1) raring; urgency=low
219
3 [ James Henstridge ]20 [ James Henstridge ]
4 * Require new libunity.21 * Require new libunity.
@@ -11,7 +28,7 @@
11 [ Ken VanDine ]28 [ Ken VanDine ]
12 * strip links from content, the lens can't render them29 * strip links from content, the lens can't render them
1330
14 -- Ken VanDine <ken.vandine@canonical.com> Thu, 14 Mar 2013 10:12:48 -040031 -- Ken VanDine <ken.vandine@canonical.com> Tue, 26 Mar 2013 13:53:53 -0400
1532
16unity-lens-friends (0.1.1bzr13.03.20-0ubuntu1) raring; urgency=low33unity-lens-friends (0.1.1bzr13.03.20-0ubuntu1) raring; urgency=low
1734
1835
=== modified file 'debian/control'
--- debian/control 2013-03-26 17:52:18 +0000
+++ debian/control 2013-04-22 11:18:26 +0000
@@ -5,6 +5,7 @@
5Build-Depends: autotools-dev,5Build-Depends: autotools-dev,
6 debhelper (>= 9),6 debhelper (>= 9),
7 dh-autoreconf,7 dh-autoreconf,
8 dh-translations,
8 gnome-common,9 gnome-common,
9 libaccounts-glib-dev,10 libaccounts-glib-dev,
10 libdee-dev (>= 1.0.0),11 libdee-dev (>= 1.0.0),
1112
=== modified file 'debian/rules'
--- debian/rules 2013-03-22 08:07:57 +0000
+++ debian/rules 2013-04-22 11:18:26 +0000
@@ -4,7 +4,7 @@
4#export DH_VERBOSE=14#export DH_VERBOSE=1
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

to all changes: