[SCM] KDE Base Applications module packaging branch, master, updated. debian/16.08.0-1-24-g3df137c
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Sep 10 17:12:23 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-baseapps.git;a=commitdiff;h=ba2cc4d
The following commit has been merged in the master branch:
commit ba2cc4d4f230f4113c7088047fa32d61374dc1ab
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date: Wed Jul 13 05:35:24 2016 +0200
Refresh patches
---
debian/patches/disable_plasma.diff | 21 +++++++++---------
debian/patches/enable_debianabimanager.diff | 9 ++++++--
debian/patches/enable_dlrestrictions.diff | 14 +++++++-----
debian/patches/kubuntu_disable-failing-test.diff | 12 ++++++++++-
debian/patches/kubuntu_ignore-tests.diff | 20 +++++++++--------
debian/patches/series | 2 --
...cmake-use-variable-for-knewstuff3-library.patch | 25 ----------------------
...in_req-to-match-kdelibs-policy-and-enable.patch | 25 ----------------------
8 files changed, 48 insertions(+), 80 deletions(-)
diff --git a/debian/patches/disable_plasma.diff b/debian/patches/disable_plasma.diff
index 03f798d..9c07458 100644
--- a/debian/patches/disable_plasma.diff
+++ b/debian/patches/disable_plasma.diff
@@ -1,17 +1,16 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Disable the build of Plasma-related stuff
- Do not build stuff based on Plasma 4, since they are useless in a Plasma 5
- desktop environment.
- .
- This patch needs to be dropped once a Frameworks-based kde-baseapps is
- prepared.
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2016-06-18
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Jul 2016 05:35:22 +0200
+Subject: disable_plasma
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f17762b..b5950d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -42,7 +42,7 @@ add_subdirectory( kdialog )
+@@ -44,7 +44,7 @@ add_subdirectory( kdialog )
add_subdirectory( keditbookmarks )
add_subdirectory( konqueror )
add_subdirectory( kfind )
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
index fb58f1a..0dec78d 100644
--- a/debian/patches/enable_debianabimanager.diff
+++ b/debian/patches/enable_debianabimanager.diff
@@ -1,13 +1,18 @@
From: Modestas Vainius <modax at debian.org>
+Date: Wed, 13 Jul 2016 05:35:22 +0200
Subject: Use DebianABIManager for this source package. It's Debian-specific.
-Forwarded: not-needed
For more information about DebianABIManager, refer to
/usr/share/doc/pkg-kde-tools/README.DebianABIManager (pkg-kde-tools (>= 0.12)).
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2aae22e..6a6c084 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -57,3 +57,4 @@ macro_optional_add_subdirectory( doc )
+@@ -59,3 +59,4 @@ macro_optional_add_subdirectory( doc )
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/debian/patches/enable_dlrestrictions.diff b/debian/patches/enable_dlrestrictions.diff
index 1989534..529941e 100644
--- a/debian/patches/enable_dlrestrictions.diff
+++ b/debian/patches/enable_dlrestrictions.diff
@@ -1,15 +1,19 @@
From: Modestas Vainius <modax at debian.org>
-Subject: Enable DLRestrictions (REJECT:OTHERSOVERSION) support for all libraries
-Forwarded: not-needed
-Origin: vendor
-Last-Update: 2011-05-25
+Date: Wed, 13 Jul 2016 05:35:22 +0200
+Subject: Enable DLRestrictions (REJECT:OTHERSOVERSION) support for all
+ libraries
Enable REJECT:OTHERSOVERSION for these libraries because their ABI is typically
not stable and structures frequently conflict.
+---
+ CMakeLists.txt | 7 +++++++
+ 1 file changed, 7 insertions(+)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6a6c084..f17762b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -58,3 +58,10 @@ macro_optional_add_subdirectory( doc )
+@@ -60,3 +60,10 @@ macro_optional_add_subdirectory( doc )
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
diff --git a/debian/patches/kubuntu_disable-failing-test.diff b/debian/patches/kubuntu_disable-failing-test.diff
index fa68b05..1ae76c7 100644
--- a/debian/patches/kubuntu_disable-failing-test.diff
+++ b/debian/patches/kubuntu_disable-failing-test.diff
@@ -1,6 +1,16 @@
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Jul 2016 05:35:22 +0200
+Subject: kubuntu_disable-failing-test
+
+---
+ lib/konq/tests/CMakeLists.txt | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/lib/konq/tests/CMakeLists.txt b/lib/konq/tests/CMakeLists.txt
+index 9affbf8..8adf107 100644
--- a/lib/konq/tests/CMakeLists.txt
+++ b/lib/konq/tests/CMakeLists.txt
-@@ -14,13 +14,4 @@ kde4_add_unit_test(konqpopupmenutest kon
+@@ -14,13 +14,4 @@ kde4_add_unit_test(konqpopupmenutest konqpopupmenutest.cpp)
target_link_libraries(konqpopupmenutest konq ${KDE4_KFILE_LIBS}
${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY})
diff --git a/debian/patches/kubuntu_ignore-tests.diff b/debian/patches/kubuntu_ignore-tests.diff
index 605e197..5d8cac5 100644
--- a/debian/patches/kubuntu_ignore-tests.diff
+++ b/debian/patches/kubuntu_ignore-tests.diff
@@ -1,14 +1,16 @@
-Description: ignore failing tests
- ignore tests failing due to switch to plasma 5
-Author: Jonathan Riddell
-Origin: me
-Forwarded: nope
-Last-Update: 2015-09-01
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Jul 2016 05:35:22 +0200
+Subject: kubuntu_ignore-tests
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ konqueror/src/tests/CMakeLists.txt | 16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/konqueror/src/tests/CMakeLists.txt b/konqueror/src/tests/CMakeLists.txt
+index 96923ed..6fade68 100644
--- a/konqueror/src/tests/CMakeLists.txt
+++ b/konqueror/src/tests/CMakeLists.txt
-@@ -9,12 +9,6 @@ kde4_add_executable(centralwidget TEST c
+@@ -9,12 +9,6 @@ kde4_add_executable(centralwidget TEST centralwidget.cpp)
target_link_libraries(centralwidget konq ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTTEST_LIBRARY})
@@ -21,7 +23,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
########### historymanagertest ###############
kde4_add_unit_test(historymanagertest historymanagertest.cpp)
-@@ -25,14 +19,4 @@ target_link_libraries(historymanagertest
+@@ -25,14 +19,4 @@ target_link_libraries(historymanagertest konq konquerorprivate ${KDE4_KDEUI_LIBS
kde4_add_unit_test(undomanagertest undomanagertest.cpp)
target_link_libraries(undomanagertest kdeinit_konqueror ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
diff --git a/debian/patches/series b/debian/patches/series
index fee487e..fa12a8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,3 @@ enable_dlrestrictions.diff
kubuntu_disable-failing-test.diff
kubuntu_ignore-tests.diff
disable_plasma.diff
-upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
-upstream_cmake-use-variable-for-knewstuff3-library.patch
diff --git a/debian/patches/upstream_cmake-use-variable-for-knewstuff3-library.patch b/debian/patches/upstream_cmake-use-variable-for-knewstuff3-library.patch
deleted file mode 100644
index 4decfca..0000000
--- a/debian/patches/upstream_cmake-use-variable-for-knewstuff3-library.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3eab13bc1e7fbe6c61bc156f7d6342298678dbcd Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Sat, 18 Jun 2016 08:55:44 +0200
-Subject: [PATCH] cmake: use variable for knewstuff3 library
-
----
- dolphin/src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dolphin/src/CMakeLists.txt b/dolphin/src/CMakeLists.txt
-index 28768e2..d2ef983 100644
---- a/dolphin/src/CMakeLists.txt
-+++ b/dolphin/src/CMakeLists.txt
-@@ -249,7 +249,7 @@ target_link_libraries(kdeinit_dolphin4
- ${KDE4_KCMUTILS_LIBRARY}
- konq
- dolphinprivate4
-- knewstuff3
-+ ${KDE4_KNEWSTUFF3_LIBS}
- ${KDE4_SOLID_LIBS}
- ${KDE4_PHONON_LIBS}
- )
---
-2.8.1
-
diff --git a/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch b/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
deleted file mode 100644
index aeffaf2..0000000
--- a/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a74f99409d463837094c996c19e5f90fe92dea04 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Sat, 18 Jun 2016 08:48:19 +0200
-Subject: [PATCH] set cmake_min_req to match kdelibs policy and enable newer
- cmake policies
-
----
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b06ba01..2aae22e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,7 @@
- project(KDEBASE_APPS)
-
-+cmake_minimum_required(VERSION 2.8.9)
-+
- # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )
-
---
-2.8.1
-
--
KDE Base Applications module packaging
More information about the pkg-kde-commits
mailing list