Merge lp:~bzoltan/ubuntu-ui-toolkit/landing_04.02.2015-gles into lp:ubuntu-ui-toolkit/gles

Proposed by Zoltan Balogh on 2015-02-04
Status: Merged
Approved by: Zoltan Balogh on 2015-02-04
Approved revision: 41
Merged at revision: 40
Proposed branch: lp:~bzoltan/ubuntu-ui-toolkit/landing_04.02.2015-gles
Merge into: lp:ubuntu-ui-toolkit/gles
Diff against target: 21 lines (+6/-1)
2 files modified
debian/changelog (+5/-0)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-ui-toolkit/landing_04.02.2015-gles
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2015-02-04 Pending
Review via email: mp+248555@code.launchpad.net

Commit Message

Sync with the main RTM branch

Description of the Change

Sync with the main RTM branch

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

Fix the version

42. By Zoltan Balogh on 2015-02-05

bump the version

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-01-11 20:13:44 +0000
3+++ debian/changelog 2015-02-05 13:36:32 +0000
4@@ -1,3 +1,8 @@
5+ubuntu-ui-toolkit-gles (1.1.1298+15.04.20150205.1~rtm-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Sync with 1.1.1298+15.04.20150205.1~rtm-0ubuntu1
8+ -- Zoltán Balogh <zoltan@bakter.hu> Wed, 04 Feb 2015 16:08:47 +0200
9+
10 ubuntu-ui-toolkit-gles (1.1.1376+15.04.20150111-0ubuntu1) vivid; urgency=medium
11
12 [ Zoltán Balogh ]
13
14=== modified file 'debian/watch'
15--- debian/watch 2015-01-11 18:58:29 +0000
16+++ debian/watch 2015-02-05 13:36:32 +0000
17@@ -1,3 +1,3 @@
18 version=3
19 opts=dversionmangle=s/\-gles// \
20-http://ppa.launchpad.net/ci-train-ppa-service/landing-001/ubuntu/pool/main/u/ubuntu-ui-toolkit/ubuntu-ui-toolkit_([^-]*)\.orig.tar.gz
21+http://ppa.launchpad.net/ci-train-ppa-service/landing-005/ubuntu-rtm/pool/main/u/ubuntu-ui-toolkit/ubuntu-ui-toolkit_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches