Merge lp:~bzoltan/ubuntu-ui-toolkit/rtm-landing-1202-gles into lp:ubuntu-ui-toolkit/gles-rtm

Proposed by Zoltan Balogh on 2015-02-12
Status: Merged
Approved by: Zoltan Balogh on 2015-02-13
Approved revision: 44
Merged at revision: 42
Proposed branch: lp:~bzoltan/ubuntu-ui-toolkit/rtm-landing-1202-gles
Merge into: lp:ubuntu-ui-toolkit/gles-rtm
Diff against target: 22 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-ui-toolkit/rtm-landing-1202-gles
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2015-02-12 Pending
Review via email: mp+249560@code.launchpad.net

Commit message

Sync with the main package

Description of the change

Sync with the main package

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

Sync with 1.1.1298+15.04.20150212~rtm-0ubuntu1

44. By Zoltan Balogh on 2015-02-13

Correct vesrion number

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-05 13:37:33 +0000
3+++ debian/changelog 2015-02-13 07:03:06 +0000
4@@ -1,3 +1,9 @@
5+ubuntu-ui-toolkit-gles (1.1.1298+15.04.20150212~rtm-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Sync with 1.1.1298+15.04.20150212~rtm-0ubuntu1
8+
9+ -- Zoltán Balogh <zoltan@bakter.hu> Thu, 12 Feb 2015 21:35:16 +0200
10+
11 ubuntu-ui-toolkit-gles (1.1.1298+15.04.20150205.1~rtm-0ubuntu1) 14.09; urgency=medium
12
13 [ Zoltán Balogh ]
14
15=== modified file 'debian/watch'
16--- debian/watch 2015-02-04 14:11:52 +0000
17+++ debian/watch 2015-02-13 07:03:06 +0000
18@@ -1,3 +1,3 @@
19 version=3
20 opts=dversionmangle=s/\-gles// \
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
22+http://ppa.launchpad.net/ci-train-ppa-service/landing-014/ubuntu-rtm/pool/main/u/ubuntu-ui-toolkit/ubuntu-ui-toolkit_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches