[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:14 UTC 2014


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

The following commit has been merged in the master branch:
commit 09a72618ef06c44be340d8be468f158309120e38
Author: Zhengpeng Hou <freeflying at zphou>
Date:   Wed Jan 20 21:32:29 2010 +0800

    add ibus backend support
---
 debian/changelog                                   | 10 +++++++
 debian/control                                     | 20 ++++++++++++-
 .../plasma-widget-kimpanel-backend-ibus.postinst   | 33 ++++++++++++++++++++++
 debian/plasma-widget-kimpanel-backend-ibus.prerm   | 30 ++++++++++++++++++++
 debian/plasma-widget-kimpanel-backend-scim.install |  1 +
 debian/plasma-widget-kimpanel.install              |  4 +--
 debian/rules                                       |  7 +++++
 debian/xinput/ibus-kde                             | 16 +++++++++++
 8 files changed, 118 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2803630..ce417a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+kdeplasma-addons (4:4.3.90-0ubuntu3) lucid; urgency=low
+
+  * Split plasma-widget-kimpanel into 3 packages, 1 for frontend, 2 
+    for backend.
+  * Add ibus backend support.
+  * Provide conffile for im-switch, to let language-selector set it as default
+    for Kubuntu users.
+
+ -- Zhengpeng Hou <zhengpeng-hou at ubuntu.com>  Wed, 20 Jan 2010 16:57:36 +0800
+
 kdeplasma-addons (4:4.3.90-0ubuntu2) lucid; urgency=low
 
   * Build Kimpanel Plasma widget:
diff --git a/debian/control b/debian/control
index 1dabcbc..b6e2811 100644
--- a/debian/control
+++ b/debian/control
@@ -141,12 +141,30 @@ Description: development headers for liblancelot
 Package: plasma-widget-kimpanel
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, plasma-widget-kimpanel-backend-ibus | plasma-widget-kimpanel-backend-scim
 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 is part of the KDE 4 plasma addons module.
 
+Package: plasma-widget-kimpanel-backend-ibus
+Architecture: all
+Section: kde
+Depends: ${shlibs:Depends}, ibus-qt4
+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 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
+
 Package: plasma-widget-kdeobservatory
 Architecture: any
 Section: kde
diff --git a/debian/plasma-widget-kimpanel-backend-ibus.postinst b/debian/plasma-widget-kimpanel-backend-ibus.postinst
new file mode 100644
index 0000000..9c4c3d6
--- /dev/null
+++ b/debian/plasma-widget-kimpanel-backend-ibus.postinst
@@ -0,0 +1,33 @@
+#!/bin/sh
+set -e
+
+ua_inst () {
+	update-alternatives \
+        --install /etc/X11/xinit/xinput.d/$1 xinput-$1 \
+        /etc/X11/xinit/xinput.d/$2 $3 ;
+}
+
+case "$1" in
+    configure)
+        #ua_inst all_ALL ibus  0
+        ua_inst ja_JP   ibus-kde 60
+        ua_inst ko_KR   ibus-kde 60
+        ua_inst zh_CN   ibus-kde 60
+        ua_inst zh_TW   ibus-kde 60
+        ua_inst zh_HK   ibus-kde 60
+        ua_inst zh_SG   ibus-kde 60
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+
diff --git a/debian/plasma-widget-kimpanel-backend-ibus.prerm b/debian/plasma-widget-kimpanel-backend-ibus.prerm
new file mode 100644
index 0000000..234444f
--- /dev/null
+++ b/debian/plasma-widget-kimpanel-backend-ibus.prerm
@@ -0,0 +1,30 @@
+#!/bin/sh
+set -e
+
+ua_remove () {
+	update-alternatives \
+        --remove xinput-$1 \
+        /etc/X11/xinit/xinput.d/$2 ;
+}
+
+case "$1" in
+    remove|upgrade|deconfigure)
+        ua_remove all_ALL ibus-kde
+        ua_remove ja_JP   ibus-kde
+        ua_remove ko_KR   ibus-kde
+        ua_remove zh_CN   ibus-kde
+        ua_remove zh_TW   ibus-kde
+        ua_remove zh_HK   ibus-kde
+        ua_remove zh_SG   ibus-kde
+	;;
+    failed-upgrade)
+	;;
+    *)
+	echo "prerm called with unknown argument \`$1'" >&2
+	exit 1
+   ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/plasma-widget-kimpanel-backend-scim.install b/debian/plasma-widget-kimpanel-backend-scim.install
new file mode 100644
index 0000000..df4b0bc
--- /dev/null
+++ b/debian/plasma-widget-kimpanel-backend-scim.install
@@ -0,0 +1 @@
+usr/lib/scim-1.0/scim-panel-dbus
diff --git a/debian/plasma-widget-kimpanel.install b/debian/plasma-widget-kimpanel.install
index 7d16dc0..8afd64c 100644
--- a/debian/plasma-widget-kimpanel.install
+++ b/debian/plasma-widget-kimpanel.install
@@ -2,7 +2,7 @@ usr/bin/kimpanel
 usr/lib/kde4/plasma_applet_kimpanel.so
 usr/lib/libkimpanelruntime.so
 usr/lib/libkimpanelruntime.so.0
