Merge lp:~bzoltan/ubuntu-ui-toolkit/actionselectionpopover-rtm-fix-gles into lp:ubuntu-ui-toolkit/gles-rtm

Proposed by Zoltan Balogh on 2015-02-17
Status: Merged
Approved by: Łukasz Zemczak on 2015-02-23
Approved revision: 46
Merged at revision: 44
Proposed branch: lp:~bzoltan/ubuntu-ui-toolkit/actionselectionpopover-rtm-fix-gles
Merge into: lp:ubuntu-ui-toolkit/gles-rtm
Diff against target: 28 lines (+13/-1)
2 files modified
debian/changelog (+12/-0)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-ui-toolkit/actionselectionpopover-rtm-fix-gles
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2015-02-17 Pending
Review via email: mp+249917@code.launchpad.net

Commit message

Sync with main landing

Description of the change

Sync with the main landing

To post a comment you must log in.
45. By Zoltan Balogh on 2015-02-18

Follow

46. By Zoltan Balogh on 2015-02-18

Follow

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-02-13 07:03:54 +0000
3+++ debian/changelog 2015-02-18 17:01:39 +0000
4@@ -1,3 +1,15 @@
5+ubuntu-ui-toolkit-gles (1.1.1298+15.04.20150218.1~rtm-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * 1.1.1298+15.04.20150218.1~rtm-0ubuntu1
8+
9+ -- Zoltán Balogh <zoltan@bakter.hu> Tue, 17 Feb 2015 07:06:40 +0200
10+
11+ubuntu-ui-toolkit-gles (1.1.1298+15.04.20150218~rtm-0ubuntu1) UNRELEASED; urgency=medium
12+
13+ * 1.1.1298+15.04.20150218~rtm-0ubuntu1
14+
15+ -- Zoltán Balogh <zoltan@bakter.hu> Tue, 17 Feb 2015 07:06:40 +0200
16+
17 ubuntu-ui-toolkit-gles (1.1.1298+15.04.20150212~rtm-0ubuntu1) 14.09; urgency=medium
18
19 [ Zoltán Balogh ]
20
21=== modified file 'debian/watch'
22--- debian/watch 2015-02-12 19:36:03 +0000
23+++ debian/watch 2015-02-18 17:01:39 +0000
24@@ -1,3 +1,3 @@
25 version=3
26 opts=dversionmangle=s/\-gles// \
27-http://ppa.launchpad.net/ci-train-ppa-service/landing-014/ubuntu-rtm/pool/main/u/ubuntu-ui-toolkit/ubuntu-ui-toolkit_([^-]*)\.orig.tar.gz
28+http://ppa.launchpad.net/ci-train-ppa-service/landing-001/ubuntu-rtm/pool/main/u/ubuntu-ui-toolkit/ubuntu-ui-toolkit_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches