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

[Michał Sawicz]

Sync with upstream

[Gerry Boland (gerboland)]

Brilliant!

review: Approve

[Gerry Boland (gerboland)]

review: Approve

[Robert Bruce Park (robru)]

LGTM

review: Approve

[lp:~mir-team/qtmir/gles-sync]

120. By Alexandros Frantzis on 2015-10-09

Sync with upstream

121. By CI Train Bot Account on 2015-10-09

Releasing 0.4.6+15.10.20151008.2-0ubuntu1

122. By Robert Bruce Park on 2015-10-21

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

=== modified file 'debian/control'
--- debian/control	2015-09-22 21:06:41 +0000
+++ debian/control	2015-10-15 06:48:58 +0000
@@ -49,7 +49,6 @@
 # upstream branch
 Vcs-Bzr: lp:qtmir/gles
 Vcs-Browser: http://bazaar.launchpad.net/~mir-team/qtmir/gles/files
-X-Auto-Uploader: no-rewrite-version
 
 Package: qtmir-android
 Architecture: amd64 i386

=== modified file 'debian/rules'
--- debian/rules	2014-11-27 14:29:38 +0000
+++ debian/rules	2015-10-15 06:48:58 +0000
@@ -3,9 +3,16 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
+VERSION := $(shell dpkg-parsechangelog | sed -n -e's/^Version: \(.*\)-[^-]\+/\1/p')
+SOURCE := $(shell dpkg-parsechangelog | sed -n -e's/^Source: \(.*\)-gles/\1/p')
 ANDROID_DIR = build-android
 TMP1_DIR = $(CURDIR)/debian/tmp1
 
+# Don't try this at /home/: It will only work within https://ci-train.ubuntu.com
+get-orig-source:
+	cp -v ~/silos/$(SILONAME)/$(SOURCE)_$(VERSION).orig.tar.gz \
+	      $(CURDIR)/$(SOURCE)-gles_$(VERSION).orig.tar.gz
+
 %:
 	dh $@ --parallel
 

=== removed file 'debian/watch'
--- debian/watch	2015-10-09 08:23:56 +0000
+++ debian/watch	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-version=3
-opts=dversionmangle=s/\-gles// \
-http://ppa.launchpad.net/ci-train-ppa-service/landing-016/ubuntu/pool/main/q/qtmir/qtmir_([^-]*)\.orig.tar.gz