diff -Nru kdesu-5.30.0/CMakeLists.txt kdesu-5.31.0/CMakeLists.txt
--- kdesu-5.30.0/CMakeLists.txt	2017-01-08 20:50:05.000000000 +0000
+++ kdesu-5.31.0/CMakeLists.txt	2017-02-05 10:55:15.000000000 +0000
@@ -1,18 +1,18 @@
 cmake_minimum_required(VERSION 3.0)
 
-set(KF5_VERSION "5.30.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.30.0") # handled by release scripts
+set(KF5_VERSION "5.31.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.31.0") # handled by release scripts
 project(KDESu VERSION ${KF5_VERSION})
 
 include(FeatureSummary)
-find_package(ECM 5.30.0  NO_MODULE)
+find_package(ECM 5.31.0  NO_MODULE)
 set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
 feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
-set(REQUIRED_QT_VERSION 5.5.0)
+set(REQUIRED_QT_VERSION 5.6.0)
 find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
 include(KDEInstallDirs)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
diff -Nru kdesu-5.30.0/debian/changelog kdesu-5.31.0/debian/changelog
--- kdesu-5.30.0/debian/changelog	2017-02-01 18:37:59.000000000 +0000
+++ kdesu-5.31.0/debian/changelog	2017-02-14 22:54:01.000000000 +0000
@@ -1,3 +1,11 @@
+kdesu (5.31.0-0ubuntu1) zesty; urgency=medium
+
+  * Pass '-fno-keep-inline-functions' to gcc in the acc test in order to
+    avoid possible spurious test failures.
+  * New upstream release (5.31.0)
+
+ -- José Manuel Santamaría Lema <panfaust@gmail.com>  Tue, 14 Feb 2017 22:54:01 +0000
+
 kdesu (5.30.0-0ubuntu1) zesty; urgency=low
 
   * New upstream release (5.30.0)
diff -Nru kdesu-5.30.0/debian/control kdesu-5.31.0/debian/control
--- kdesu-5.30.0/debian/control	2017-02-01 18:37:59.000000000 +0000
+++ kdesu-5.31.0/debian/control	2017-02-14 22:54:01.000000000 +0000
@@ -5,11 +5,11 @@
 Uploaders: Maximiliano Curia <maxy@debian.org>
 Build-Depends: cmake (>= 2.8.12),
                debhelper (>= 9),
-               extra-cmake-modules (>= 5.30.0~),
-               libkf5coreaddons-dev (>= 5.30.1~),
-               libkf5i18n-dev (>= 5.30.0~),
-               libkf5pty-dev (>= 5.30.0~),
-               libkf5service-dev (>= 5.30.0~),
+               extra-cmake-modules (>= 5.31.0~),
+               libkf5coreaddons-dev (>= 5.31.0~),
+               libkf5i18n-dev (>= 5.31.0~),
+               libkf5pty-dev (>= 5.31.0~),
+               libkf5service-dev (>= 5.31.0~),
                pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev (>= 5.6.1~)
 Standards-Version: 3.9.8
@@ -20,7 +20,7 @@
 Package: libkf5su-dev
 Architecture: any
 Section: libdevel
-Depends: libkf5pty-dev (>= 5.30.0~),
+Depends: libkf5pty-dev (>= 5.31.0~),
          libkf5su5 (= ${binary:Version}),
          ${misc:Depends}
 Description: development files for kdesu
diff -Nru kdesu-5.30.0/debian/libkf5su-dev.acc.in kdesu-5.31.0/debian/libkf5su-dev.acc.in
--- kdesu-5.30.0/debian/libkf5su-dev.acc.in	2017-02-01 18:37:59.000000000 +0000
+++ kdesu-5.31.0/debian/libkf5su-dev.acc.in	2017-02-14 22:54:01.000000000 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <descriptor>
 
 <version>
@@ -15,6 +15,7 @@
 
 <gcc_options>
     -fPIC
+    -fno-keep-inline-functions
 </gcc_options>
 
-</descriptor>
+</descriptor>
\ No newline at end of file
diff -Nru kdesu-5.30.0/src/client.h kdesu-5.31.0/src/client.h
--- kdesu-5.30.0/src/client.h	2017-01-08 20:50:05.000000000 +0000
+++ kdesu-5.31.0/src/client.h	2017-02-05 10:55:15.000000000 +0000
@@ -58,7 +58,7 @@
      */
     int exec(const QByteArray &command,
              const QByteArray &user,
-             const QByteArray &options = 0,
+             const QByteArray &options = nullptr,
              const QList<QByteArray> &env = QList<QByteArray>());
 
     /**
@@ -108,7 +108,7 @@
      * @param group Make the key part of a group. See delGroup.
      * @return zero on success, -1 on failure.
      */
