QtMir

Merge lp:~mzanetti/qtmir/gles-sync-ghosts into lp:qtmir/gles

  1. gles-sync-ghosts
  2. Merge into gles
Proposed by Michael Zanetti
Status: Rejected
Rejected by: Michael Zanetti
Proposed branch: lp:~mzanetti/qtmir/gles-sync-ghosts
Merge into: lp:qtmir/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:~mzanetti/qtmir/gles-sync-ghosts
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Disapprove
Michał Sawicz Needs Information
Gerry Boland (community) Approve
Review via email: mp+268624@code.launchpad.net

Commit message

sync with upstream

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

Genius!

review: Approve
lp:~mzanetti/qtmir/gles-sync-ghosts updated
101. By Michael Zanetti

update after rebuilding upstream

102. By Michael Zanetti

merge with trunk

Revision history for this message
Michał Sawicz (saviq) wrote :

This is old, innit?

review: Needs Information
Revision history for this message
Michael Zanetti (mzanetti) wrote :

yep, can go away.

review: Disapprove

Unmerged revisions

102. By Michael Zanetti

merge with trunk

101. By Michael Zanetti

update after rebuilding upstream

100. By Michael Zanetti

sync with upstream

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-08-20 13:35:28 +0000
3+++ debian/changelog 2015-08-21 06:58:49 +0000
4@@ -1,3 +1,9 @@
5+qtmir-gles (0.4.5+15.04.20150820.2-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * sync with upstream
8+
9+ -- Michael Zanetti <michael.zanetti@canonical.com> Thu, 20 Aug 2015 18:49:34 +0200
10+
11 qtmir-gles (0.4.5+15.04.20150820-0ubuntu1) vivid; urgency=medium
12
13 [ Michael Zanetti ]
14
15=== modified file 'debian/watch'
16--- debian/watch 2015-08-20 13:07:34 +0000
17+++ debian/watch 2015-08-21 06:58:49 +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/q/qtmir/qtmir_([^-]*)\.orig.tar.gz
22+http://ppa.launchpad.net/ci-train-ppa-service/landing-017/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches