phablet-extras

Merge lp:~ogra/phablet-extras/qtmultimedia-touch into lp:~phablet-team/phablet-extras/qtmultimedia-touch

  1. qtmultimedia-touch
  2. Merge into qtmultimedia-touch
Proposed by Oliver Grawert
Status: Merged
Merged at revision: 85
Proposed branch: lp:~ogra/phablet-extras/qtmultimedia-touch
Merge into: lp:~phablet-team/phablet-extras/qtmultimedia-touch
Diff against target: 52 lines (+16/-10)
2 files modified
debian/changelog (+6/-0)
debian/rules (+10/-10)
To merge this branch: bzr merge lp:~ogra/phablet-extras/qtmultimedia-touch
Reviewer Review Type Date Requested Status
Ricardo Salveti (community) Approve
Review via email: mp+196541@code.launchpad.net

Description of the change

Fix preinst and postrm to also work on non armhf architectures so we can build i386 ubuntu touch images

To post a comment you must log in.
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

Tested, merged and uploaded, thanks!

review: Approve

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 2013-10-03 00:34:11 +0000
3+++ debian/changelog 2013-11-25 14:44:43 +0000
4@@ -1,3 +1,9 @@
5+qtmultimedia-opensource-src-touch (5.1.1+git20130920+5b12abb862-0ubuntu4) UNRELEASED; urgency=low
6+
7+ * fix preinst and postrm to work on i386 and other arches too ...
8+
9+ -- Oliver Grawert <ogra@ubuntu.com> Mon, 25 Nov 2013 15:40:13 +0100
10+
11 qtmultimedia-opensource-src-touch (5.1.1+git20130920+5b12abb862-0ubuntu3) saucy; urgency=low
12
13 * Adding quick to pro file for qgsttools_p (LP: #1234087).
14
15=== modified file 'debian/rules'
16--- debian/rules 2013-09-24 20:16:20 +0000
17+++ debian/rules 2013-11-25 14:44:43 +0000
18@@ -36,25 +36,25 @@
19 -Nlibqt5multimediawidgets5-touch
20
21 override_dh_auto_configure:
22- sed "s/__ARCH__/$(DEB_HOST_GNU_TYPE)/g" -i \
23+ sed "s/__ARCH__/$(DEB_HOST_MULTIARCH)/g" -i \
24 debian/libqgsttools-p1-touch.preinst
25- sed "s/__ARCH__/$(DEB_HOST_GNU_TYPE)/g" -i \
26+ sed "s/__ARCH__/$(DEB_HOST_MULTIARCH)/g" -i \
27 debian/libqgsttools-p1-touch.postrm
28- sed "s/__ARCH__/$(DEB_HOST_GNU_TYPE)/g" -i \
29+ sed "s/__ARCH__/$(DEB_HOST_MULTIARCH)/g" -i \
30 debian/libqt5multimedia5-touch.preinst
31- sed "s/__ARCH__/$(DEB_HOST_GNU_TYPE)/g" -i \
32+ sed "s/__ARCH__/$(DEB_HOST_MULTIARCH)/g" -i \
33 debian/libqt5multimedia5-touch.postrm
34- sed "s/__ARCH__/$(DEB_HOST_GNU_TYPE)/g" -i \
35+ sed "s/__ARCH__/$(DEB_HOST_MULTIARCH)/g" -i \
36 debian/libqt5multimediaquick-p5-touch.preinst
37- sed "s/__ARCH__/$(DEB_HOST_GNU_TYPE)/g" -i \
38+ sed "s/__ARCH__/$(DEB_HOST_MULTIARCH)/g" -i \
39 debian/libqt5multimediaquick-p5-touch.postrm
40- sed "s/__ARCH__/$(DEB_HOST_GNU_TYPE)/g" -i \
41+ sed "s/__ARCH__/$(DEB_HOST_MULTIARCH)/g" -i \
42 debian/qtdeclarative5-qtmultimedia-touch-plugin.preinst
43- sed "s/__ARCH__/$(DEB_HOST_GNU_TYPE)/g" -i \
44+ sed "s/__ARCH__/$(DEB_HOST_MULTIARCH)/g" -i \
45 debian/qtdeclarative5-qtmultimedia-touch-plugin.postrm
46- sed "s/__ARCH__/$(DEB_HOST_GNU_TYPE)/g" -i \
47+ sed "s/__ARCH__/$(DEB_HOST_MULTIARCH)/g" -i \
48 debian/libqt5multimedia5-touch-plugins.preinst
49- sed "s/__ARCH__/$(DEB_HOST_GNU_TYPE)/g" -i \
50+ sed "s/__ARCH__/$(DEB_HOST_MULTIARCH)/g" -i \
51 debian/libqt5multimedia5-touch-plugins.postrm
52 qmake CONFIG+=mir
53

Subscribers

People subscribed via source and target branches