Merge lp:~bzoltan/ubuntu-ui-toolkit/sync_landing_0608 into lp:ubuntu-ui-toolkit/gles

Proposed by Zoltan Balogh on 2014-08-06
Status: Merged
Approved by: Ricardo Salveti on 2014-08-07
Approved revision: 10
Merged at revision: 9
Proposed branch: lp:~bzoltan/ubuntu-ui-toolkit/sync_landing_0608
Merge into: lp:ubuntu-ui-toolkit/gles
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/sync_landing_0608
Reviewer Review Type Date Requested Status
Ricardo Salveti 2014-08-06 Pending
Review via email: mp+229827@code.launchpad.net

Commit message

sync with the main branch

Description of the change

sync with the main branch

To post a comment you must log in.
10. By Zoltan Balogh on 2014-08-07

Fix version number to mach the non gles release

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 2014-08-05 17:32:10 +0000
3+++ debian/changelog 2014-08-07 04:34:27 +0000
4@@ -1,3 +1,9 @@
5+ubuntu-ui-toolkit-gles (1.1.1181+14.10.20140806-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Sync package with ubuntu-ui-toolkit 1.1.1181+14.10.20140806-0ubuntu1
8+
9+ -- Zoltán Balogh <zoltan@bakter.hu> Wed, 06 Aug 2014 19:38:08 +0300
10+
11 ubuntu-ui-toolkit-gles (1.1.1179+14.10.20140804-0ubuntu2) utopic; urgency=medium
12
13 [ Gerry Boland ]
14
15=== modified file 'debian/watch'
16--- debian/watch 2014-08-04 17:06:48 +0000
17+++ debian/watch 2014-08-07 04:34:27 +0000
18@@ -1,3 +1,3 @@
19 version=3
20 opts=dversionmangle=s/\-gles// \
21-http://ppa.launchpad.net/ci-train-ppa-service/landing-016/ubuntu/pool/main/u/ubuntu-ui-toolkit/ubuntu-ui-toolkit_([^-]*)\.orig.tar.gz
22+http://ppa.launchpad.net/ci-train-ppa-service/landing-015/ubuntu/pool/main/u/ubuntu-ui-toolkit/ubuntu-ui-toolkit_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches