Merge ~fourdollars/pc-enablement/+git/ubuntu-recovery:main into ~oem-solutions-engineers/pc-enablement/+git/ubuntu-recovery:main

[Shih-Yuan Lee]

[Bin Li (binli)]

LGTM.
Thanks!

review: Approve

diff --git a/bin/recovery-media-creator b/bin/recovery-media-creator
index eb61617..2b6e831 100755
--- a/bin/recovery-media-creator
+++ b/bin/recovery-media-creator
@@ -16,6 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import gi
+gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk, GObject
 import subprocess, logging, dbus, os
 
diff --git a/debian/ubuntu-recovery.postinst b/debian/ubuntu-recovery.postinst
index b0cf7bd..3574e18 100644
--- a/debian/ubuntu-recovery.postinst
+++ b/debian/ubuntu-recovery.postinst
@@ -14,11 +14,6 @@ case "$1" in
            [ "$RET" != "PQSERVICE" -a -e /lib/udev/rules.d/96-ubuntu-recovery-partition.rules ]; then
             sed 's/PQSERVICE/'$RET'/g' -i /lib/udev/rules.d/96-ubuntu-recovery-partition.rules
         fi
-
-        if db_get ubuntu-recovery/recovery_media && \
-           [ "$RET" = false -a -e /usr/share/applications/recovery-media-creator.desktop ]; then
-            rm /usr/share/applications/recovery-media-creator.desktop
-        fi
         ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/ubuntu-recovery.templates b/debian/ubuntu-recovery.templates
index 7d1c088..7978827 100644
--- a/debian/ubuntu-recovery.templates
+++ b/debian/ubuntu-recovery.templates
@@ -47,11 +47,6 @@ Type: string
 Default: 0
 Description: for internal use; determines the offset of the recovery partition
 
-Template: ubuntu-recovery/recovery_media
-Type: boolean
-Default: false
-Description: for internal use; determines the support of creating the recovery media on USB and DVD.
-
 Template: ubuntu-recovery/active_partition
 Type: string
 Default: dynamic