From: Peter Michael Green <plugwash@raspbian.org>
Date: Wed, 27 Sep 2017 23:49:53 +0000 (+0000)
Subject: Manual merge of version 2.27.2-2+rpi1 and 2.27.6-1 to produce 2.27.6-1+rpi1
X-Git-Tag: archive/raspbian/2.27.6-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cc88796e4ffd6117929056f5c19226ff717d3363;p=snapd.git

Manual merge of version 2.27.2-2+rpi1 and 2.27.6-1 to produce 2.27.6-1+rpi1
---

145930df412924bb06db27927046259ed3328491
diff --cc debian/changelog
index a35dadce,28a412e5..b66b5c3a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,29 +1,38 @@@
- snapd (2.27.2-2+rpi1) buster-staging; urgency=medium
++snapd (2.27.6-1+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 2.27.2-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 24 Aug 2017 17:53:18 +0000]
 +  * Treat unknown derivatives the same as Debian.
 +  * Disable testsuite.
 +  * Fix clean target.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 24 Aug 2017 17:53:18 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 27 Sep 2017 23:49:06 +0000
++
+ snapd (2.27.6-1) unstable; urgency=medium
+ 
+   * New upstream release, LP: #1703798:
+     - interfaces: add udev netlink support to hardware-observe
+     - interfaces/network-{control,observe}: allow receiving
+       kobject_uevent() messages
+ 
+  -- Zygmunt Krynicki <me@zygoon.pl>  Fri, 08 Sep 2017 00:03:18 +0200
+ 
+ snapd (2.27.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - interfaces: fix network-manager plug regression
+     - hooks: do not error when hook handler is not registered
+     - interfaces/alsa,pulseaudio: allow read on udev data for sound
+     - interfaces/optical-drive: read access to udev data for /dev/scd*
+     - interfaces/browser-support: read on /proc/vmstat and misc udev data
+ 
+  -- Zygmunt Krynicki <me@zygoon.pl>  Thu, 31 Aug 2017 10:11:20 +0200
+ 
+ snapd (2.27.4-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Enable seccomp.
+ 
+  -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Thu, 24 Aug 2017 22:12:52 +1200
  
  snapd (2.27.2-2) unstable; urgency=medium
  
diff --cc debian/rules
index c4d014d5,90a1d469..50b26979
--- a/debian/rules
+++ b/debian/rules
@@@ -56,8 -56,12 +56,8 @@@ ifeq ($(shell dpkg-vendor --query Vendo
      VENDOR_ARGS=--enable-nvidia-ubuntu --enable-static-libcap --enable-static-libapparmor --enable-static-libseccomp
      BUILT_USING_PACKAGES=libcap-dev libapparmor-dev libseccomp-dev
  else
-     VENDOR_ARGS=--disable-apparmor --disable-seccomp --enable-static-libcap
 -ifeq ($(shell dpkg-vendor --query Vendor),Debian)
+     VENDOR_ARGS=--disable-apparmor --enable-static-libcap
      BUILT_USING_PACKAGES=libcap-dev
 -else
 -    VENDOR_ARGS=--disable-apparmor
 -endif
  endif
  BUILT_USING=$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W $(BUILT_USING_PACKAGES))