diff -Nru kvpnc-0.9.6a/debian/changelog kvpnc-0.9.6a/debian/changelog --- kvpnc-0.9.6a/debian/changelog 2016-01-07 22:04:19.000000000 +0000 +++ kvpnc-0.9.6a/debian/changelog 2016-02-14 09:58:03.000000000 +0000 @@ -1,3 +1,19 @@ +kvpnc (0.9.6a-4) unstable; urgency=medium + + * Team upload. + * Bump Standards-Version to 3.9.7, no changes required. + * Backport upstream r1452682 and r1452683 to fix build with GCC 6; patches + r1452682.diff and r1452683.diff. (Closes: #811679) + * Use https for the Vcs-Browser field. + * Since kvpnc-data is really small (< 400K, compared to ~3M of kvpnc), fold + its content to kvpnc: + - remove kvpnc-data package + - add proper breaks/replaces in kvpnc + - force installation directly to the kvpnc destdir, and remove install files + - remove --list-missing + + -- Pino Toscano Sun, 14 Feb 2016 10:57:56 +0100 + kvpnc (0.9.6a-3) unstable; urgency=medium * Team upload. diff -Nru kvpnc-0.9.6a/debian/control kvpnc-0.9.6a/debian/control --- kvpnc-0.9.6a/debian/control 2016-01-07 21:46:38.000000000 +0000 +++ kvpnc-0.9.6a/debian/control 2016-02-14 09:48:39.000000000 +0000 @@ -5,17 +5,19 @@ Uploaders: Fathi Boudra , Mark Purcell Build-Depends: debhelper (>= 9), cmake, pkg-kde-tools (>= 0.6.4), kdelibs5-dev (>= 4:4.3.4), libgcrypt11-dev -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Homepage: http://home.gna.org/kvpnc -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-kde/kde-extras/kvpnc/ +Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-kde/kde-extras/kvpnc/ Vcs-Svn: svn://anonscm.debian.org/pkg-kde/kde-extras/kvpnc/trunk/ Package: kvpnc Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, kvpnc-data (= ${source:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, menu, net-tools, psmisc, kmod Suggests: iptables, openssl, openvpn, racoon, vpnc, pptp-linux, openswan, xl2tpd, openct, opensc +Breaks: kvpnc-data (<< 0.9.6a-4~) +Replaces: kvpnc-data (<< 0.9.6a-4~) Description: frontend to VPN clients KVpnc is a KDE frontend for various VPN clients. . @@ -26,16 +28,6 @@ * Virtual Private Network daemon (openvpn) * L2TP, Vtun & OpenSSH -Package: kvpnc-data -Architecture: all -Depends: ${misc:Depends} -Recommends: kvpnc (>= ${source:Version}) -Replaces: kvpnc (<< 0.9.6a) -Description: data files for KVpnc - KVpnc is a KDE frontend for various VPN clients. - . - This package contains the data files for it. - Package: kvpnc-dbg Section: debug Architecture: any diff -Nru kvpnc-0.9.6a/debian/kvpnc-data.install kvpnc-0.9.6a/debian/kvpnc-data.install --- kvpnc-0.9.6a/debian/kvpnc-data.install 2016-01-07 22:02:31.000000000 +0000 +++ kvpnc-0.9.6a/debian/kvpnc-data.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/share/icons/ -usr/share/kde4/apps/kvpnc/ diff -Nru kvpnc-0.9.6a/debian/kvpnc.install kvpnc-0.9.6a/debian/kvpnc.install --- kvpnc-0.9.6a/debian/kvpnc.install 2016-01-07 20:39:06.000000000 +0000 +++ kvpnc-0.9.6a/debian/kvpnc.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/bin/kvpnc -usr/share/applications/kde4/kvpnc.desktop diff -Nru kvpnc-0.9.6a/debian/patches/r1452682.diff kvpnc-0.9.6a/debian/patches/r1452682.diff --- kvpnc-0.9.6a/debian/patches/r1452682.diff 1970-01-01 00:00:00.000000000 +0000 +++ kvpnc-0.9.6a/debian/patches/r1452682.diff 2016-02-14 09:21:31.000000000 +0000 @@ -0,0 +1,35 @@ +Author: Pino Toscano +Description: do not return bool for QString + GCC 6 cannot convert them +Bug-Debian: https://bugs.debian.org/811679 +Applied-Upstream: commit:1452682 + +--- a/src/utils.cpp ++++ b/src/utils.cpp +@@ -914,7 +914,7 @@ + NameAndPidOfProgramListenProcess->start(proc, args); + if (!NameAndPidOfProgramListenProcess->waitForStarted()) { + kError() << "netstat fails!" << endl; +- return false; ++ return ""; + } else { + NameAndPidOfProgramListenProcess->waitForFinished(); + +@@ -946,7 +946,7 @@ + GetEmailAddressOfCertProcess->start(proc, args); + if (!GetEmailAddressOfCertProcess->waitForStarted()) { + kError() << "GetEmailAddressOfCertProcess" << endl; +- return false; ++ return ""; + } else { + GetEmailAddressOfCertProcess->waitForFinished(); + disconnect(GetEmailAddressOfCertProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(readOutGetEmailAddressOfCert())); +@@ -1159,7 +1159,7 @@ + GetHostnameProcess->start(proc, args); + if (!GetHostnameProcess->waitForStarted()) { + kError() << "Unable to start getHostname process!" << endl; +- return false; ++ return ""; + } else { + GetHostnameProcess->waitForFinished(); + return Hostname; diff -Nru kvpnc-0.9.6a/debian/patches/r1452683.diff kvpnc-0.9.6a/debian/patches/r1452683.diff --- kvpnc-0.9.6a/debian/patches/r1452683.diff 1970-01-01 00:00:00.000000000 +0000 +++ kvpnc-0.9.6a/debian/patches/r1452683.diff 2016-02-14 09:21:47.000000000 +0000 @@ -0,0 +1,18 @@ +Author: Pino Toscano +Description: remove extra bool parameter for KConfigGroup::deleteEntry() + unneeded, and it does not match any of the actual signatures of the + function +Bug-Debian: https://bugs.debian.org/811679 +Applied-Upstream: commit:1452683 + +--- a/src/kvpncconfig.cpp ++++ b/src/kvpncconfig.cpp +@@ -4305,7 +4305,7 @@ + appPointer->processEvents(); + + if (useKwallet && KWallet::Wallet::isEnabled()) +- configgroup.deleteEntry("First use of Kwallet", false); ++ configgroup.deleteEntry("First use of Kwallet"); + + + /* = user data = */ diff -Nru kvpnc-0.9.6a/debian/patches/series kvpnc-0.9.6a/debian/patches/series --- kvpnc-0.9.6a/debian/patches/series 2016-01-07 21:21:09.000000000 +0000 +++ kvpnc-0.9.6a/debian/patches/series 2016-02-14 09:24:06.000000000 +0000 @@ -1,3 +1,5 @@ 10_su-to-root_usage.diff fix-ftbfs-gcc-4.7-667233.patch r1180094.diff +r1452682.diff +r1452683.diff diff -Nru kvpnc-0.9.6a/debian/rules kvpnc-0.9.6a/debian/rules --- kvpnc-0.9.6a/debian/rules 2016-01-07 20:42:24.000000000 +0000 +++ kvpnc-0.9.6a/debian/rules 2016-02-14 09:49:54.000000000 +0000 @@ -1,7 +1,10 @@ #!/usr/bin/make -f %: - dh $@ --parallel --dbg-package=kvpnc-dbg --with kde --list-missing + dh $@ --parallel --dbg-package=kvpnc-dbg --with kde + +override_dh_auto_install: + dh_auto_install --buildsystem=kde --destdir=debian/kvpnc override_dh_fixperms: dh_fixperms