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

Proposed by Sergio Schvezov on 2014-02-05
Status: Merged
Merged at revision: 89
Proposed branch: lp:~sergiusens/phablet-extras/postrm_fix
Merge into: lp:~phablet-team/phablet-extras/qtmultimedia-touch
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/qtdeclarative5-qtmultimedia-touch-plugin.postrm (+1/-1)
To merge this branch: bzr merge lp:~sergiusens/phablet-extras/postrm_fix
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2014-02-05 Pending
Review via email: mp+204948@code.launchpad.net

Description of the change

Tested as in http://paste.ubuntu.com/6879310/ which removes the touch diversions cleanly

To post a comment you must log in.

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-12-23 18:19:14 +0000
3+++ debian/changelog 2014-02-05 14:02:06 +0000
4@@ -1,3 +1,10 @@
5+qtmultimedia-opensource-src-touch (5.1.1+git20131205+8230c02-0ubuntu3) UNRELEASED; urgency=medium
6+
7+ * Fix remove/add for qtdeclarative5-qtmultimedia-touch-plugin
8+ (LP: #1275690)
9+
10+ -- Sergio Schvezov <sergio.schvezov@canonical.com> Wed, 05 Feb 2014 10:56:53 -0300
11+
12 qtmultimedia-opensource-src-touch (5.1.1+git20131205+8230c02-0ubuntu1) trusty; urgency=low
13
14 * New upstream snapshot:
15
16=== modified file 'debian/qtdeclarative5-qtmultimedia-touch-plugin.postrm'
17--- debian/qtdeclarative5-qtmultimedia-touch-plugin.postrm 2013-09-21 20:29:56 +0000
18+++ debian/qtdeclarative5-qtmultimedia-touch-plugin.postrm 2014-02-05 14:02:06 +0000
19@@ -3,7 +3,7 @@
20
21 if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" -o purge = "$1" ]; then
22 for file in qmldir plugins.qmltypes Video.qml libdeclarative_multimedia.so;do
23- dpkg-divert --package "$pkg" --add --rename \
24+ dpkg-divert --package "$pkg" --remove --rename \
25 --divert \
26 "$divert_dir"/$file.diverted-$pkg \
27 /usr/lib/__ARCH__/qt5/qml/QtMultimedia/$file

Subscribers

People subscribed via source and target branches