qtubuntu

Merge lp:~phablet-team/qtubuntu/gles-sync into lp:qtubuntu/gles

  1. gles-sync
  2. Merge into gles
Proposed by Michał Sawicz
Status: Merged
Approved by: Gerry Boland
Approved revision: no longer in the source branch.
Merged at revision: 40
Proposed branch: lp:~phablet-team/qtubuntu/gles-sync
Merge into: lp:qtubuntu/gles
Diff against target: 40 lines (+7/-4)
3 files modified
debian/control (+0/-1)
debian/rules (+7/-0)
debian/watch (+0/-3)
To merge this branch: bzr merge lp:~phablet-team/qtubuntu/gles-sync
Reviewer Review Type Date Requested Status
Robert Bruce Park (community) Approve
Gerry Boland (community) Approve
Review via email: mp+273184@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 :

Wonderful

review: Approve
Revision history for this message
Gerry Boland (gerboland) wrote :

Witchcraft!

review: Approve
Revision history for this message
Robert Bruce Park (robru) wrote :

LGTM

review: Approve
lp:~phablet-team/qtubuntu/gles-sync updated
40. By Robert Bruce Park

Sync with upstream
Approved by: Robert Bruce Park, Gerry Boland

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-06-23 16:48:10 +0000
3+++ debian/control 2015-10-09 17:30:48 +0000
4@@ -25,7 +25,6 @@
5 qtdeclarative5-dev,
6 Standards-Version: 3.9.4
7 Section: libs
8-X-Auto-Uploader: no-rewrite-version
9
10 Package: qtubuntu-android
11 Architecture: amd64 i386
12
13=== modified file 'debian/rules'
14--- debian/rules 2014-07-15 15:52:38 +0000
15+++ debian/rules 2015-10-09 17:30:48 +0000
16@@ -3,9 +3,16 @@
17
18 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
19
20+VERSION := $(shell dpkg-parsechangelog | sed -n -e's/^Version: \(.*\)-[^-]\+/\1/p')
21+SOURCE := $(shell dpkg-parsechangelog | sed -n -e's/^Source: \(.*\)-gles/\1/p')
22 ANDROID_DIR = build-android
23 TMP1_DIR = $(CURDIR)/debian/tmp1
24
25+# Don't try this at /home/: It will only work within https://ci-train.ubuntu.com
26+get-orig-source:
27+ cp -v ~/silos/$(SILONAME)/$(SOURCE)_$(VERSION).orig.tar.gz \
28+ $(CURDIR)/$(SOURCE)-gles_$(VERSION).orig.tar.gz
29+
30 %:
31 dh $@
32
33
34=== removed file 'debian/watch'
35--- debian/watch 2015-09-15 10:14:47 +0000
36+++ debian/watch 1970-01-01 00:00:00 +0000
37@@ -1,3 +0,0 @@
38-version=3
39-opts=dversionmangle=s/\-gles// \
40-http://ppa.launchpad.net/ci-train-ppa-service/landing-027/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz

Subscribers

People subscribed via source and target branches

to all changes: