[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#768526: unblock: scim/1.4.15-3



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package scim

Hello,

I would like to apply the following patches to scim in unstable and have
them migrate to testing/jessie. Please let me know if you will allow a
freeze exception for all or at least some of them.  The scim package in
unstable is currently the same as in testing. Patch 3 is the one I amm
most keen on pushing into jessie.  I have yet to upload after getting
clearance or rejection for a freeze exception for these patches

Regards

Rolf Leggewie

unblock scim/1.4.15-3
>From 7076075e6cdccd43c345269e44a14f2163718f6b Mon Sep 17 00:00:00 2001
From: Tz-Huan Huang <tzhuan@gmail.com>
Date: Sun, 26 Oct 2014 19:20:33 +0800
Subject: [PATCH 1/3] control: multi-archify the scim-im-agent package

---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 6f627fb..a74ab3b 100644
--- a/debian/control
+++ b/debian/control
@@ -154,6 +154,7 @@ Description: Clutter input method module with SCIM as backend
 
 Package: scim-im-agent
 Architecture: any
+Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
 Depends: scim-modules-socket (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: scim-bridge-agent
-- 
1.9.1

>From 28c022257e4e2e3669d6068732b42f8b8969a7f9 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <foss@rolf.leggewie.biz>
Date: Wed, 5 Nov 2014 21:57:42 +0800
Subject: [PATCH 2/3] postinst: stop special-casing a long-gone package version

---
 debian/scim.postinst | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/debian/scim.postinst b/debian/scim.postinst
index 09ee9ce..1b7db15 100644
--- a/debian/scim.postinst
+++ b/debian/scim.postinst
@@ -28,30 +28,6 @@ ua_inst () {
         /etc/X11/xinit/xinput.d/$2 $3 ;
 }
 
-# If u-a is in manual mode as a result of the bug in
-# 1.4.7-3ubuntu1, reset it back to auto.
-# Also forcefully remove the scim-bridge entry from xinput_all-ALL in u-a.
-if dpkg --compare-versions "$2" ge 1.4.7-3ubuntu1 \
-   && dpkg --compare-versions "$2" lt-nl 1.4.7-3ubuntu5
-then
-	for conf in ja_JP ko_KR zh_CN zh_HK zh_SG zh_TW all_ALL
-	do
-		if LC_ALL=C update-alternatives --display xinput-${conf} \
-		   | grep -q 'status is manual' \
-		   && LC_ALL=C update-alternatives --display xinput-${conf} \
-		   | grep -q 'currently points to .*scim-bridge'
-		then
-			update-alternatives --auto xinput-${conf}
-		fi
-	done
-	if LC_ALL=C update-alternatives --display xinput-all_ALL \
-	   | grep -q 'currently points to .*scim-bridge'
-	then 
-		update-alternatives --remove xinput-all_ALL \
-		   /etc/X11/xinit/xinput.d/scim-bridge
-	fi
-fi
-
 case "$1" in
     configure)
         # Set up default
@@ -87,5 +63,3 @@ esac
 #DEBHELPER#
 
 exit 0
-
-
-- 
1.9.1

>From f4dd743aa8f12769676bb63dfa58b7531638c64f Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <foss@rolf.leggewie.biz>
Date: Wed, 5 Nov 2014 22:10:46 +0800
Subject: [PATCH 3/3] prerm: stop calling "ua --remove" on upgrade and deconfigure. See #71621

---
 debian/scim.prerm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/scim.prerm b/debian/scim.prerm
index 75d63e9..06bea3f 100644
--- a/debian/scim.prerm
+++ b/debian/scim.prerm
@@ -8,7 +8,7 @@ ua_remove () {
 }
 
 case "$1" in
-    remove|upgrade|deconfigure)
+    remove)
         ua_remove all_ALL scim
         ua_remove ja_JP   scim
         ua_remove ko_KR   scim
-- 
1.9.1


Reply to: