[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

Maximiliano Curia maxy at moszumanska.debian.org
Fri Aug 1 09:05:48 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=8d234a8

The following commit has been merged in the master branch:
commit 8d234a819e4947edf708553c1a914721b1a967f8
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Wed Jun 11 18:30:15 2014 +0200

    * Merge with debian, remaining changes:
      - Build dep on libboost1.55-dev
      - Add build dep on libqwt5-qt4-dev to build plasma-widget-kdeobservatory
      - Keep kubuntu_01_news_applet_name.diff
      - Remove useless debian/patches/marble-4.7-compat.diff patch
---
 debian/changelog                      |  89 +++++++++++++++
 debian/compat                         |   2 +-
 debian/control                        | 120 ++++++++++++--------
 debian/not-installed                  |   7 --
 debian/patches/eigen3.patch           | 208 ++++++++++++++++++++++++++++++++++
 debian/patches/marble-4.7-compat.diff |  33 ------
 debian/patches/series                 |   2 +-
 debian/plasma-widget-kimpanel.install |   1 +
 debian/plasma-widgets-addons.install  |  20 +---
 debian/source/local-options           |   1 +
 debian/tests/control                  |   4 +
 debian/tests/testsuite                |   4 +
 debian/tests/testsuite.xsession       |   8 ++
 13 files changed, 390 insertions(+), 109 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2d5dbe5..3531c65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+kdeplasma-addons (4:4.13.1-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge with debian, remaining changes:
+    - Build dep on libboost1.55-dev
+    - Add build dep on libqwt5-qt4-dev to build plasma-widget-kdeobservatory
+    - Keep kubuntu_01_news_applet_name.diff
+    - Remove useless debian/patches/marble-4.7-compat.diff patch
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 11 Jun 2014 18:28:46 +0200
+
+kdeplasma-addons (4:4.13.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update build dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org>  Thu, 05 Jun 2014 12:26:25 +0200
+
 kdeplasma-addons (4:4.13.0-0ubuntu1) trusty; urgency=medium
 
   * New upstream KDE Software Compilation release
@@ -41,12 +58,32 @@ kdeplasma-addons (4:4.12.90-0ubuntu1) trusty; urgency=medium
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 10:51:03 +0000
 
+kdeplasma-addons (4:4.12.4-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 28 Apr 2014 12:24:40 +0200
+
+kdeplasma-addons (4:4.12.3-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Update marble build-dependency version.
+
+ -- Maximiliano Curia <maxy at debian.org>  Tue, 04 Mar 2014 00:06:45 +0100
+
 kdeplasma-addons (4:4.12.3-0ubuntu1) trusty; urgency=medium
 
   * New upstream bugfix release
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 04 Mar 2014 20:43:05 +0100
 
+kdeplasma-addons (4:4.12.2-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Bump kde-sc-dev-latest build dependency.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 10 Feb 2014 11:32:04 +0100
+
 kdeplasma-addons (4:4.12.2-0ubuntu2) trusty; urgency=medium
 
   * No libeigen2-dev on ppc64el
@@ -89,6 +126,30 @@ kdeplasma-addons (4:4.11.80-0ubuntu1) trusty; urgency=low
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Sat, 23 Nov 2013 17:37:22 +0100
 
+kdeplasma-addons (4:4.11.5-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Add autopkgtests.
+  * Bump Standards-Version to 3.9.5, no changes needed.
+
+ -- Maximiliano Curia <maxy at debian.org>  Tue, 04 Feb 2014 17:12:57 +0100
+
+kdeplasma-addons (4:4.11.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update build dependencies.
+  * Switch to libeigen3-dev, thanks to Anton Gladky. (Closes: #728725)
+
+ -- Maximiliano Curia <maxy at debian.org>  Sun, 10 Nov 2013 11:08:20 +0100
+
+kdeplasma-addons (4:4.11.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Update install files.
+  * Update build-dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org>  Wed, 09 Oct 2013 14:42:24 +0200
+
 kdeplasma-addons (4:4.11.2-0ubuntu2) trusty; urgency=low
 
   * Bump to boost 1.54.
@@ -176,6 +237,34 @@ kdeplasma-addons (4:4.10.80-0ubuntu1) saucy; urgency=low
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 21 Jun 2013 01:12:49 +0100
 
+kdeplasma-addons (4:4.10.5-2) unstable; urgency=low
+
+  [ Pino Toscano ]
+  * Drop patch marble-4.7-compat.diff, obsolete now.
+  * Fix the conflicting version of kamoso in plasma-runners-addons, since
+    2.0.2-2 does not provide common files anymore.
+  * Slightly touches to the descriptions of plasma-runners-addons and
+    plasma-widgets-addons.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 19 Jul 2013 21:10:31 +0200
+
+kdeplasma-addons (4:4.10.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Jul 2013 17:52:08 +0200
+
+kdeplasma-addons (4:4.10.4-1) experimental; urgency=low
+
+  * New upstream release.
+  * Bump debhelper build-dep and compat to 9.
+  * Bump Standards-Version to 3.9.4.
+  * Update vcs fields.
+  * Add myself to uploaders.
+  * Update plasma-widgets-addons install file.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 14 Jun 2013 22:20:11 +0200
+
 kdeplasma-addons (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
 
   [ Rohan Garg ]
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index dccaddf..c5c9c2e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,38 +1,56 @@
 Source: kdeplasma-addons
 Section: utils
 Priority: optional
-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <sune at debian.org>,
- Fathi Boudra <fabo at debian.org>,
- Modestas Vainius <modax at debian.org>,
- George Kiagiadakis <kiagiadakis.george at gmail.com>,
- Eshat Cakar <info at eshat.de>
-Build-Depends:
-# kde-sc-dev-latest (>= 4:4.10.2),
- cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
- kdepimlibs5-dev (>= 4:4.13.0), kde-workspace-dev (>= 4:4.11),
- nepomuk-core-dev (>= 4:4.13.0),
- libkexiv2-dev (>= 4:4.13.0), libmarble-dev (>= 4:4.13.0),
- libqt4-opengl-dev, libboost1.54-dev, libqimageblitz-dev, libeigen2-dev, libxrender-dev,
- shared-desktop-ontologies, libattica-dev, libxtst-dev, libqalculate-dev,
- libqca2-dev, libqtwebkit-dev, libdbusmenu-qt-dev, libibus-1.0-dev (>= 1.4.2),
- libqwt5-qt4-dev, libglib2.0-dev, shared-mime-info, libqjson-dev, libqoauth-dev,
-Standards-Version: 3.9.3
+           Fathi Boudra <fabo at debian.org>,
+           Modestas Vainius <modax at debian.org>,
+           George Kiagiadakis <kiagiadakis.george at gmail.com>,
+           Eshat Cakar <info at eshat.de>,
+           Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake,
+               debhelper (>= 9),
+               kde-sc-dev-latest (>= 4:4.12),
+               kde-workspace-dev (>= 4:4.11),
+               kdepimlibs5-dev (>= 4:4.11),
+               libattica-dev (>= 0.1.1),
+               libboost1.55-dev,
+               libdbusmenu-qt-dev,
+               libeigen3-dev,
+               libibus-1.0-dev (>= 1.4.2),
+               libkexiv2-dev (>= 4:4.11),
+               libmarble-dev (>= 4:4.13),
+               libqalculate-dev,
+               libqca2-dev (>= 2.0.0),
+               libqimageblitz-dev,
+               libqjson-dev,
+               libqoauth-dev,
+               libqt4-opengl-dev,
+               libqtwebkit-dev,
+               libqwt5-qt4-dev,
+               libscim-dev,
+               libxrender-dev,
+               libxtst-dev,
+               nepomuk-core-dev (>= 4:4.11),
+               pkg-kde-tools (>= 0.12),
+               shared-desktop-ontologies
+Standards-Version: 3.9.5
+XS-Testsuite: autopkgtest
 Homepage: http://plasma.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kdeplasma-addons
 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kdeplasma-addons
-X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git
-X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdeplasma-addons.git
+X-Vcs-Debian-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kdeplasma-addons.git
+X-Vcs-Debian-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kdeplasma-addons.git
 
 Package: kdeplasma-addons
 Architecture: all
 Section: kde
-Depends: ${misc:Depends}, plasma-widgets-addons (>= ${source:Version}),
- plasma-runners-addons (>= ${source:Version}),
- plasma-widget-lancelot (>= ${source:Version}),
- plasma-wallpapers-addons (>= ${source:Version}),
- plasma-containments-addons (>= ${source:Version})
+Depends: plasma-containments-addons (>= ${source:Version}),
+         plasma-runners-addons (>= ${source:Version}),
+         plasma-wallpapers-addons (>= ${source:Version}),
+         plasma-widget-lancelot (>= ${source:Version}),
+         plasma-widgets-addons (>= ${source:Version}),
+         ${misc:Depends}
 Description: addons for Plasma
  The KDE Plasma addons module is a collection of additional Plasma
  data engines, widgets and krunner plugins. It is part of
@@ -44,15 +62,12 @@ Description: addons for Plasma
 Package: plasma-widgets-addons
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, ${misc:Depends}, plasma-dataengines-workspace,
- plasma-dataengines-addons (= ${binary:Version}),
-Breaks: plasma-runners-addons (<< 4:4.10.80),
- plasma-widget-kimpanel (<< 4:4.10.80),
- plasma-wallpapers-addons (<< 4:4.10.80)
-Replaces: plasma-runners-addons (<< 4:4.10.80),
- plasma-widget-kimpanel (<< 4:4.10.80),
- plasma-wallpapers-addons (<< 4:4.10.80)
-Suggests: plasma-widget-kimpanel, plasma-widget-lancelot
+Depends: plasma-dataengines-addons (= ${binary:Version}),
+         plasma-dataengines-workspace,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: plasma-widget-lancelot
+Suggests: plasma-widget-kimpanel
 Description: additional widgets for Plasma
  This package contains additional Plasma widgets shipped in the Plasma
  addons module. Install it if you want a variety of widgets on your Plasma
@@ -77,7 +92,7 @@ Description: additional widgets for Plasma
   * Incoming Message
   * Knowledge Base
   * Konqueror Profiles
-  * Konsole Profile
+  * Konsole Profiles
   * LCD Weather Station
   * Leave a Note
   * Life
@@ -112,7 +127,7 @@ Description: additional widgets for Plasma
 Package: plasma-containments-addons
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: additional containment plugins for Plasma
  This package contains additional Plasma containment plugins. These plugins
  allow the user to layout Plasma widgets in groups.
@@ -126,9 +141,7 @@ Description: additional containment plugins for Plasma
 Package: plasma-dataengines-addons
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: plasma-widget-kdeobservatory (<< 4:4.10.80)
-Replaces: plasma-widget-kdeobservatory (<< 4:4.10.80)
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: additional data engines for Plasma
  This package contains additional Plasma data engines shipped in Plasma
  addons module. These engines are needed by some Plasma widget shipped with
@@ -139,7 +152,9 @@ Description: additional data engines for Plasma
 Package: plasma-runners-addons
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: kamoso (<< 2.0.2-2)
+Replaces: kamoso (<< 2.0.2-2)
 Description: additional runners for Plasma and Krunner
  This package contains additional Plasma runners that are used in krunner
  (the "run command" dialog of Plasma) to reveal special search results.
@@ -153,6 +168,7 @@ Description: additional runners for Plasma and Krunner
   * Kate Sessions
   * KDE TechBase
   * KDE Userbase Documentation
+  * Kate Sessions
   * Konqueror Sessions
   * Konsole Sessions
   * Kopete Contacts
@@ -162,16 +178,17 @@ Description: additional runners for Plasma and Krunner
   * Web Browser History
   * Wikipedia
   * Wikitravel
+  * YouTube
  .
  This package is part of the KDE Plasma addons module.
 
 Package: plasma-wallpapers-addons
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, ${misc:Depends}, plasma-dataengines-workspace, plasma-dataengines-addons (= ${binary:Version}), kde-wallpapers
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: plasma-dataengines-addons (<= 4:4.3.0-1)
 Description: additional wallpaper plugins for Plasma
- This package contains additional Plasma wallpaper plugins that are used in 
+ This package contains additional Plasma wallpaper plugins that are used in
  the Plasma desktop to give marble, mandelbrot and other such wallpapers.
  .
  This package contains the following wallpaper plugins:
@@ -187,7 +204,7 @@ Description: additional wallpaper plugins for Plasma
 Package: plasma-widget-lancelot
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: plasma-applet-lancelot
 Conflicts: plasma-applet-lancelot
 Description: lancelot widget for Plasma
@@ -200,9 +217,9 @@ Description: lancelot widget for Plasma
 Package: plasma-widget-kimpanel
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: plasma-widgets-addons (<< 4:4.8.3), plasma-dataengines-addons (<< 4:4.10.97)
-Breaks: plasma-widgets-addons (<< 4:4.8.3), plasma-dataengines-addons (<< 4:4.10.97)
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: plasma-widgets-addons (<< 4:4.8.3)
+Breaks: plasma-widgets-addons (<< 4:4.8.3)
 Description: KIMPanel widget for Plasma
  This package provides the KDE Input Method Panel widget for Plasma.
  .
@@ -211,7 +228,7 @@ Description: KIMPanel widget for Plasma
 Package: plasma-widget-kdeobservatory
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: plasma-dataengines-addons (<< 4:4.8.0)
 Breaks: plasma-dataengines-addons (<< 4:4.8.0)
 Description: KDE development tracking widget for Plasma
@@ -225,9 +242,14 @@ Package: kdeplasma-addons-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${misc:Depends}, plasma-widgets-addons (= ${binary:Version}), plasma-dataengines-addons (= ${binary:Version}),
- plasma-runners-addons (= ${binary:Version}), plasma-widget-lancelot (= ${binary:Version}),
- plasma-wallpapers-addons (= ${binary:Version}), plasma-widget-kimpanel (= ${binary:Version}), kde-workspace-dbg
+Depends: kde-workspace-dbg,
+         plasma-dataengines-addons (= ${binary:Version}),
+         plasma-runners-addons (= ${binary:Version}),
+         plasma-wallpapers-addons (= ${binary:Version}),
+         plasma-widget-kimpanel (= ${binary:Version}),
+         plasma-widget-lancelot (= ${binary:Version}),
+         plasma-widgets-addons (= ${binary:Version}),
+         ${misc:Depends}
 Description: debugging symbols for kdeplasma-addons
  This package contains the debugging symbols associated with kdeplasma-addons.
  They will automatically be used by gdb for debugging kdeplasma-addons related
diff --git a/debian/not-installed b/debian/not-installed
index 92bf620..f176af3 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -105,10 +105,3 @@
 ./usr/lib/liblancelot.so
 ./usr/share/kde4/apps/cmake/modules/FindLancelot-Datamodels.cmake
 ./usr/share/kde4/apps/cmake/modules/FindLancelot.cmake
-
-./usr/share/icons/hicolor/16x16/actions/youtube.png
-./usr/share/icons/hicolor/22x22/actions/youtube.png
-./usr/share/icons/hicolor/32x32/actions/youtube.png
-./usr/share/icons/hicolor/48x48/actions/youtube.png
-./usr/share/icons/hicolor/64x64/actions/youtube.png
-./usr/share/icons/hicolor/scalable/actions/youtube.svgz
diff --git a/debian/patches/eigen3.patch b/debian/patches/eigen3.patch
new file mode 100644
index 0000000..758b721
--- /dev/null
+++ b/debian/patches/eigen3.patch
@@ -0,0 +1,208 @@
+Description: eigen2 to eigen3 migration
+Author: Anton Gladky <gladk at debian.org>
+        Benoit Jacob <jacob.benoit.1 at gmail.com>
+Bug-Debian: http://bugs.debian.org/728725
+Last-Update: 2013-11-04
+
+--- /dev/null
++++ b/cmake/FindEigen3.cmake
+@@ -0,0 +1,81 @@
++# - Try to find Eigen3 lib
++#
++# This module supports requiring a minimum version, e.g. you can do
++#   find_package(Eigen3 3.1.2)
++# to require version 3.1.2 or newer of Eigen3.
++#
++# Once done this will define
++#
++#  EIGEN3_FOUND - system has eigen lib with correct version
++#  EIGEN3_INCLUDE_DIR - the eigen include directory
++#  EIGEN3_VERSION - eigen version
++
++# Copyright (c) 2006, 2007 Montel Laurent, <montel at kde.org>
++# Copyright (c) 2008, 2009 Gael Guennebaud, <g.gael at free.fr>
++# Copyright (c) 2009 Benoit Jacob <jacob.benoit.1 at gmail.com>
++# Redistribution and use is allowed according to the terms of the 2-clause BSD license.
++
++if(NOT Eigen3_FIND_VERSION)
++  if(NOT Eigen3_FIND_VERSION_MAJOR)
++    set(Eigen3_FIND_VERSION_MAJOR 2)
++  endif(NOT Eigen3_FIND_VERSION_MAJOR)
++  if(NOT Eigen3_FIND_VERSION_MINOR)
++    set(Eigen3_FIND_VERSION_MINOR 91)
++  endif(NOT Eigen3_FIND_VERSION_MINOR)
++  if(NOT Eigen3_FIND_VERSION_PATCH)
++    set(Eigen3_FIND_VERSION_PATCH 0)
++  endif(NOT Eigen3_FIND_VERSION_PATCH)
++
++  set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}")
++endif(NOT Eigen3_FIND_VERSION)
++
++macro(_eigen3_check_version)
++  file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
++
++  string(REGEX MATCH "define[ 	]+EIGEN_WORLD_VERSION[ 	]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}")
++  set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}")
++  string(REGEX MATCH "define[ 	]+EIGEN_MAJOR_VERSION[ 	]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}")
++  set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}")
++  string(REGEX MATCH "define[ 	]+EIGEN_MINOR_VERSION[ 	]+([0-9]+)" _eigen3_minor_version_match "${_eigen3_version_header}")
++  set(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}")
++
++  set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION})
++  if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
++    set(EIGEN3_VERSION_OK FALSE)
++  else(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
++    set(EIGEN3_VERSION_OK TRUE)
++  endif(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
++
++  if(NOT EIGEN3_VERSION_OK)
++
++    message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, "
++                   "but at least version ${Eigen3_FIND_VERSION} is required")
++  endif(NOT EIGEN3_VERSION_OK)
++endmacro(_eigen3_check_version)
++
++if (EIGEN3_INCLUDE_DIR)
++
++  # in cache already
++  _eigen3_check_version()
++  set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
++
++else (EIGEN3_INCLUDE_DIR)
++
++  find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
++      PATHS
++      ${CMAKE_INSTALL_PREFIX}/include
++      ${KDE4_INCLUDE_DIR}
++      PATH_SUFFIXES eigen3 eigen
++    )
++
++  if(EIGEN3_INCLUDE_DIR)
++    _eigen3_check_version()
++  endif(EIGEN3_INCLUDE_DIR)
++
++  include(FindPackageHandleStandardArgs)
++  find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK)
++
++  mark_as_advanced(EIGEN3_INCLUDE_DIR)
++
++endif(EIGEN3_INCLUDE_DIR)
++
+--- a/wallpapers/mandelbrot/CMakeLists.txt
++++ b/wallpapers/mandelbrot/CMakeLists.txt
+@@ -1,12 +1,13 @@
+-find_package(Eigen2 2.0.3)
+-macro_log_feature(EIGEN2_FOUND "Eigen2" "Eigen2 enables the Mandelbrot wallpaper plugin." "http://eigen.tuxfamily.org" FALSE "2.0.3")
++find_package(Eigen3 2.0.3)
++macro_log_feature(EIGEN3_FOUND "Eigen3" "Eigen3 enables the Mandelbrot wallpaper plugin." "http://eigen.tuxfamily.org" FALSE "2.0.3")
+ 
+-if(EIGEN2_FOUND)
++if(EIGEN3_FOUND)
+ 
++add_definitions(-DEIGEN2_SUPPORT)
+ 
+ project(plasma-wallpaper-mandelbrot)
+ 
+-include_directories(${EIGEN2_INCLUDE_DIR})
++include_directories(${EIGEN3_INCLUDE_DIR})
+ 
+ set(mandelbrot_SRCS
+     mandelbrot.cpp
+@@ -87,4 +88,4 @@
+ install(TARGETS plasma_wallpaper_mandelbrot DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES plasma-wallpaper-mandelbrot.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+ 
+-endif(EIGEN2_FOUND)
++endif(EIGEN3_FOUND)
+--- a/wallpapers/mandelbrot/render_impl.cpp
++++ b/wallpapers/mandelbrot/render_impl.cpp
+@@ -43,17 +43,12 @@
+   // Examples:
+   //  * no vectorization: then packet_size == 1 always
+   //  * SSE or AltiVec: then packet_size is 4 if Real==float and is 2 if Real==double
+-  enum { packet_size = Eigen::ei_packet_traits<Real>::size };
++  enum { packet_size = Eigen::internal::packet_traits<Real>::size };
+ 
+   // with Eigen, if we use vectors of the right size, operations on them will be compiled
+   // as operations on SIMD packets
+-  typedef Eigen::Matrix<Real, packet_size, 1> Packet;
+-  typedef Eigen::Matrix<int, packet_size, 1> Packeti;
+-
+-  // normally we wouldn't need to do that, but since some compilers can miss optimizations,
+-  // in the most critical code, let's play directly with SIMD registers. It's completely equivalent
+-  // to Eigen vectors of the right size, just less subtle for the compiler to get right.
+-  typedef typename Eigen::ei_packet_traits<Real>::type LowlevelPacket;
++  typedef Eigen::Array<Real, packet_size, 1> Packet;
++  typedef Eigen::Array<int, packet_size, 1> Packeti;
+ 
+   // how many iterations we do before testing for divergence. See comment above for struct iter_before_test.
+   // must be a multiple of 4 as we'll peel the inner loop by 4
+@@ -154,35 +149,17 @@
+     /* perform iter_before_test iterations */
+     for(int i = 0; i < iter_before_test/4; i++) // we peel the inner loop by 4
+     {
+-      LowlevelPacket lpzr, lpzi;
+       for(int repeat = 0; repeat < 4; repeat++)
+       {
+-        lpzr = Eigen::ei_pload(pzr.data());
+-        lpzi = Eigen::ei_pload(pzi.data());
+-        Eigen::ei_pstore(pzr.data(),
+-                          Eigen::ei_padd(
+-                            Eigen::ei_psub(
+-                              Eigen::ei_pmul(lpzr,lpzr),
+-                              Eigen::ei_pmul(lpzi,lpzi)
+-                            ),
+-                            Eigen::ei_pload(pcr.data())
+-                          )
+-                        );
+-        Eigen::ei_pstore(pzi.data(),
+-                          Eigen::ei_padd(
+-                            Eigen::ei_pmul(
+-                              Eigen::ei_padd(lpzr,lpzr),
+-                              lpzi
+-                            ),
+-                            Eigen::ei_pload(pci.data())
+-                          )
+-                        );
++        Packet pzrt = pzr*pzr - pzi*pzi + pcr;
++        pzi = 2*pzr*pzi + pci;
++        pzr = pzrt;
+       }
+     }
+ 
+     /* test for divergence */
+-    pzabs2 = pzr.cwise().square();
+-    pzabs2 += pzi.cwise().square();
++    pzabs2 = pzr.array()*pzr.array();
++    pzabs2 += pzi.array()*pzi.array();
+     for(int i = 0; i < packet_size; i++) {
+       if(!(pixel_diverge[i])) {
+         if(pzabs2[i] > square_bailout_radius) {
+@@ -213,13 +190,13 @@
+   do
+   {
+     pzr_buf = pzr;
+-    pzr = pzr.cwise().square();
+-    pzr -= pzi.cwise().square();
++    pzr = pzr.array()*pzr.array();
++    pzr -= pzi.array()*pzi.array();
+     pzr += pcr;
+-    pzi = (2*pzr_buf).cwise()*pzi;
++    pzi = (2*pzr_buf).array()*pzi;
+     pzi += pci;
+-    pzabs2 = pzr.cwise().square();
+-    pzabs2 += pzi.cwise().square();
++    pzabs2 = pzr.array()*pzr.array();
++    pzabs2 += pzi.array()*pzi.array();
+     for(int i = 0; i < packet_size; i++) {
+       if(!(pixel_diverge[i])) {
+         if(pzabs2[i] > square_bailout_radius) {
+@@ -298,7 +275,7 @@
+ 
+ #if defined(HAVE_PATH_WITH_SSE2_EXPLICTLY_ENABLED) || !defined(THIS_PATH_WITH_SSE2_EXPLICTLY_ENABLED)
+ 
+-  enum { packet_size = Eigen::ei_packet_traits<Real>::size };
++  enum { packet_size = Eigen::internal::packet_traits<Real>::size };
+   Color3 dummy_buffer[packet_size];
+   
+   mandelbrot_render_tile_impl<Real> renderer(mandelbrot, tile);
diff --git a/debian/patches/marble-4.7-compat.diff b/debian/patches/marble-4.7-compat.diff
deleted file mode 100644
index c6cf5c9..0000000
--- a/debian/patches/marble-4.7-compat.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: compatibility with Marble < 0.13
-Forwarded: not-needed
-Last-Update: 2012-02-15
-
-Index: kdeplasma-addons-4.11.2/wallpapers/marble/marble.cpp
-===================================================================
---- kdeplasma-addons-4.11.2.orig/wallpapers/marble/marble.cpp	2013-09-27 17:22:49.544875897 +0100
-+++ kdeplasma-addons-4.11.2/wallpapers/marble/marble.cpp	2013-09-27 17:22:49.536875897 +0100
-@@ -80,8 +80,13 @@
- 
-         // These settings apply to Marble's "satellite" view mostly, e.g. make it beautiful
-         m_map->setShowClouds(true);
-+#if MARBLE_VERSION >= 0x000d00
-         m_map->setShowCityLights(false);
-         m_map->setShowSunShading(true);
-+#else
-+        m_map->model()->sunLocator()->setCitylights(false);
-+        m_map->model()->sunLocator()->setShow(true);
-+#endif
- 
-         // Disable all render plugins (scale bar, compass, etc.) except the "stars" plugin
-         foreach (RenderPlugin *item, m_map->renderPlugins()) {
-@@ -137,6 +142,9 @@
-     m_ui.showPlacemarks->setChecked(m_showPlacemarks);
- 
-     MapThemeManager themeManager;
-+#if MARBLE_VERSION < 0x000d00
-+    themeManager.updateMapThemeModel();
-+#endif
-     // FIXME: Going manually through the model is ugly as hell, but plugging the
-     //        model into the view didn't work for me
-     for (int i = 0; i < themeManager.mapThemeModel()->rowCount(); i++) {
diff --git a/debian/patches/series b/debian/patches/series
index 203c746..d094c55 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
+eigen3.patch
 kubuntu_01_news_applet_name.diff
-marble-4.7-compat.diff
diff --git a/debian/plasma-widget-kimpanel.install b/debian/plasma-widget-kimpanel.install
index 5f2cf9d..0cae990 100644
--- a/debian/plasma-widget-kimpanel.install
+++ b/debian/plasma-widget-kimpanel.install
@@ -1,4 +1,5 @@
 usr/lib/kde4/libexec/kimpanel-ibus-panel
+usr/lib/kde4/libexec/kimpanel-scim-panel
 usr/lib/kde4/plasma_applet_kimpanel.so
 usr/lib/kde4/plasma_engine_kimpanel.so
 usr/share/kde4/apps/plasma/services/kimpanel.operations
diff --git a/debian/plasma-widgets-addons.install b/debian/plasma-widgets-addons.install
index 30155d9..b92730d 100644
--- a/debian/plasma-widgets-addons.install
+++ b/debian/plasma-widgets-addons.install
@@ -71,8 +71,8 @@ usr/share/icons/hicolor/48x48/apps/luna.png
 usr/share/icons/hicolor/48x48/apps/previewer.png
 usr/share/icons/hicolor/48x48/apps/qalculate-applet.png
 usr/share/icons/hicolor/64x64/apps/bball.png
-usr/share/icons/hicolor/64x64/apps/lifegame.png
 usr/share/icons/hicolor/64x64/apps/eyes.png
+usr/share/icons/hicolor/64x64/apps/lifegame.png
 usr/share/icons/hicolor/64x64/apps/luna.png
 usr/share/icons/hicolor/64x64/apps/previewer.png
 usr/share/icons/hicolor/scalable/apps/accessories-dictionary.svgz
@@ -138,23 +138,7 @@ usr/share/kde4/apps/plasma/plasmoids/konqprofiles/contents/ui/konqprofiles.qml
 usr/share/kde4/apps/plasma/plasmoids/konqprofiles/metadata.desktop
 usr/share/kde4/apps/plasma/plasmoids/konsoleprofiles/contents/ui/konsoleprofiles.qml
 usr/share/kde4/apps/plasma/plasmoids/konsoleprofiles/metadata.desktop
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/code/service.js
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/config/main.xml
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/theme/nowplaying/nocover.svgz
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/AlbumArt.qml
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/CompactLayout.qml
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/Controls.qml
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/FullLayout.qml
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/Label.qml
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/MetadataLine.qml
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/MetadataPanel.qml
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/Mpris2.qml
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/PlayPauseButton.qml
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/PositionSlider.qml
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/VLayout.qml
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/config.ui
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/contents/ui/nowplaying.qml
-usr/share/kde4/apps/plasma/plasmoids/nowplaying/metadata.desktop
+usr/share/kde4/apps/plasma/plasmoids/nowplaying/
 usr/share/kde4/apps/plasma/wallpapers/org.kde.animals/contents/ui/Animal.qml
 usr/share/kde4/apps/plasma/wallpapers/org.kde.animals/contents/ui/animals.qml
 usr/share/kde4/apps/plasma/wallpapers/org.kde.animals/metadata.desktop
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..2ee6f0f
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+abort-on-upstream-changes
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..34cd609
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,4 @@
+Tests: testsuite
+Depends: @, @builddeps@, build-essential,
+         xvfb, xauth, dbus-x11
+Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
new file mode 100755
index 0000000..fa0feb1
--- /dev/null
+++ b/debian/tests/testsuite
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+xvfb-run -a --server-args="-screen 0 1024x768x24" \
+    dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
new file mode 100755
index 0000000..7e49196
--- /dev/null
+++ b/debian/tests/testsuite.xsession
@@ -0,0 +1,8 @@
+#!/bin/sh
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+kdeinit4
+dh_auto_test
+ret=$?
+kdeinit4_shutdown
+exit $ret

-- 
KDE Plasma Addons module packaging



More information about the pkg-kde-commits mailing list