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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit d137fa2085ad38a5c0c0cf86d77f946ac22da9c0
Author: Alessandro Ghersi <alessandro-ghersi at kubuntu.org>
Date:   Fri Oct 22 22:30:43 2010 +0200

    Refresh kubuntu_04_kimpanel_disable_scim.diff, add libxml2-dev to build-deps
---
 debian/changelog                                    |  1 +
 debian/control                                      |  3 ++-
 .../patches/kubuntu_04_kimpanel_disable_scim.diff   | 21 +++++++++++++--------
 debian/patches/series                               |  2 +-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef67eea..fe3d0b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ kdeplasma-addons (4:4.5.2-0ubuntu1) UNRELEASED; urgency=low
     - plasma-dataengines-addons replaces kdeplasma-addons (<< 4:4.4.60) and
       plasma-widget-addons (<< 4:4.4.60)
     - Build against kdelibs5-dev 4.5.2-0ubuntu1 for libkutils4 transition
+    - Add libxml2-dev to build-dependencies
 
   [ Jonathan Riddell ]
   * New upstream release
diff --git a/debian/control b/debian/control
index 8c249e4..d17bcd1 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.4.92),
  kdelibs5-dev (>= 4:4.5.2-0ubuntu1), kdepimlibs5-dev (>= 4:4.5), kdebase-workspace-dev (>= 4:4.5),
  libqt4-opengl-dev, libboost1.42-dev, libkexiv2-dev (>= 4:4.5), python, libmarble-dev (>= 4:4.5),
  libqimageblitz-dev, libeigen2-dev, libxrender-dev, shared-desktop-ontologies, libattica-dev,
- libxtst-dev, libqalculate-dev, libqwt5-qt4-dev, shared-mime-info, libglib2.0-dev, libqca2-dev
+ libxtst-dev, libqalculate-dev, libqwt5-qt4-dev, shared-mime-info, libglib2.0-dev, libqca2-dev,
+ libxml2-dev
 #libscim-dev
 Standards-Version: 3.8.4
 Homepage: http://plasma.kde.org/
diff --git a/debian/patches/kubuntu_04_kimpanel_disable_scim.diff b/debian/patches/kubuntu_04_kimpanel_disable_scim.diff
index 1d5dac7..7359814 100644
--- a/debian/patches/kubuntu_04_kimpanel_disable_scim.diff
+++ b/debian/patches/kubuntu_04_kimpanel_disable_scim.diff
@@ -1,22 +1,27 @@
-Index: kdeplasma-addons-4.5.1/applets/CMakeLists.txt
+Index: kdeplasma-addons-4.5.2/applets/CMakeLists.txt
 ===================================================================
---- kdeplasma-addons-4.5.1.orig/applets/CMakeLists.txt	2010-05-20 13:44:27.000000000 +0200
-+++ kdeplasma-addons-4.5.1/applets/CMakeLists.txt	2010-09-15 04:36:35.000000000 +0200
-@@ -83,11 +83,7 @@
+--- kdeplasma-addons-4.5.2.orig/applets/CMakeLists.txt	2010-10-22 22:06:11.600971000 +0200
++++ kdeplasma-addons-4.5.2/applets/CMakeLists.txt	2010-10-22 22:09:25.512971000 +0200
+@@ -83,11 +83,11 @@
  if (Q_WS_X11)
     if (X11_Xrender_FOUND)
        set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/kimpanel/cmake)
 -      macro_optional_find_package(SCIM)
 -      macro_log_feature(SCIM_FOUND "SCIM headers" "Multibyte input widget" "http://www.scim-im.org" FALSE "1.4" "Needed for the kimpanel multibyte input Plasmoid")
 -      if (SCIM_FOUND)
++#      macro_optional_find_package(SCIM)
++#      macro_log_feature(SCIM_FOUND "SCIM headers" "Multibyte input widget" "http://www.scim-im.org" FALSE "1.4" "Needed for the kimpanel multibyte input Plasmoid")
++#      if (SCIM_FOUND)
           add_subdirectory(kimpanel)
 -      endif ( SCIM_FOUND)
++#      endif ( SCIM_FOUND)
     endif (X11_Xrender_FOUND)
  endif (Q_WS_X11)
  
-Index: kdeplasma-addons-4.5.1/applets/kimpanel/backend/CMakeLists.txt
+Index: kdeplasma-addons-4.5.2/applets/kimpanel/backend/CMakeLists.txt
 ===================================================================
---- kdeplasma-addons-4.5.1.orig/applets/kimpanel/backend/CMakeLists.txt	2009-12-01 01:35:52.000000000 +0100
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1 +0,0 @@
+--- kdeplasma-addons-4.5.2.orig/applets/kimpanel/backend/CMakeLists.txt	2010-10-22 22:10:05.068971002 +0200
++++ kdeplasma-addons-4.5.2/applets/kimpanel/backend/CMakeLists.txt	2010-10-22 22:10:16.380971002 +0200
+@@ -1 +1 @@
 -macro_optional_add_subdirectory(scim)
++#macro_optional_add_subdirectory(scim)
diff --git a/debian/patches/series b/debian/patches/series
index 9ff4697..f02f1d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
+kubuntu_04_kimpanel_disable_scim.diff
 kubuntu_02_microblog_default_configuration.diff
 #kubuntu_03_opendestop_setup.diff
-kubuntu_04_kimpanel_disable_scim.diff

-- 
KDE Plasma Addons module packaging