[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.13.1-1-11-g0247f50
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jul 22 07:26:42 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=aceee4b
The following commit has been merged in the master branch:
commit aceee4b1a816626b820be14f029ba1cb76eeb0a9
Author: Maximiliano Curia <maxy at debian.org>
Date: Wed Jul 16 12:47:42 2014 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/make_libkdeinit4_private.diff | 46 ++++++++++++++--------------
2 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 38be227..79fcb63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ kde4libs (4:4.13.2-1) UNRELEASED; urgency=medium
* New patch: fix_solidlex_destroy_signature.patch. (Closes: #749227)
Thanks to Michael Tautschnig.
* New upstream release.
+ * Refresh patches.
[ Pino Toscano ]
* Switch the libpng12-dev build dependency to libpng-dev.
diff --git a/debian/patches/make_libkdeinit4_private.diff b/debian/patches/make_libkdeinit4_private.diff
index 4de849f..74436c7 100644
--- a/debian/patches/make_libkdeinit4_private.diff
+++ b/debian/patches/make_libkdeinit4_private.diff
@@ -21,8 +21,8 @@ The patch also adds support for "kdeinit" resource type to KDE Platform
libraries.
Index: kde4libs/CreateKDELibsDependenciesFile.cmake
===================================================================
---- kde4libs.orig/CreateKDELibsDependenciesFile.cmake 2014-02-05 14:54:04.179366178 +0100
-+++ kde4libs/CreateKDELibsDependenciesFile.cmake 2014-02-05 14:54:04.175366084 +0100
+--- kde4libs.orig/CreateKDELibsDependenciesFile.cmake 2014-07-03 17:21:13.321634371 +0200
++++ kde4libs/CreateKDELibsDependenciesFile.cmake 2014-07-03 17:21:13.313634690 +0200
@@ -32,6 +32,7 @@
make_install_path_absolute(KDE4_LIB_INSTALL_DIR ${LIB_INSTALL_DIR})
make_install_path_absolute(KDE4_IMPORTS_INSTALL_DIR ${IMPORTS_INSTALL_DIR})
@@ -41,8 +41,8 @@ Index: kde4libs/CreateKDELibsDependenciesFile.cmake
set(KDE4_SBIN_INSTALL_DIR \"${KDE4_SBIN_INSTALL_DIR}\")
Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
===================================================================
---- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake 2014-02-05 14:54:04.179366178 +0100
-+++ kde4libs/cmake/modules/FindKDE4Internal.cmake 2014-02-05 14:54:04.175366084 +0100
+--- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake 2014-07-03 17:21:13.321634371 +0200
++++ kde4libs/cmake/modules/FindKDE4Internal.cmake 2014-07-03 17:21:13.313634690 +0200
@@ -871,6 +871,7 @@
_set_fancy(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" "The subdirectory to the header prefix")
@@ -64,10 +64,10 @@ Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
Index: kde4libs/cmake/modules/KDE4Macros.cmake
===================================================================
---- kde4libs.orig/cmake/modules/KDE4Macros.cmake 2014-02-05 14:54:04.179366178 +0100
-+++ kde4libs/cmake/modules/KDE4Macros.cmake 2014-02-05 14:54:04.175366084 +0100
+--- kde4libs.orig/cmake/modules/KDE4Macros.cmake 2014-07-03 17:21:13.321634371 +0200
++++ kde4libs/cmake/modules/KDE4Macros.cmake 2014-07-03 17:21:13.313634690 +0200
@@ -834,6 +834,17 @@
- endif(NOT _res_position EQUAL -1)
+ endif(NOT _icon_position EQUAL -1)
endif (Q_WS_MAC)
kde4_add_executable(${_target_NAME} "${_nogui}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${_resourcefile})
+ if (UNIX AND ENABLE_LIBKDEINIT_RUNPATH)
@@ -86,8 +86,8 @@ Index: kde4libs/cmake/modules/KDE4Macros.cmake
Index: kde4libs/kinit/CMakeLists.txt
===================================================================
---- kde4libs.orig/kinit/CMakeLists.txt 2014-02-05 14:54:04.179366178 +0100
-+++ kde4libs/kinit/CMakeLists.txt 2014-02-05 14:54:04.175366084 +0100
+--- kde4libs.orig/kinit/CMakeLists.txt 2014-07-03 17:21:13.321634371 +0200
++++ kde4libs/kinit/CMakeLists.txt 2014-07-03 17:21:13.313634690 +0200
@@ -58,6 +58,17 @@
install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
@@ -108,8 +108,8 @@ Index: kde4libs/kinit/CMakeLists.txt
set(kwrapper_SRCS kwrapper_win.cpp )
Index: kde4libs/config-prefix.h.cmake
===================================================================
---- kde4libs.orig/config-prefix.h.cmake 2014-02-05 14:54:04.179366178 +0100
-+++ kde4libs/config-prefix.h.cmake 2014-02-05 14:54:04.175366084 +0100
+--- kde4libs.orig/config-prefix.h.cmake 2014-07-03 17:21:13.321634371 +0200
++++ kde4libs/config-prefix.h.cmake 2014-07-03 17:21:13.313634690 +0200
@@ -12,6 +12,7 @@
#define __KDE_EXECPREFIX "NONE"
@@ -120,8 +120,8 @@ Index: kde4libs/config-prefix.h.cmake
#define INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}"
Index: kde4libs/kdecore/kde-config.cpp
===================================================================
---- kde4libs.orig/kdecore/kde-config.cpp 2014-02-05 14:54:04.179366178 +0100
-+++ kde4libs/kdecore/kde-config.cpp 2014-02-05 14:54:04.175366084 +0100
+--- kde4libs.orig/kdecore/kde-config.cpp 2014-07-03 17:21:13.321634371 +0200
++++ kde4libs/kdecore/kde-config.cpp 2014-07-03 17:21:13.317634530 +0200
@@ -144,6 +144,7 @@
"html", I18N_NOOP("HTML documentation"),
"icon", I18N_NOOP("Icons"),
@@ -132,8 +132,8 @@ Index: kde4libs/kdecore/kde-config.cpp
"locale", I18N_NOOP("Translation files for KLocale"),
Index: kde4libs/kdecore/kernel/kstandarddirs.cpp
===================================================================
---- kde4libs.orig/kdecore/kernel/kstandarddirs.cpp 2014-02-05 14:54:04.179366178 +0100
-+++ kde4libs/kdecore/kernel/kstandarddirs.cpp 2014-02-05 14:54:04.175366084 +0100
+--- kde4libs.orig/kdecore/kernel/kstandarddirs.cpp 2014-07-03 17:21:13.321634371 +0200
++++ kde4libs/kdecore/kernel/kstandarddirs.cpp 2014-07-03 17:21:13.317634530 +0200
@@ -171,6 +171,8 @@
menus
xdgconf-autostart
@@ -163,8 +163,8 @@ Index: kde4libs/kdecore/kernel/kstandarddirs.cpp
static void tokenize(QStringList& token, const QString& str,
Index: kde4libs/kdecore/kernel/kstandarddirs_unix.cpp
===================================================================
---- kde4libs.orig/kdecore/kernel/kstandarddirs_unix.cpp 2014-02-05 14:54:04.179366178 +0100
-+++ kde4libs/kdecore/kernel/kstandarddirs_unix.cpp 2014-02-05 14:54:04.175366084 +0100
+--- kde4libs.orig/kdecore/kernel/kstandarddirs_unix.cpp 2014-07-03 17:21:13.321634371 +0200
++++ kde4libs/kdecore/kernel/kstandarddirs_unix.cpp 2014-07-03 17:21:13.317634530 +0200
@@ -40,6 +40,8 @@
return QFile::decodeName(KCFG_INSTALL_DIR "/");
if (strcmp("kdedir", type) == 0)
@@ -176,8 +176,8 @@ Index: kde4libs/kdecore/kernel/kstandarddirs_unix.cpp
if (strcmp("data", type) == 0)
Index: kde4libs/kdecore/kernel/kstandarddirs_win.cpp
===================================================================
---- kde4libs.orig/kdecore/kernel/kstandarddirs_win.cpp 2014-02-05 14:54:04.179366178 +0100
-+++ kde4libs/kdecore/kernel/kstandarddirs_win.cpp 2014-02-05 14:54:04.175366084 +0100
+--- kde4libs.orig/kdecore/kernel/kstandarddirs_win.cpp 2014-07-03 17:21:13.321634371 +0200
++++ kde4libs/kdecore/kernel/kstandarddirs_win.cpp 2014-07-03 17:21:13.317634530 +0200
@@ -47,6 +47,8 @@
return share() + QLatin1String("config.kcfg/");
if (strcmp("kdedir", type) == 0)
@@ -189,8 +189,8 @@ Index: kde4libs/kdecore/kernel/kstandarddirs_win.cpp
if (strcmp("data", type) == 0)
Index: kde4libs/kdecore/util/kpluginloader.cpp
===================================================================
---- kde4libs.orig/kdecore/util/kpluginloader.cpp 2014-02-05 14:54:04.179366178 +0100
-+++ kde4libs/kdecore/util/kpluginloader.cpp 2014-02-05 14:54:04.175366084 +0100
+--- kde4libs.orig/kdecore/util/kpluginloader.cpp 2014-07-03 17:21:13.321634371 +0200
++++ kde4libs/kdecore/util/kpluginloader.cpp 2014-07-03 17:21:13.317634530 +0200
@@ -113,6 +113,13 @@
libname = fileinfo.path() + QLatin1String("/lib") + fileinfo.fileName();
#endif
@@ -207,8 +207,8 @@ Index: kde4libs/kdecore/util/kpluginloader.cpp
if (!kdeinit) {
Index: kde4libs/kinit/kinit.cpp
===================================================================
---- kde4libs.orig/kinit/kinit.cpp 2014-02-05 14:54:04.179366178 +0100
-+++ kde4libs/kinit/kinit.cpp 2014-02-05 14:54:04.175366084 +0100
+--- kde4libs.orig/kinit/kinit.cpp 2014-07-03 17:21:13.321634371 +0200
++++ kde4libs/kinit/kinit.cpp 2014-07-03 17:21:13.317634530 +0200
@@ -498,11 +498,23 @@
// try to match an absolute path to an executable binary (either in bin/ or in libexec/)
// to a kdeinit module in the same prefix
--
KDE Development Platform Libraries module packaging
More information about the pkg-kde-commits
mailing list