diff -u scim-chewing-0.3.3/debian/changelog scim-chewing-0.3.3/debian/changelog --- scim-chewing-0.3.3/debian/changelog +++ scim-chewing-0.3.3/debian/changelog @@ -1,3 +1,15 @@ +scim-chewing (0.3.3-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: LP: #308432 + - add a build-depend on scim-gtk2-immodule + - build with disable-static, disable-rpath + - Fix up po/Makefile.in.in to use some judicious touch rules to avoid + an infinite loop on the build daemons (thanks to Ming Hua for the help) + - add scim-chewing as alternative input method for zh_TW in postinst + - provide im-switch file + + -- Bhavani Shankar Tue, 16 Dec 2008 10:17:29 +0530 + scim-chewing (0.3.3-1) unstable; urgency=low * New upstream release @@ -8,6 +20,18 @@ -- Andrew Lee Fri, 05 Dec 2008 21:15:14 +0800 +scim-chewing (0.3.2-1ubuntu1) jaunty; urgency=low + + * Merge with Debian; remaining changes: + - add a build-depend on scim-gtk2-immodule + - build with disable-static, disable-rpath + - Fix up po/Makefile.in.in to use some judicious touch rules to avoid + an infinite loop on the build daemons (thanks to Ming Hua for the help) + - add scim-chewing as alternative input method for zh_TW in postinst + - provide im-switch file + + -- Matthias Klose Thu, 27 Nov 2008 15:32:08 +0100 + scim-chewing (0.3.2-1) unstable; urgency=low * New upstream release @@ -26,6 +50,19 @@ -- Andrew Lee Wed, 12 Nov 2008 15:42:57 +0800 +scim-chewing (0.3.1-3ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - add a build-depend on scim-gtk2-immodule + - maintainer set to ubuntu + - build with disable-static, disable-rpath + - Fix up po/Makefile.in.in to use some judicious touch rules to avoid + an infinite loop on the build daemons (thanks to Ming Hua for the help) + - add scim-chewing as alternative input method for zh_TW in postinst + - provide im-switch file + + -- Arne Goetje Thu, 24 Jun 2008 16:00:00 +0800 + scim-chewing (0.3.1-3) unstable; urgency=low * Update README.Debian(Closes:#427629) for Dan Jacobson @@ -37,6 +74,31 @@ -- Andrew Lee Wed, 05 Mar 2008 21:41:07 +0800 +scim-chewing (0.3.1-2ubuntu3) hardy; urgency=low + + * Rebuild with recent g++ compiler version. + + -- Matthias Klose Thu, 03 Apr 2008 11:25:04 +0000 + +scim-chewing (0.3.1-2ubuntu2) gutsy; urgency=low + + * Fix build failures with g++-4.3. + + -- Matthias Klose Mon, 10 Sep 2007 14:05:05 +0000 + +scim-chewing (0.3.1-2ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - add a build-depend on scim-gtk2-immodule + - maintainer set to ubuntu + - build with disable-static, disable-rpath + - Fix up po/Makefile.in.in to use some judicious touch rules to avoid + an infinite loop on the build daemons (thanks to Ming Hua for the help) + - add scim-chewing as alternative input method for zh_TW in postinst + - provide im-switch file + + -- Michael Vogt Fri, 25 May 2007 13:09:32 +0200 + scim-chewing (0.3.1-2) unstable; urgency=low * Dropped ttf-arphic-ukai from Recommends cause it is not suitable font @@ -50,6 +112,37 @@ -- Andrew Lee Thu, 23 Aug 2007 22:11:24 +0800 +scim-chewing (0.3.1-1ubuntu4) edgy; urgency=low + + * Fix FTBFS: add a build-depend on scim-gtk2-immodule, due to the way + we split the libraries up for the sake of GTK-hating derviatives. + + -- Adam Conrad Wed, 18 Oct 2006 18:36:07 +1000 + +scim-chewing (0.3.1-1ubuntu3) edgy; urgency=low + + * Correct the scim-bridge's dir in + debian/im-switch/scim-pinyin, due to the + change in gtk2 + + -- Hou ZhengPeng Wed, 16 Aug 2006 08:31:01 +0800 + +scim-chewing (0.3.1-1ubuntu2) edgy; urgency=low + + * Improve the conffile of im-switch in + debian/im-switch/scim-chewing. + * Use scim-chewing in scim-chewing.postinst and + scim-chewing.prerm for zh_TW locale users, + instead of scim-pinyin. + + -- Hou ZhengPeng Tue, 11 Jul 2006 13:47:22 +0800 + +scim-chewing (0.3.1-1ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Scott James Remnant Mon, 10 Jul 2006 16:33:31 +0100 + scim-chewing (0.3.1-1) unstable; urgency=low * New upstream release @@ -73,6 +166,44 @@ -- Andrew Lee Tue, 30 May 2006 17:33:52 +0800 +scim-chewing (0.2.1-2ubuntu4) dapper; urgency=low + + * check for skim in the im-switch file and sets XIM_PROGRAM=skim if + it is installed (fixes the problem that skim is not started currently + automatically in kubuntu) + + -- Hou ZhengPeng Wed, 12 Apr 2006 15:29:44 +0800 + +scim-chewing (0.2.1-2ubuntu3) dapper; urgency=low + + * Fix up po/Makefile.in.in to use some judicious touch rules to avoid + an infinite loop on the build daemons (thanks to Ming Hua for the help) + * Make scripts/remove-autotool.sh stop cleaning the above file on clean. + * Make both these changes directly to the diff.gz since, otherwise, the + clean target in debian/rules would delete the file before dpatch ran. + + -- Adam Conrad Thu, 16 Mar 2006 15:57:55 +1100 + +scim-chewing (0.2.1-2ubuntu2) dapper; urgency=low + + * Add im-switch configure file in debian/im-switch for postinst. + * Add im-switch to Recommends. + * Use ttf-arphic-uming and ttf-arphic-ukai as recommend chinese fonts . + + -- Abel Cheung Wed, 15 Mar 2006 17:42:39 +0000 + +scim-chewing (0.2.1-2ubuntu1) dapper; urgency=low + + * Add patch for correct the configure.ac for LIBTOOL _EXPORT_OPTIONS + * Add skim as an option instead of scim in the depends + + -- Hou ZhengPeng Tue, 28 Feb 2006 15:53:23 +0800 + +scim-chewing (0.2.1-2build1) dapper; urgency=low + + * Rebuild due to the libstdc++ allocator ABI transition. + + -- Ming Hua Sat, 17 Dec 2005 17:58:32 -0600 scim-chewing (0.2.1-2) unstable; urgency=low diff -u scim-chewing-0.3.3/debian/control scim-chewing-0.3.3/debian/control --- scim-chewing-0.3.3/debian/control +++ scim-chewing-0.3.3/debian/control @@ -1,8 +1,9 @@ Source: scim-chewing Priority: optional Section: utils -Maintainer: Andrew Lee -Build-Depends: debhelper (>= 5.0.0), dpatch, libglib2.0-dev, libgtk2.0-dev, libscim-dev (>= 1.4.6), libchewing3-dev (>= 0.3.2), libtool, intltool, autoconf, automake +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Andrew Lee +Build-Depends: debhelper (>= 5.0.0), dpatch, libglib2.0-dev, libgtk2.0-dev, libscim-dev (>= 1.4.6), libchewing3-dev (>= 0.3.2), libtool, intltool, autoconf, automake, scim-gtk2-immodule Build-Conflicts: autoconf2.13, automake1.4 Standards-Version: 3.8.0 Homepage: http://chewing.csie.net @@ -11,8 +12,8 @@ Package: scim-chewing Architecture: any -Depends: ${shlibs:Depends}, scim -Recommends: ttf-arphic-uming +Depends: ${shlibs:Depends}, scim | skim +Recommends: ttf-arphic-uming, im-switch Description: Chewing IM engine module for SCIM SCIM (Smart Common Input Method) is an input method (IM) platform. . diff -u scim-chewing-0.3.3/debian/rules scim-chewing-0.3.3/debian/rules --- scim-chewing-0.3.3/debian/rules +++ scim-chewing-0.3.3/debian/rules @@ -9,6 +9,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# This has to be exported to make some magic below work. +export DH_OPTIONS + include /usr/share/dpatch/dpatch.make # These are used for cross-compiling and for saving the configure script @@ -16,7 +19,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - +# Setting compiling flags CFLAGS = -Wall -g CXXFLAGS = -Wall -g @@ -36,8 +39,10 @@ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info - + --infodir=\$${prefix}/share/info \ + --sysconfdir=/etc \ + --disable-static \ + --disable-rpath build: build-stamp build-stamp: config.status @@ -68,7 +73,7 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_clean -k dh_installdirs # Add here commands to install the package into debian/scim-chewing. @@ -82,8 +87,12 @@ # Clean up unnecessary static libraries for modules - rm debian/scim-chewing/usr/lib/scim-1.0/*/*/*.a - rm debian/scim-chewing/usr/lib/scim-1.0/*/*/*.la + rm -f debian/scim-chewing/usr/lib/scim-1.0/*/*/*.a + rm -f debian/scim-chewing/usr/lib/scim-1.0/*/*/*.la + + # install file for im-switch handling + install -d $(CURDIR)/debian/scim-chewing/etc/X11/xinit/xinput.d/ + install -m 644 debian/im-switch/scim-chewing debian/scim-chewing/etc/X11/xinit/xinput.d/ touch install-stamp diff -u scim-chewing-0.3.3/debian/patches/00list scim-chewing-0.3.3/debian/patches/00list --- scim-chewing-0.3.3/debian/patches/00list +++ scim-chewing-0.3.3/debian/patches/00list @@ -1,0 +2 @@ +30_configure-ac.dpatch only in patch2: unchanged: --- scim-chewing-0.3.3.orig/scripts/remove-autotool.sh +++ scim-chewing-0.3.3/scripts/remove-autotool.sh @@ -35,7 +35,6 @@ po/Makevars.template \ po/remove-potcdate.sin \ po/stamp-po \ - po/Makefile.in.in \ po/Rules-quot \ po/Makevars \ po/quot.sed only in patch2: unchanged: --- scim-chewing-0.3.3.orig/po/Makefile.in.in +++ scim-chewing-0.3.3/po/Makefile.in.in @@ -211,6 +211,7 @@ cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ $(SHELL) ./config.status + touch POTFILES && touch Makefile # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. only in patch2: unchanged: --- scim-chewing-0.3.3.orig/debian/patches/30_configure-ac.dpatch +++ scim-chewing-0.3.3/debian/patches/30_configure-ac.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_configure-ac.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -ruNad scim-chewing-0.2.1.orig/configure.ac scim-chewing-0.2.1/configure.ac +--- scim-chewing-0.2.1.orig/configure.ac 2006-02-28 15:40:43.000000000 +0800 ++++ scim-chewing-0.2.1/configure.ac 2006-02-28 15:42:52.000000000 +0800 +@@ -76,6 +76,7 @@ + # libtool option to control which symbols are exported + # right now, symbols starting with _ are not exported + LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"' ++AC_SUBST(LIBTOOL_EXPORT_OPTIONS) + + # Extra args. + AC_ARG_ENABLE(debug, only in patch2: unchanged: --- scim-chewing-0.3.3.orig/debian/scim-chewing.postinst +++ scim-chewing-0.3.3/debian/scim-chewing.postinst @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +update-alternatives \ + --install /etc/X11/xinit/xinput.d/zh_TW xinput-zh_TW \ + /etc/X11/xinit/xinput.d/scim-chewing 50 + +#DEBHELPER# + only in patch2: unchanged: --- scim-chewing-0.3.3.orig/debian/scim-chewing.prerm +++ scim-chewing-0.3.3/debian/scim-chewing.prerm @@ -0,0 +1,7 @@ +#!/bin/sh +set -e + +update-alternatives --remove xinput-zh_TW /etc/X11/xinit/xinput.d/scim-chewing + +#DEBHELPER# + only in patch2: unchanged: --- scim-chewing-0.3.3.orig/debian/im-switch/scim-chewing +++ scim-chewing-0.3.3/debian/im-switch/scim-chewing @@ -0,0 +1,18 @@ +XIM=SCIM +if [ -e /usr/bin/skim ]; then + XIM_PROGRAM=/usr/bin/skim +else + XIM_PROGRAM=/usr/bin/scim +fi +XIM_ARGS="-d" +if [ -e /usr/lib/gtk-2.0/2.10.0/immodules/im-scim-bridge.so ]; then + GTK_IM_MODULE=scim-bridge +else + GTK_IM_MODULE=xim +fi +if [ -e /usr/lib/qt3/plugins/inputmethods/libqscim.so ]; then + QT_IM_MODULE=scim +else + QT_IM_MODULE=xim +fi +DEPENDS="scim | skim"