Manual merge of version 2.27.2-2+rpi1 and 2.27.6-1 to produce 2.27.6-1+rpi1 archive/raspbian/2.27.6-1+rpi1 raspbian/2.27.6-1+rpi1
authorPeter Michael Green <plugwash@raspbian.org>
Wed, 27 Sep 2017 23:49:53 +0000 (23:49 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Wed, 27 Sep 2017 23:49:53 +0000 (23:49 +0000)
1  2 
debian/changelog
debian/rules

index a35dadce9729b6bb504269962a3cd89633ab9c71,28a412e59324ca961dd89d18fe49f9d42b29b0aa..b66b5c3aa24c799f7e0f59d445c070045b05cdc7
@@@ -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 c4d014d563c79380e51ca5cd656f520455dea0db,90a1d46993d0e49282f4979d75c326412b558300..50b269791880489652a0189f5865b67e8138c606
@@@ -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))