Ubuntu UI Toolkit

Merge lp:~bzoltan/ubuntu-ui-toolkit/Landing_12.01.2015-gles into lp:ubuntu-ui-toolkit/gles

  1. Landing_12.01.2015-gles
  2. Merge into gles
Proposed by Zoltan Balogh
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 38
Merged at revision: 38
Proposed branch: lp:~bzoltan/ubuntu-ui-toolkit/Landing_12.01.2015-gles
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/Landing_12.01.2015-gles
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+246072@code.launchpad.net

Commit message

Sync with main

Description of the change

Sync with main

To post a comment you must log in.

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-12-17 10:34:31 +0000
3+++ debian/changelog 2015-01-11 19:13:15 +0000
4@@ -1,3 +1,9 @@
5+ubuntu-ui-toolkit-gles (1.1.1376+15.04.20150111-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Sync with 1.1.1376+15.04.20150111-0ubuntu1
8+
9+ -- Zoltán Balogh <zoltan@bakter.hu> Sun, 11 Jan 2015 20:51:56 +0200
10+
11 ubuntu-ui-toolkit-gles (1.1.1370+15.04.20141217-0ubuntu1) vivid; urgency=medium
12
13 [ Zoltán Balogh ]
14
15=== modified file 'debian/watch'
16--- debian/watch 2014-12-12 06:33:40 +0000
17+++ debian/watch 2015-01-11 19:13:15 +0000
18@@ -1,3 +1,3 @@
19 version=3
20 opts=dversionmangle=s/\-gles// \
21-http://ppa.launchpad.net/ci-train-ppa-service/landing-003/ubuntu/pool/main/u/ubuntu-ui-toolkit/ubuntu-ui-toolkit_([^-]*)\.orig.tar.gz
22+http://ppa.launchpad.net/ci-train-ppa-service/landing-001/ubuntu/pool/main/u/ubuntu-ui-toolkit/ubuntu-ui-toolkit_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches