Merge lp:~ricmm/qtmir/1409-sync-cache into lp:~mir-team/qtmir/rtm-14.09-gles-sync

Proposed by Ricardo Mendoza
Status: Merged
Approved by: Gerry Boland
Approved revision: 39
Merged at revision: 40
Proposed branch: lp:~ricmm/qtmir/1409-sync-cache
Merge into: lp:~mir-team/qtmir/rtm-14.09-gles-sync
Diff against target: 24 lines (+8/-2)
2 files modified
debian/changelog (+7/-1)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~ricmm/qtmir/1409-sync-cache
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Review via email: mp+238170@code.launchpad.net

Commit message

Sync cache fix from 017

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

LGTM

review: Approve
lp:~ricmm/qtmir/1409-sync-cache updated
40. By Ricardo Mendoza

Merge trunk

41. By Ricardo Mendoza

Make 14.09

42. By Ricardo Mendoza

Utopic

43. By Ricardo Mendoza

Finally

Revision history for this message
MichaƂ Sawicz (saviq) :

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-10-13 15:16:05 +0000
3+++ debian/changelog 2014-10-13 17:30:34 +0000
4@@ -1,4 +1,10 @@
5-qtmir-gles (0.4.3+14.10.20141007-0ubuntu1) 14.09; urgency=medium
6+qtmir-gles (0.4.3+14.10.20141013-0ubuntu1) UNRELEASED; urgency=medium
7+
8+ * Sync with upstream
9+
10+ -- Ricardo Mendoza <ricardo.mendoza@canonical.com> Mon, 13 Oct 2014 16:27:04 +0200
11+
12+qtmir-gles (0.4.3+14.10.20141007-0ubuntu1) utopic; urgency=medium
13
14 [ Cemil Azizoglu ]
15 * Sync with upstream
16
17=== modified file 'debian/watch'
18--- debian/watch 2014-10-13 15:16:05 +0000
19+++ debian/watch 2014-10-13 17:30:34 +0000
20@@ -1,3 +1,3 @@
21 version=3
22 opts=dversionmangle=s/\-gles// \
23-http://ppa.launchpad.net/ci-train-ppa-service/landing-020/ubuntu-rtm/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz
24+http://ppa.launchpad.net/ci-train-ppa-service/landing-017/ubuntu-rtm/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches