diff -Nru procps-3.3.15/debian/changelog procps-3.3.15/debian/changelog --- procps-3.3.15/debian/changelog 2018-05-25 10:09:30.000000000 +0000 +++ procps-3.3.15/debian/changelog 2018-06-05 18:20:00.000000000 +0000 @@ -1,3 +1,39 @@ +procps (2:3.3.15-2ubuntu1) cosmic; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/sysctl.d (Ubuntu-specific): + + 10-console-messages.conf: stop low-level kernel messages on console. + + 10-kernel-hardening.conf: add the kptr_restrict setting + + 10-keyboard.conf.powerpc: mouse button emulation on PowerPC. + + 10-ipv6-privacy.conf: add a file to sysctl.d to apply the defaults + for IPv6 privacy extensions for interfaces. (LP: #176125, #841353) + + 10-link-restrictions.conf: even though the Ubuntu + kernel is built with these defaults in place, we want to make sure + that people running stock kernels don't miss out. + + 10-magic-sysrq.conf: Disable most magic sysrq by default, allowing + critical sync, remount, reboot functions. (LP: #194676, LP: #1025467) + + 10-network-security.conf: enable rp_filter. + + 10-ptrace.conf: describe new PTRACE setting. + + 10-zeropage.conf: safe mmap_min_addr value for graceful fall-back. + for armhf, and arm64. + + 10-qemu.conf.s390x for qemu. + + README: describe how this directory is supposed to work. + - debian/rules: Fix cross build + - ignore_eaccess.patch: If we get eaccess when opening a sysctl file for + writing, don't error out. Otherwise package upgrades can fail, + especially in containers. + - ignore_erofs.patch: Same as ignore_eaccess but for the case where + part of /proc is read/only. + + -- Balint Reczey Tue, 05 Jun 2018 11:20:00 -0700 + +procps (2:3.3.15-2) unstable; urgency=medium + + * Fix link in libprocps-dev Closes: 900239 + * Fix typo in license Closes: #899346 + + -- Craig Small Thu, 31 May 2018 19:42:46 +1000 + procps (2:3.3.15-1ubuntu1) cosmic; urgency=medium * Merge from Debian unstable. Remaining changes: diff -Nru procps-3.3.15/debian/copyright procps-3.3.15/debian/copyright --- procps-3.3.15/debian/copyright 2018-05-25 10:09:30.000000000 +0000 +++ procps-3.3.15/debian/copyright 2018-06-05 18:20:00.000000000 +0000 @@ -48,7 +48,7 @@ Files: debian/* Copyright: 1997-2015 Craig Small - 1996-1197 Helmut Geyer + 1996-1997 Helmut Geyer License: GPL-2.0+ License: GPL-2.0+ diff -Nru procps-3.3.15/debian/libprocps-dev.links procps-3.3.15/debian/libprocps-dev.links --- procps-3.3.15/debian/libprocps-dev.links 2018-05-25 10:09:30.000000000 +0000 +++ procps-3.3.15/debian/libprocps-dev.links 2018-06-05 18:20:00.000000000 +0000 @@ -1,2 +1,2 @@ #! /usr/bin/dh-exec -lib/${DEB_HOST_MULTIARCH}/libprocps.so.6 usr/lib/${DEB_HOST_MULTIARCH}/libprocps.so +lib/${DEB_HOST_MULTIARCH}/libprocps.so.7 usr/lib/${DEB_HOST_MULTIARCH}/libprocps.so