[SCM] KDE Base Applications module packaging branch, master, updated. debian/15.12.1-1-16-g566394c
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 21 16:25:12 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-baseapps.git;a=commitdiff;h=1fbb5a9
The following commit has been merged in the master branch:
commit 1fbb5a9ffeeed5607b3ba16ebc48fb6bb18745e9
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date: Wed Apr 13 12:36:56 2016 +0200
Refresh patches
---
debian/patches/enable_debianabimanager.diff | 15 ++++++++-----
debian/patches/enable_dlrestrictions.diff | 20 +++++++++--------
debian/patches/kubuntu_disable-failing-test.diff | 17 ++++++++++----
.../kubuntu_folderview_livecd_directory.diff | 22 ++++++++++--------
debian/patches/kubuntu_folderwidget_drawing.diff | 17 ++++++++++----
debian/patches/kubuntu_ignore-tests.diff | 26 +++++++++++-----------
debian/patches/kubuntu_install_flash.diff | 26 ----------------------
debian/patches/series | 1 -
8 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
index 1953ef7..395949f 100644
--- a/debian/patches/enable_debianabimanager.diff
+++ b/debian/patches/enable_debianabimanager.diff
@@ -1,15 +1,18 @@
From: Modestas Vainius <modax at debian.org>
+Date: Wed, 13 Apr 2016 12:36:54 +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(+)
-Index: kde-baseapps/CMakeLists.txt
-===================================================================
---- kde-baseapps.orig/CMakeLists.txt 2013-09-25 10:54:47.035271854 +0000
-+++ kde-baseapps/CMakeLists.txt 2013-09-25 10:56:01.880338522 +0000
-@@ -63,3 +63,4 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b06ba01..c5618ed 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -57,3 +57,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 f74a9b0..c6ebef7 100644
--- a/debian/patches/enable_dlrestrictions.diff
+++ b/debian/patches/enable_dlrestrictions.diff
@@ -1,17 +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 Apr 2016 12:36:54 +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(+)
-Index: kde-baseapps/CMakeLists.txt
-===================================================================
---- kde-baseapps.orig/CMakeLists.txt 2013-09-25 11:01:28.931521848 +0000
-+++ kde-baseapps/CMakeLists.txt 2013-09-25 11:02:24.045362189 +0000
-@@ -64,3 +64,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c5618ed..970cfb5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,3 +58,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 e50df7c..fda9743 100644
--- a/debian/patches/kubuntu_disable-failing-test.diff
+++ b/debian/patches/kubuntu_disable-failing-test.diff
@@ -1,8 +1,17 @@
-Index: kde-baseapps-14.12.3/lib/konq/tests/CMakeLists.txt
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 12:36:54 +0200
+Subject: kubuntu_disable-failing-test
+
===================================================================
---- kde-baseapps-14.12.3.orig/lib/konq/tests/CMakeLists.txt
-+++ kde-baseapps-14.12.3/lib/konq/tests/CMakeLists.txt
-@@ -14,13 +14,4 @@ kde4_add_unit_test(konqpopupmenutest kon
+---
+ 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 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_folderview_livecd_directory.diff b/debian/patches/kubuntu_folderview_livecd_directory.diff
index 7a9789b..cbee905 100644
--- a/debian/patches/kubuntu_folderview_livecd_directory.diff
+++ b/debian/patches/kubuntu_folderview_livecd_directory.diff
@@ -1,12 +1,16 @@
-Description: Set folderview to point at Desktop folder if running from a live CD.
-Author: Jonathan Riddell <jriddell at ubuntu.com>
-Origin: vendor
-Forwaded: not-needed
-Bug-Ubuntu: https://launchpad.net/bugs/613834
-Index: kde-baseapps-4.10.3/plasma/applets/folderview/folderview.cpp
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 12:36:54 +0200
+Subject: kubuntu_folderview_livecd_directory
+
===================================================================
---- kde-baseapps-4.10.3.orig/plasma/applets/folderview/folderview.cpp 2013-05-13 10:17:46.000000000 +0000
-+++ kde-baseapps-4.10.3/plasma/applets/folderview/folderview.cpp 2013-05-13 10:17:46.000000000 +0000
+---
+ plasma/applets/folderview/folderview.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/plasma/applets/folderview/folderview.cpp b/plasma/applets/folderview/folderview.cpp
+index 23cac19..6da247e 100644
+--- a/plasma/applets/folderview/folderview.cpp
++++ b/plasma/applets/folderview/folderview.cpp
@@ -27,6 +27,7 @@
#include <QGraphicsSceneDragDropEvent>
#include <QImageReader>
@@ -15,7 +19,7 @@ Index: kde-baseapps-4.10.3/plasma/applets/folderview/folderview.cpp
#include <KAction>
#include <KAuthorized>
-@@ -430,6 +431,10 @@
+@@ -431,6 +432,10 @@ void FolderView::init()
path = QString("desktop:/");
}
}
diff --git a/debian/patches/kubuntu_folderwidget_drawing.diff b/debian/patches/kubuntu_folderwidget_drawing.diff
index 2d54eb6..daaa68c 100644
--- a/debian/patches/kubuntu_folderwidget_drawing.diff
+++ b/debian/patches/kubuntu_folderwidget_drawing.diff
@@ -1,8 +1,17 @@
-Index: kde-baseapps-4.10.3/plasma/applets/folderview/iconview.cpp
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 12:36:54 +0200
+Subject: kubuntu_folderwidget_drawing
+
===================================================================
---- kde-baseapps-4.10.3.orig/plasma/applets/folderview/iconview.cpp 2013-05-13 10:18:05.000000000 +0000
-+++ kde-baseapps-4.10.3/plasma/applets/folderview/iconview.cpp 2013-05-13 10:18:05.000000000 +0000
-@@ -2510,22 +2510,16 @@
+---
+ plasma/applets/folderview/iconview.cpp | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/plasma/applets/folderview/iconview.cpp b/plasma/applets/folderview/iconview.cpp
+index 1ff14af..fc3276a 100644
+--- a/plasma/applets/folderview/iconview.cpp
++++ b/plasma/applets/folderview/iconview.cpp
+@@ -2588,22 +2588,16 @@ void IconView::startDrag(const QPointF &pos, QWidget *widget)
pixmap.fill(Qt::transparent);
QStyleOptionViewItemV4 option = viewOptions();
diff --git a/debian/patches/kubuntu_ignore-tests.diff b/debian/patches/kubuntu_ignore-tests.diff
index d0d06ae..ea31d96 100644
--- a/debian/patches/kubuntu_ignore-tests.diff
+++ b/debian/patches/kubuntu_ignore-tests.diff
@@ -1,16 +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 Apr 2016 12:36:54 +0200
+Subject: kubuntu_ignore-tests
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: kde-baseapps-15.08.0/konqueror/src/tests/CMakeLists.txt
-===================================================================
---- kde-baseapps-15.08.0.orig/konqueror/src/tests/CMakeLists.txt
-+++ kde-baseapps-15.08.0/konqueror/src/tests/CMakeLists.txt
-@@ -9,12 +9,6 @@ kde4_add_executable(centralwidget TEST c
+ 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 centralwidget.cpp)
target_link_libraries(centralwidget konq ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTTEST_LIBRARY})
@@ -23,7 +23,7 @@ Index: kde-baseapps-15.08.0/konqueror/src/tests/CMakeLists.txt
########### 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/kubuntu_install_flash.diff b/debian/patches/kubuntu_install_flash.diff
deleted file mode 100644
index 34b61bb..0000000
--- a/debian/patches/kubuntu_install_flash.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Added by Kubuntu for update-notifier-kde to prompt for restricted codec install
-Origin: vendor
-Forwaded: not-needed
-Author: Harald Sitter <apachelogger at ubuntu.com>
-Index: kde-baseapps-4.9.1/konqueror/src/konqmainwindow.cpp
-===================================================================
---- kde-baseapps-4.9.1.orig/konqueror/src/konqmainwindow.cpp 2012-09-04 20:47:44.694999847 +0530
-+++ kde-baseapps-4.9.1/konqueror/src/konqmainwindow.cpp 2012-09-04 20:48:35.887999847 +0530
-@@ -202,6 +202,17 @@
- , m_pURLCompletion(0)
- , m_isPopupWithProxyWindow(false)
- {
-+ //Added by Kubuntu for update-notifier-kde to prompt for restricted codec install
-+ QDBusMessage m = QDBusMessage::createMethodCall(QLatin1String("org.kubuntu.restrictedInstall"),
-+ QLatin1String("/org/kubuntu/restrictedInstall"),
-+ QLatin1String("org.kubuntu.restrictedInstall"),
-+ QLatin1String("installRestricted"));
-+ QList<QVariant> dbusargs;
-+ dbusargs.append(KonqFactory::aboutData()->programName());
-+ dbusargs.append(QLatin1String("flashplugin-installer"));
-+ m.setArguments(dbusargs);
-+ bool queued = QDBusConnection::sessionBus().send(m);
-+
- incInstancesCount();
- setPreloadedFlag( false );
-
diff --git a/debian/patches/series b/debian/patches/series
index ccc035c..64d66b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,5 @@ enable_debianabimanager.diff
enable_dlrestrictions.diff
kubuntu_folderview_livecd_directory.diff
kubuntu_folderwidget_drawing.diff
-# kubuntu_install_flash.diff
kubuntu_disable-failing-test.diff
kubuntu_ignore-tests.diff
--
KDE Base Applications module packaging
More information about the pkg-kde-commits
mailing list