trivial: snap: sync up some missing changes in master snap

contrib/snap/snapcraft-master.yaml

@@ -13,17 +13,19 @@ architectures:
   - amd64
 
 apps:
+  dfu-tool:
+    command: dfu-tool.wrapper
   fwupdtool:
     command: fwupdtool.wrapper
     completer:
-      usr/share/bash-completion/completions/fwupdtool
+      share/bash-completion/completions/fwupdtool
   fwupd:
     command: fwupd.wrapper
     daemon: simple
   fwupdmgr:
     command: fwupdmgr.wrapper
     completer:
-      usr/share/bash-completion/completions/fwupdmgr
+      share/bash-completion/completions/fwupdmgr
 
 parts:
   libefivar-dev:
@@ -154,16 +156,16 @@ parts:
   gusb:
     plugin: meson
     source: https://github.com/hughsie/libgusb/archive/0.3.0.tar.gz
-    meson-parameters: [--prefix=/usr,
+    meson-parameters: [--prefix=/,
                        -Dtests=false,
                        -Dvapi=false,
                        -Ddocs=false]
     prime:
-    - -usr/bin/
+    - -bin/
-    - -usr/include
+    - -include
-    - -usr/share
+    - -share
-    - -usr/lib/*/pkgconfig
+    - -lib/*/pkgconfig
-    - -usr/lib/*/girepository-1.0
+    - -lib/*/girepository-1.0
     after: [libusb]
   gnu-efi:
     plugin: make
@@ -224,8 +226,7 @@ parts:
     - -usr/share
   fwupd:
     plugin: meson
-    meson-parameters: [--prefix=/usr,
+    meson-parameters: [--prefix=/,
-                       --libexecdir=/usr/lib,
                        -Defi-includedir=$SNAPCRAFT_STAGE/usr/include/efi,
                        -Defi-ldsdir=$SNAPCRAFT_STAGE/usr/lib,
                        -Defi-libdir=$SNAPCRAFT_STAGE/usr/lib,
@@ -265,8 +266,12 @@ parts:
       - libpolkit-gobject-1-0
       - gnupg
     prime:
+      # we explicitly don't want /usr/bin/gpgconf
+      # this will cause gpgme to error finding it
+      # but that also avoids trying to use non-existent
+      # /usr/bin/gpg2
+      - -usr/bin
       - -usr/sbin
-      - -usr/lib/gnupg
       - -usr/share/man
       - -usr/share/GConf
       - -etc/X11
@@ -281,10 +286,10 @@ parts:
       - -usr/lib/*/audit
       - -usr/share/glib-2.0/schemas
       - -usr/share/X11
-      - -usr/include
+      - -include
       - -lib/systemd
       - -lib/udev
-      - -usr/share/gnupg
+      - -lib/*/pkgconfig
       - -usr/share/lintian
       - -usr/share/pkgconfig
       - -usr/share/installed-tests
@@ -322,6 +327,7 @@ parts:
     plugin: dump
     source: contrib/snap
     stage:
+    - dfu-tool.wrapper
     - fwupd-command
     - fwupdtool.wrapper
     - fwupd.wrapper