Merge lp:~bzoltan/ubuntu-ui-toolkit/landing_12-6-2015-gles into lp:ubuntu-ui-toolkit/gles

Proposed by Zoltan Balogh
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 61
Merged at revision: 59
Proposed branch: lp:~bzoltan/ubuntu-ui-toolkit/landing_12-6-2015-gles
Merge into: lp:ubuntu-ui-toolkit/gles
Diff against target: 23 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-ui-toolkit/landing_12-6-2015-gles
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+261832@code.launchpad.net

Commit message

Landing 12.6.2015

Description of the change

Landing 12.6.2015

To post a comment you must log in.
59. By Zoltan Balogh

Follow the lead

60. By Zoltan Balogh

Follow the lead

61. By Zoltan Balogh

synced with gles trunk

62. By Zoltan Balogh

Sync with the main

63. By Zoltan Balogh

fix 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-06-15 16:01:42 +0000
3+++ debian/changelog 2015-06-25 08:56:31 +0000
4@@ -1,3 +1,10 @@
5+ubuntu-ui-toolkit-gles (1.3.1534+15.10.20150625-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ [ Zoltán Balogh ]
8+ * Sync with main 1.3.1534+15.10.20150625-0ubuntu1
9+
10+ -- Zoltán Balogh <zoltan@bakter.hu> Fri, 12 Jun 2015 13:20:17 +0300
11+
12 ubuntu-ui-toolkit-gles (1.3.1517+15.10.20150523-0ubuntu2) wily; urgency=medium
13
14 * Sync with 1.3.1517+15.10.20150523-0ubuntu3
15
16=== modified file 'debian/watch'
17--- debian/watch 2015-05-23 17:23:20 +0000
18+++ debian/watch 2015-06-25 08:56:31 +0000
19@@ -1,3 +1,3 @@
20 version=3
21 opts=dversionmangle=s/\-gles// \
22-http://ppa.launchpad.net/ci-train-ppa-service/landing-001/ubuntu/pool/main/u/ubuntu-ui-toolkit/ubuntu-ui-toolkit_([^-]*)\.orig.tar.gz
23+http://ppa.launchpad.net/ci-train-ppa-service/landing-011/ubuntu/pool/main/u/ubuntu-ui-toolkit/ubuntu-ui-toolkit_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches