[SCM] KDE Base Applications module packaging branch, master, updated. debian/16.04.1-1-7-g26111f8

Pino Toscano pino at moszumanska.debian.org
Sat Jun 18 06:47:17 UTC 2016 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-baseapps.git;a=commitdiff;h=d7a92ce

The following commit has been merged in the master branch:
commit d7a92ced52a552d496a1d0d4d9093784c2f1afa0
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 18 08:06:27 2016 +0200

    restore headers for patches
---
 debian/changelog                                     |  1 +
 debian/patches/enable_debianabimanager.diff          |  7 +------
 debian/patches/enable_dlrestrictions.diff            | 12 ++++--------
 debian/patches/kubuntu_disable-failing-test.diff     | 13 +------------
 .../patches/kubuntu_folderview_livecd_directory.diff | 16 +++++-----------
 debian/patches/kubuntu_folderwidget_drawing.diff     | 13 +------------
 debian/patches/kubuntu_ignore-tests.diff             | 20 +++++++++-----------
 7 files changed, 22 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f42067..91c9d99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ kde-baseapps (4:16.04.2-0r1) UNRELEASED; urgency=medium
     following the default libjpeg implementation. (Closes: #813389)
   * Remove unused and outdated installgen file.
   * Remove unused konsole.1 man page.
+  * Restore headers for patches.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 17 Jun 2016 08:56:59 +0200
 
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
index 395949f..fb58f1a 100644
--- a/debian/patches/enable_debianabimanager.diff
+++ b/debian/patches/enable_debianabimanager.diff
@@ -1,15 +1,10 @@
 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(+)
 
-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 )
diff --git a/debian/patches/enable_dlrestrictions.diff b/debian/patches/enable_dlrestrictions.diff
index c6ebef7..1989534 100644
--- a/debian/patches/enable_dlrestrictions.diff
+++ b/debian/patches/enable_dlrestrictions.diff
@@ -1,16 +1,12 @@
 From: Modestas Vainius <modax at debian.org>
-Date: Wed, 13 Apr 2016 12:36:54 +0200
-Subject: Enable DLRestrictions (REJECT:OTHERSOVERSION) support for all
- libraries
+Subject: Enable DLRestrictions (REJECT:OTHERSOVERSION) support for all libraries
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2011-05-25
 
 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 c5618ed..970cfb5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -58,3 +58,10 @@ macro_optional_add_subdirectory( doc )
diff --git a/debian/patches/kubuntu_disable-failing-test.diff b/debian/patches/kubuntu_disable-failing-test.diff
index fda9743..fa68b05 100644
--- a/debian/patches/kubuntu_disable-failing-test.diff
+++ b/debian/patches/kubuntu_disable-failing-test.diff
@@ -1,17 +1,6 @@
-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
-
-===================================================================
----
- 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)
+@@ -14,13 +14,4 @@ kde4_add_unit_test(konqpopupmenutest kon
  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 cbee905..a02c9cd 100644
--- a/debian/patches/kubuntu_folderview_livecd_directory.diff
+++ b/debian/patches/kubuntu_folderview_livecd_directory.diff
@@ -1,14 +1,8 @@
-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
-
-===================================================================
----
- 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
+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
 --- a/plasma/applets/folderview/folderview.cpp
 +++ b/plasma/applets/folderview/folderview.cpp
 @@ -27,6 +27,7 @@
diff --git a/debian/patches/kubuntu_folderwidget_drawing.diff b/debian/patches/kubuntu_folderwidget_drawing.diff
index daaa68c..1419168 100644
--- a/debian/patches/kubuntu_folderwidget_drawing.diff
+++ b/debian/patches/kubuntu_folderwidget_drawing.diff
@@ -1,17 +1,6 @@
-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
-
-===================================================================
----
- 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)
+@@ -2588,22 +2588,16 @@ void IconView::startDrag(const QPointF &
      pixmap.fill(Qt::transparent);
  
      QStyleOptionViewItemV4 option = viewOptions();
diff --git a/debian/patches/kubuntu_ignore-tests.diff b/debian/patches/kubuntu_ignore-tests.diff
index ea31d96..605e197 100644
--- a/debian/patches/kubuntu_ignore-tests.diff
+++ b/debian/patches/kubuntu_ignore-tests.diff
@@ -1,16 +1,14 @@
-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
-
+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
 ---
- 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
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/konqueror/src/tests/CMakeLists.txt
 +++ b/konqueror/src/tests/CMakeLists.txt
-@@ -9,12 +9,6 @@ kde4_add_executable(centralwidget TEST centralwidget.cpp)
+@@ -9,12 +9,6 @@ kde4_add_executable(centralwidget TEST c
  target_link_libraries(centralwidget konq ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
                        ${QT_QTTEST_LIBRARY})
  
@@ -23,7 +21,7 @@ index 96923ed..6fade68 100644
  ########### historymanagertest ###############
  
  kde4_add_unit_test(historymanagertest historymanagertest.cpp)
-@@ -25,14 +19,4 @@ target_link_libraries(historymanagertest konq konquerorprivate ${KDE4_KDEUI_LIBS
+@@ -25,14 +19,4 @@ target_link_libraries(historymanagertest
  kde4_add_unit_test(undomanagertest undomanagertest.cpp)
  target_link_libraries(undomanagertest kdeinit_konqueror ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
  

-- 
KDE Base Applications module packaging

More information about the pkg-kde-commits mailing list