[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=068047f

The following commit has been merged in the master branch:
commit 068047f2e5c891dca5712010a1bf5198e9395074
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Mon Feb 15 09:56:58 2010 +0000

    Add kubuntu_04_kimpanel_disable_scim.diff and remove scim-dev
    build-dep, scim unmaintained upstream
---
 debian/changelog                                     |  7 +++++++
 debian/control                                       | 20 +++++++++++---------
 debian/patches/kubuntu_04_kimpanel_disable_scim.diff | 18 ++++++++++++++++++
 debian/patches/series                                |  1 +
 debian/xinput/ibus-kde                               |  2 +-
 5 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a087756..472aab3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kdeplasma-addons (4:4.4.0-0ubuntu2) lucid; urgency=low
+
+  * Add kubuntu_04_kimpanel_disable_scim.diff and remove scim-dev
+    build-dep, scim unmaintained upstream
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 15 Feb 2010 09:09:18 +0000
+
 kdeplasma-addons (4:4.4.0-0ubuntu1) lucid; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 2790912..5ff968c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4.
  kdelibs5-dev (>= 4:4.4.0), kdepimlibs5-dev (>= 4:4.4.0), libqt4-opengl-dev (>=4:4.6.1),
  kdebase-workspace-dev (>= 4:4.4.0), libboost1.40-dev, libkexiv2-8-dev (>= 4:4.4.0), python, libmarble-dev (>= 4:4.4.0),
  libqimageblitz-dev, libeigen2-dev, libxrender-dev, libattica-dev, libxtst-dev,
- shared-desktop-ontologies, scim-dev, libqwt5-qt4-dev
+ shared-desktop-ontologies, libqwt5-qt4-dev
 Standards-Version: 3.8.3
 Homepage: http://plasma.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kdeplasma-addons/ubuntu
@@ -156,14 +156,16 @@ Description: addons for KDE 4 Plasma - universal input method widget
  .
  This package contains the ibus backend for kimpanel.
 
-Package: plasma-widget-kimpanel-backend-scim
-Architecture: any
-Section: kde
-Depends: ${shlibs:Depends}
-Description: addons for KDE 4 Plasma - universal input method widget
- Kimpanel is a a Plasma widget for the scim and fcitx input methods.
- .
- This package contains the scim backend for kimpanel
+# Disabled, scim unmaintained upstream and in universe
+#
+#Package: plasma-widget-kimpanel-backend-scim
+#Architecture: any
+#Section: kde
+#Depends: ${shlibs:Depends}
+#Description: addons for KDE 4 Plasma - universal input method widget
+# Kimpanel is a a Plasma widget for the scim and fcitx input methods.
+# .
+# This package contains the scim backend for kimpanel
 
 Package: plasma-widget-kdeobservatory
 Architecture: any
diff --git a/debian/patches/kubuntu_04_kimpanel_disable_scim.diff b/debian/patches/kubuntu_04_kimpanel_disable_scim.diff
new file mode 100644
index 0000000..611ca1b
--- /dev/null
+++ b/debian/patches/kubuntu_04_kimpanel_disable_scim.diff
@@ -0,0 +1,18 @@
+--- kdeplasma-addons-4.4.0/applets/CMakeLists.txt	2009-12-17 16:38:19.000000000 +0000
++++ kdeplasma-addons-4.4.0/applets/CMakeLists.txt	2010-02-15 09:08:30.000000000 +0000
+@@ -81,11 +81,7 @@
+ 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)
+          add_subdirectory(kimpanel)
+-      endif ( SCIM_FOUND)
+    endif (X11_Xrender_FOUND)
+ endif (Q_WS_X11)
+ 
+--- kdeplasma-addons-4.4.0/applets/kimpanel/backend/CMakeLists.txt	2009-12-01 00:35:52.000000000 +0000
++++ kdeplasma-addons-4.4.0/applets/kimpanel/backend/CMakeLists.txt	2010-02-15 09:14:01.000000000 +0000
+@@ -1 +0,0 @@
+-macro_optional_add_subdirectory(scim)
diff --git a/debian/patches/series b/debian/patches/series
index 28f7671..bcc3ce0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 #kubuntu_02_microblog_default_configuration.diff
 #kubuntu_03_opendestop_setup.diff
+kubuntu_04_kimpanel_disable_scim.diff
diff --git a/debian/xinput/ibus-kde b/debian/xinput/ibus-kde
index fe64104..48637c7 100644
--- a/debian/xinput/ibus-kde
+++ b/debian/xinput/ibus-kde
@@ -12,5 +12,5 @@ if [ -e /usr/lib/qt4/plugins/inputmethods/libqtim-ibus.so ]; then
 else
 	QT_IM_MODULE=xim
 fi
-DEPENDS="ibus, ibus-gtk, ibus-qt4, plasma-widget-kimpanel-backend-ibus"
+DEPENDS="ibus, ibus-gtk, ibus-qt4, plasam-widget-kimpanel-backend-ibus"
 # vim:ft=sh:

-- 
KDE Plasma Addons module packaging