-    int setVar(const QByteArray &key, const QByteArray &value, int timeout = 0, const QByteArray &group = 0);
+    int setVar(const QByteArray &key, const QByteArray &value, int timeout = 0, const QByteArray &group = nullptr);
 
     /**
      * Get a persistent variable.
@@ -189,7 +189,7 @@
 private:
     int connect();
 
-    int command(const QByteArray &cmd, QByteArray *result = 0L);
+    int command(const QByteArray &cmd, QByteArray *result = nullptr);
     QByteArray escape(const QByteArray &str);
 
     class KDEsuClientPrivate;
diff -Nru kdesu-5.30.0/src/kdesud/kdesud.cpp kdesu-5.31.0/src/kdesud/kdesud.cpp
--- kdesu-5.30.0/src/kdesud/kdesud.cpp	2017-01-08 20:50:05.000000000 +0000
+++ kdesu-5.31.0/src/kdesud/kdesud.cpp	2017-02-05 10:55:15.000000000 +0000
@@ -120,8 +120,8 @@
 
 int initXconnection()
 {
-    x11Display = XOpenDisplay(NULL);
-    if (x11Display != 0L)
+    x11Display = XOpenDisplay(nullptr);
+    if (x11Display != nullptr)
     {
         XSetIOErrorHandler(xio_errhandler);
         XCreateSimpleWindow(x11Display, DefaultRootWindow(x11Display),
@@ -333,16 +333,16 @@
     sa.sa_handler = signal_exit;
     sigemptyset(&sa.sa_mask);
     sa.sa_flags = 0;
-    sigaction(SIGHUP, &sa, 0L);
-    sigaction(SIGINT, &sa, 0L);
-    sigaction(SIGTERM, &sa, 0L);
-    sigaction(SIGQUIT, &sa, 0L);
+    sigaction(SIGHUP, &sa, nullptr);
+    sigaction(SIGINT, &sa, nullptr);
+    sigaction(SIGTERM, &sa, nullptr);
+    sigaction(SIGQUIT, &sa, nullptr);
 
     sa.sa_handler = sigchld_handler;
     sa.sa_flags = SA_NOCLDSTOP;
-    sigaction(SIGCHLD, &sa, 0L);
+    sigaction(SIGCHLD, &sa, nullptr);
     sa.sa_handler = SIG_IGN;
-    sigaction(SIGPIPE, &sa, 0L);
+    sigaction(SIGPIPE, &sa, nullptr);
 
     // Main execution loop
 
@@ -365,7 +365,7 @@
         if(x11Display)
             XFlush(x11Display);
 #endif
-        if (select(maxfd+1, &tmp_fds, 0L, 0L, 0L) < 0)
+        if (select(maxfd+1, &tmp_fds, nullptr, nullptr, nullptr) < 0)
         {
             if (errno == EINTR) continue;
 
@@ -429,7 +429,7 @@
                     continue;
                 }
 		while (fd+1 > (int) handler.size())
-		    handler.append(0);
+		    handler.append(nullptr);
 		delete handler[fd];
 		handler[fd] = new ConnectionHandler(fd);
                 maxfd = qMax(maxfd, fd);
@@ -442,7 +442,7 @@
             if (handler[i] && handler[i]->handle() < 0)
             {
 		delete handler[i];
-		handler[i] = 0;
+		handler[i] = nullptr;
                 FD_CLR(i, &active_fds);
             }
         }
diff -Nru kdesu-5.30.0/src/kdesud/repo.cpp kdesu-5.31.0/src/kdesud/repo.cpp
--- kdesu-5.30.0/src/kdesud/repo.cpp	2017-01-08 20:50:05.000000000 +0000
+++ kdesu-5.31.0/src/kdesud/repo.cpp	2017-02-05 10:55:15.000000000 +0000
@@ -33,7 +33,7 @@
     if (data.timeout == 0)
         data.timeout = (unsigned) -1;
     else
-        data.timeout += time(0L);
+        data.timeout += time(nullptr);
     head_time = qMin(head_time, data.timeout);
     repo.insert(key, data);
 }
@@ -152,18 +152,18 @@
 QByteArray Repository::find(const QByteArray &key) const
 {
     if( key.isEmpty() )
-        return 0;
+        return nullptr;
 
     RepoCIterator it = repo.find(key);
     if (it == repo.end())
-        return 0;
+        return nullptr;
     return it.value().value;
 }
 
 
 int Repository::expire()
 {
-    unsigned current = time(0L);
+    unsigned current = time(nullptr);
     if (current < head_time)
 	return 0;
 
diff -Nru kdesu-5.30.0/src/ptyprocess.cpp kdesu-5.31.0/src/ptyprocess.cpp
--- kdesu-5.30.0/src/ptyprocess.cpp	2017-01-08 20:50:05.000000000 +0000
+++ kdesu-5.31.0/src/ptyprocess.cpp	2017-02-05 10:55:15.000000000 +0000
@@ -64,7 +64,7 @@
     fd_set fds;
     FD_ZERO(&fds);
     FD_SET(fd, &fds);
-    return select(fd + 1, &fds, 0L, 0L, &tv);
+    return select(fd + 1, &fds, nullptr, nullptr, &tv);
 }
 
 // XXX this function is nonsense:
@@ -117,7 +117,7 @@
 class PtyProcess::PtyProcessPrivate
 {
 public:
-    PtyProcessPrivate() : pty(0L) {}
+    PtyProcessPrivate() : pty(nullptr) {}
     ~PtyProcessPrivate()
     {
         delete pty;
@@ -338,7 +338,7 @@
         argp[i] = (*it).constData();
     }
 
-    argp[i] = NULL;
+    argp[i] = nullptr;
 
     execv(path.constData(), const_cast<char **>(argp));
     qCritical() << "[" << __FILE__ << ":" << __LINE__ << "] " << "execv(" << path << "):" << strerror(errno);
@@ -415,7 +415,7 @@
         timeval timeout;
         timeout.tv_sec = 0;
         timeout.tv_usec = 100000;
-        int ret = select(fd() + 1, &fds, 0L, 0L, &timeout);
+        int ret = select(fd() + 1, &fds, nullptr, nullptr, &timeout);
         if (ret == -1) {
             if (errno != EINTR) {
                 qCritical() << "[" << __FILE__ << ":" << __LINE__ << "] " << "select():" << strerror(errno);
diff -Nru kdesu-5.30.0/src/sshprocess.cpp kdesu-5.31.0/src/sshprocess.cpp
--- kdesu-5.30.0/src/sshprocess.cpp	2017-01-08 20:50:05.000000000 +0000
+++ kdesu-5.31.0/src/sshprocess.cpp	2017-02-05 10:55:15.000000000 +0000
@@ -43,7 +43,7 @@
 {
     m_user = user;
     m_command = command;
-    srand(time(0L));
+    srand(time(nullptr));
 }
 
 SshProcess::~SshProcess()
@@ -68,7 +68,7 @@
 
 int SshProcess::checkNeedPassword()
 {
-    return exec(0L, 2);
+    return exec(nullptr, 2);
 }
 
 int SshProcess::exec(const char *password, int check)
diff -Nru kdesu-5.30.0/src/stubprocess.cpp kdesu-5.31.0/src/stubprocess.cpp
--- kdesu-5.30.0/src/stubprocess.cpp	2017-01-08 20:50:05.000000000 +0000
+++ kdesu-5.31.0/src/stubprocess.cpp	2017-02-05 10:55:15.000000000 +0000
@@ -26,7 +26,7 @@
 using namespace KDESuPrivate;
 
 StubProcess::StubProcess()
-    : d(0)
+    : d(nullptr)
 {
     m_user = "root";
     m_scheduler = SchedNormal;
diff -Nru kdesu-5.30.0/src/suprocess.cpp kdesu-5.31.0/src/suprocess.cpp
--- kdesu-5.30.0/src/suprocess.cpp	2017-01-08 20:50:05.000000000 +0000
+++ kdesu-5.31.0/src/suprocess.cpp	2017-02-05 10:55:15.000000000 +0000
@@ -92,7 +92,7 @@
 
 int SuProcess::checkNeedPassword()
 {
-    return exec(0L, NeedPassword);
+    return exec(nullptr, NeedPassword);
 }
 
 /*
@@ -251,7 +251,7 @@
                 }
             }
             if (colon == 1 && line[j] == ':') {
-                if (password == 0L) {
+                if (password == nullptr) {
                     return killme;
                 }
                 if (waitSlave()) {
diff -Nru kdesu-5.30.0/src/suprocess.h kdesu-5.31.0/src/suprocess.h
--- kdesu-5.30.0/src/suprocess.h	2017-01-08 20:50:05.000000000 +0000
+++ kdesu-5.31.0/src/suprocess.h	2017-02-05 10:55:15.000000000 +0000
@@ -39,7 +39,7 @@
         NeedPassword = 2
     };
 
-    explicit SuProcess(const QByteArray &user = 0, const QByteArray &command = 0);
+    explicit SuProcess(const QByteArray &user = nullptr, const QByteArray &command = nullptr);
     ~SuProcess();
 
     int exec(const char *password, int check = NoCheck);