[SCM] signon-plugin-oauth2 packaging branch, master, updated. debian/0.22-1-2-gd2a8e68

Rohan Garg rohangarg-guest at moszumanska.debian.org
Thu Apr 28 18:13:27 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/signon-plugin-oauth2.git;a=commitdiff;h=d2a8e68

The following commit has been merged in the master branch:
commit d2a8e68b2315cf2a7352c3b79e8ad5041684e46a
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Apr 28 00:41:02 2016 +0200

    Drop unused-variable.patch, applied upstream
---
 debian/changelog                     |  4 ++++
 debian/patches/series                |  1 -
 debian/patches/unused-variable.patch | 14 --------------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c3bef62..2bcc057 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 signon-plugin-oauth2 (0.23-1) UNRELEASED; urgency=medium
 
+  [ Debian Qt/KDE Maintainers ]
   * New upstream release.
 
+  [ Rohan Garg ]
+  * Drop unused-variable.patch, applied upstream
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Jan 2016 16:42:05 -0800
 
 signon-plugin-oauth2 (0.22-1) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 3cde671..b3137ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 dont-install-examples.patch
 hardening.patch
-unused-variable.patch
diff --git a/debian/patches/unused-variable.patch b/debian/patches/unused-variable.patch
deleted file mode 100644
index 88b6f77..0000000
--- a/debian/patches/unused-variable.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Diane Trout <diane at debian.org>
-Description: Remove allocating an unused data pointer.
- The more picky Debian build environment made this an error.
---- a/src/base-plugin.cpp
-+++ b/src/base-plugin.cpp
-@@ -171,8 +171,6 @@
- bool BasePlugin::handleNetworkError(QNetworkReply *reply,
-                                     QNetworkReply::NetworkError err)
- {
--    Q_D(BasePlugin);
--
-     /* Has been handled by handleSslErrors already */
-     if (err == QNetworkReply::SslHandshakeFailedError) {
-         return true;

-- 
signon-plugin-oauth2 packaging



More information about the pkg-kde-commits mailing list