[SCM] kconfigwidgets packaging branch, master, updated. ae45d405fea52220e620bd6b92d88fed703c1bf6
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Feb 24 17:10:21 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kconfigwidgets.git;a=commitdiff;h=ad4ac7c
The following commit has been merged in the master branch:
commit ad4ac7c59af0971c2b29a847d99b88cb92bb2158
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Mon Jan 26 16:35:05 2015 +0100
Remove unneeded files
---
debian/patches/series | 0
.../upstream_Dont_construct_bugus_objects.patch | 30 ----------------------
debian/source/include-binaries | 4 ---
3 files changed, 34 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/patches/upstream_Dont_construct_bugus_objects.patch b/debian/patches/upstream_Dont_construct_bugus_objects.patch
deleted file mode 100644
index 569c1dd..0000000
--- a/debian/patches/upstream_Dont_construct_bugus_objects.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit bc4ecf90b4585d535f2f3511fc0e910494309b35
-Author: Harald Sitter <sitter at kde.org>
-Date: Fri Aug 1 16:35:16 2014 +0200
-
- don't construct bogus KAuthAction objects
-
- KAuthAction(0) actually calls the QString constructor which will dispatch
- bogus polkit auth checks, polkitqt and polkitd are not terribly happy about
- those and subsequently don't want to talk to the KCM anymore, even if it
- manages to create a proper Action
-
- creating a null Action rather than accidentally triggering the QString
- ctor ensures that we only do polkit interaction with reasonable actionids
- making sure that authentication works as expected
-
- REVIEW: 119540
-
-diff --git a/src/kcmodule.cpp b/src/kcmodule.cpp
-index 92e5427..9a3ae30 100644
---- a/src/kcmodule.cpp
-+++ b/src/kcmodule.cpp
-@@ -43,7 +43,7 @@ public:
- _useRootOnlyMessage(false),
- _firstshow(true),
- _needsAuthorization(false),
-- _authAction(0),
-+ _authAction(),
- _unmanagedWidgetChangeState(false)
- { }
-
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
deleted file mode 100644
index 25f5092..0000000
--- a/debian/source/include-binaries
+++ /dev/null
@@ -1,4 +0,0 @@
-obj-x86_64-linux-gnu/CMakeFiles/2.8.12.1/CMakeDetermineCompilerABI_C.bin
-obj-x86_64-linux-gnu/CMakeFiles/2.8.12.1/CMakeDetermineCompilerABI_CXX.bin
-obj-x86_64-linux-gnu/CMakeFiles/2.8.12.1/CompilerIdC/a.out
-obj-x86_64-linux-gnu/CMakeFiles/2.8.12.1/CompilerIdCXX/a.out
--
kconfigwidgets packaging
More information about the pkg-kde-commits
mailing list