-usr/lib/scim-1.0/scim-panel-dbus
 usr/share/dbus-1/interfaces/org.kde.impanel.xml
 usr/share/kde4/config.kcfg/kimpanelconfig.kcfg
-usr/share/kde4/services/plasma-applet-kimpanel.desktop
\ No newline at end of file
+usr/share/kde4/services/plasma-applet-kimpanel.desktop
+
diff --git a/debian/rules b/debian/rules
index 77bfd7c..a45617d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,5 +4,12 @@ include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
 DEB_DH_MAKESHLIBS_ARGS_liblancelot0 := -V
 
+install/plasma-widget-kimpanel-backend-ibus::
+	mkdir -p $(CURDIR)/debian/plasma-widget-kimpanel-backend-ibus/usr/lib/ibus/
+	cp $(CURDIR)/applets/kimpanel/backend/ibus/panel.py \
+		$(CURDIR)/debian/plasma-widget-kimpanel-backend-ibus/usr/lib/ibus/ibus-ui-kde
+	mkdir -p $(CURDIR)/debian/plasma-widget-kimpanel-backend-ibus/etc/X11/xinit/xinput.d/
+	cp $(CURDIR)/debian/xinput/ibus-kde \
+		$(CURDIR)/debian/plasma-widget-kimpanel-backend-ibus/etc/X11/xinit/xinput.d/
 clean::
 	find applets/lancelot/tools/puck -name *.pyc -delete
diff --git a/debian/xinput/ibus-kde b/debian/xinput/ibus-kde
new file mode 100644
index 0000000..48637c7
--- /dev/null
+++ b/debian/xinput/ibus-kde
@@ -0,0 +1,16 @@
+XIM=ibus
+XIM_PROGRAM=/usr/bin/ibus-daemon
+XIM_ARGS=" --panel=/usr/lib/ibus/ibus-ui-kde"
+if [ -e /usr/lib/gtk-2.0/*/immodules/im-ibus.so ]; then
+    GTK_IM_MODULE=ibus
+else
+    GTK_IM_MODULE=xim
+fi
+
+if [ -e /usr/lib/qt4/plugins/inputmethods/libqtim-ibus.so ]; then
+	QT_IM_MODULE=ibus
+else
+	QT_IM_MODULE=xim
+fi
+DEPENDS="ibus, ibus-gtk, ibus-qt4, plasam-widget-kimpanel-backend-ibus"
+# vim:ft=sh:

-- 
KDE Plasma Addons module packaging



More information about the pkg-kde-commits mailing list