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

[Sergio Schvezov]

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

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