tags 419313 + patch pending
thanks
Hi,
Attached is the diff for my scim-bridge 0.4.10-1.1 NMU.
Bye,
--
Loïc Minier
diff -u scim-bridge-0.4.10/debian/control scim-bridge-0.4.10/debian/control
--- scim-bridge-0.4.10/debian/control
+++ scim-bridge-0.4.10/debian/control
@@ -2,7 +2,7 @@
Section: utils
Priority: optional
Maintainer: ZhengPeng Hou <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, libgtk2.0-dev(>= 2.4.0), scim-dev, dpatch, libqt3-mt-dev (>= 3.3.6), doxygen
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, libgtk2.0-dev (>= 2.10.1-1), scim-dev, dpatch, libqt3-mt-dev (>= 3.3.6), doxygen
Standards-Version: 3.7.2
Package: scim-bridge-agent
@@ -23,7 +23,7 @@
Package: scim-bridge-client-gtk
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-bin, scim-bridge-agent
+Depends: ${shlibs:Depends}, ${misc:Depends}, scim-bridge-agent
Replaces: scim-bridge (= 0.2.4)
Description: IME server of scim-bridge communicate with SCIM
scim-bridge is a wrapper libray for SCIM, writen in C.
diff -u scim-bridge-0.4.10/debian/rules scim-bridge-0.4.10/debian/rules
--- scim-bridge-0.4.10/debian/rules
+++ scim-bridge-0.4.10/debian/rules
@@ -71,6 +71,7 @@
binary-arch: build install
dh_testdir
dh_testroot
+ dh_gtkmodules
dh_installchangelogs ChangeLog
dh_installdocs
dh_installexamples
diff -u scim-bridge-0.4.10/debian/scim-bridge-client-gtk.install scim-bridge-0.4.10/debian/scim-bridge-client-gtk.install
--- scim-bridge-0.4.10/debian/scim-bridge-client-gtk.install
+++ scim-bridge-0.4.10/debian/scim-bridge-client-gtk.install
@@ -1 +1 @@
-usr/lib/gtk-2.0/2.4.0/immodules/im-scim-bridge.so
+usr/lib/gtk-2.0/*/immodules/im-scim-bridge.so
diff -u scim-bridge-0.4.10/debian/changelog scim-bridge-0.4.10/debian/changelog
--- scim-bridge-0.4.10/debian/changelog
+++ scim-bridge-0.4.10/debian/changelog
@@ -1,3 +1,20 @@
+scim-bridge (0.4.10-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Gtk 2.10 transition; closes: #419313.
+ - Build-depend on libgtk2.0-dev >= 2.10.1-1.
+ - Don't hardcode the Gtk+ module ABI version.
+ . Use a wildcard in debian/scim-bridge-client-gtk.install.
+ . Update dpatches 01_gtk-immodule-install-dir (disabled) and
+ 10_gtk-immodule-install-dir to use $(GTK_BINARY_VERSION).
+ - Call dh_gtkmodules in binary-arch.
+ - Drop scim-bridge-client-gtk.postinst, scim-bridge-client-gtk.postrm,
+ scim-bridge.postinst, and scim-bridge.postrm which only had
+ update-gtk-immodules calls.
+ - Drop libgtk2.0-bin dependency of scim-bridge-client-gtk.
+
+ -- Loic Minier <[EMAIL PROTECTED]> Sun, 29 Apr 2007 20:41:31 +0200
+
scim-bridge (0.4.10-1) unstable; urgency=low
* New upstream release
reverted:
--- scim-bridge-0.4.10/debian/scim-bridge.postrm
+++ scim-bridge-0.4.10.orig/debian/scim-bridge.postrm
@@ -1,17 +0,0 @@
-#!/bin/sh
-# postrm script for scim-gtk-immodule
-# see: dh_installdeb(1)
-
-set -e
-
-if [ "$1" = "remove" ]; then
- /usr/sbin/update-gtk-immodules
-fi
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
reverted:
--- scim-bridge-0.4.10/debian/scim-bridge-client-gtk.postinst
+++ scim-bridge-0.4.10.orig/debian/scim-bridge-client-gtk.postinst
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
- /usr/sbin/update-gtk-immodules
-fi
-
-#DEBHELPER#
-
-exit 0
-
diff -u scim-bridge-0.4.10/debian/patches/01_gtk-immodule-install-dir.dpatch scim-bridge-0.4.10/debian/patches/01_gtk-immodule-install-dir.dpatch
--- scim-bridge-0.4.10/debian/patches/01_gtk-immodule-install-dir.dpatch
+++ scim-bridge-0.4.10/debian/patches/01_gtk-immodule-install-dir.dpatch
@@ -14,7 +14,7 @@
noinst_HEADERS = scim-bridge-client-gtk.h scim-bridge-client-imcontext-gtk.h scim-bridge-client-key-event-utility-gtk.h
-moduledir = @GTK_LIBDIR@/gtk-2.0/immodules
-+moduledir = @GTK_LIBDIR@/gtk-2.0/2.10.0/immodules
++moduledir = $(GTK_LIBDIR)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules
module_LTLIBRARIES = im-scim-bridge.la
@@ -26,7 +26,7 @@
noinst_HEADERS = scim-bridge-client-gtk.h scim-bridge-client-imcontext-gtk.h scim-bridge-client-key-event-utility-gtk.h
-moduledir = @GTK_LIBDIR@/gtk-2.0/immodules
-+moduledir = @GTK_LIBDIR@/gtk-2.0/2.10.0/immodules
++moduledir = $(GTK_LIBDIR)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules
module_LTLIBRARIES = im-scim-bridge.la
im_scim_bridge_la_SOURCES = im-scim-bridge-gtk.c \
scim-bridge-client-gtk.c \
diff -u scim-bridge-0.4.10/debian/patches/10_gtk-immodule-install-dir.dpatch scim-bridge-0.4.10/debian/patches/10_gtk-immodule-install-dir.dpatch
--- scim-bridge-0.4.10/debian/patches/10_gtk-immodule-install-dir.dpatch
+++ scim-bridge-0.4.10/debian/patches/10_gtk-immodule-install-dir.dpatch
@@ -14,7 +14,7 @@
noinst_HEADERS = scim-bridge-client-gtk.h scim-bridge-client-imcontext-gtk.h scim-bridge-client-key-event-utility-gtk.h
-moduledir = @GTK_LIBDIR@/gtk-2.0/immodules
-+moduledir = @GTK_LIBDIR@/gtk-2.0/2.4.0/immodules
++moduledir = $(GTK_LIBDIR)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules
module_LTLIBRARIES = im-scim-bridge.la
@@ -26,7 +26,7 @@
noinst_HEADERS = scim-bridge-client-gtk.h scim-bridge-client-imcontext-gtk.h scim-bridge-client-key-event-utility-gtk.h
-moduledir = @GTK_LIBDIR@/gtk-2.0/immodules
-+moduledir = @GTK_LIBDIR@/gtk-2.0/2.4.0/immodules
++moduledir = $(GTK_LIBDIR)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules
module_LTLIBRARIES = im-scim-bridge.la
im_scim_bridge_la_SOURCES = im-scim-bridge-gtk.c \
scim-bridge-client-gtk.c \
reverted:
--- scim-bridge-0.4.10/debian/scim-bridge.postinst
+++ scim-bridge-0.4.10.orig/debian/scim-bridge.postinst
@@ -1,17 +0,0 @@
-#!/bin/sh
-# postinst script for scim-gtk2-immodule
-# see: dh_installdeb(1)
-
-set -e
-
-if [ "$1" = "configure" ]; then
- /usr/sbin/update-gtk-immodules
-fi
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
reverted:
--- scim-bridge-0.4.10/debian/scim-bridge-client-gtk.postrm
+++ scim-bridge-0.4.10.orig/debian/scim-bridge-client-gtk.postrm
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ]; then
- /usr/sbin/update-gtk-immodules
-fi
-
-#DEBHELPER#
-
-exit 0
-
