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

[Michał Sawicz]

Sync with upstream

[Gerry Boland (gerboland)]

Wonderful

review: Approve

[Gerry Boland (gerboland)]

Witchcraft!

review: Approve

[Robert Bruce Park (robru)]

LGTM

review: Approve

[lp:~phablet-team/qtubuntu/gles-sync]

40. 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-06-23 16:48:10 +0000
+++ debian/control	2015-10-09 17:30:48 +0000
@@ -25,7 +25,6 @@
                qtdeclarative5-dev,
 Standards-Version: 3.9.4
 Section: libs
-X-Auto-Uploader: no-rewrite-version
 
 Package: qtubuntu-android
 Architecture: amd64 i386

=== modified file 'debian/rules'
--- debian/rules	2014-07-15 15:52:38 +0000
+++ debian/rules	2015-10-09 17:30:48 +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 $@
 

=== removed file 'debian/watch'
--- debian/watch	2015-09-15 10:14:47 +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-027/ubuntu/pool/main/q/qtubuntu/qtubuntu_([^-]*)\.orig.tar.gz