QtMir

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

Proposed by Michał Sawicz on 2014-10-14

Status:	Merged
Approved by:	Gerry Boland on 2014-10-14
Approved revision:	no longer in the source branch.
Merged at revision:	42
Proposed branch:	lp:~mir-team/qtmir/rtm-14.09-gles-sync
Merge into:	lp:qtmir/rtm-14.09-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:~mir-team/qtmir/rtm-14.09-gles-sync
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Gerry Boland (community)		2014-10-14	Approve on 2014-10-14
Review via email: mp+238312@code.launchpad.net

Sync with upstream

Revision history for this message

Gerry Boland (gerboland) wrote on 2014-10-14:

LGTM

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'debian/changelog'
2	--- debian/changelog 2014-10-13 17:31:20 +0000
3	+++ debian/changelog 2014-10-15 08:38:54 +0000
4	@@ -1,3 +1,9 @@
5	+qtmir-gles (0.4.3+14.10.20141015~rtm-0ubuntu1) UNRELEASED; urgency=medium
6	+
7	+ * Sync with upstream
8	+
9	+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 15 Oct 2014 10:38:15 +0200
10	+
11	qtmir-gles (0.4.3+14.10.20141013-0ubuntu1) 14.09; urgency=medium
12
13	[ Ricardo Mendoza ]
14
15	=== modified file 'debian/watch'
16	--- debian/watch 2014-10-13 15:18:13 +0000
17	+++ debian/watch 2014-10-15 08:38:54 +0000
18	@@ -1,3 +1,3 @@
19	version=3
20	opts=dversionmangle=s/\-gles// \
21	-http://ppa.launchpad.net/ci-train-ppa-service/landing-017/ubuntu-rtm/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz
22	+http://ppa.launchpad.net/ci-train-ppa-service/landing-006/ubuntu-rtm/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz