Commit 140e21a5 authored by Anthony Fok's avatar Anthony Fok Committed by Osamu Aoki

Imported Debian patch 0.5.91-1

parents f528d5e1 08b1b9d6
This diff is collapsed.
......@@ -27,30 +27,17 @@ AUX_DIST = $(ac_aux_dir)/config.guess \
EXTRA_DIST = config.rpath mkinstalldirs bootstrap scim-pinyin.spec
## @end 1
if SCIM_PINYIN_ENABLE_SKIM_SUPPORT
SKIM_SUBDIR=skim
endif
AUTOMAKE_OPTIONS = gnu
SUBDIRS = m4 src data intl po
SUBDIRS = m4 src data intl po $(SKIM_SUBDIR)
## @start 1
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in $(AUX_DIST)
CLEANFILES = *.bak src/*.bak
## @end 1
ACLOCAL = aclocal -I $(ac_aux_dir)
## @start 2
## docdir = $(top_builddir)/doc
## html:
## @echo Making $@ in $(docdir)
## @cd $(docdir) && make $@
## @end 2
## @start 1
##dist-hook:
## (cd $(distdir) && mkdir $(ac_aux_dir))
## for file in $(AUX_DIST); do \
## cp $$file $(distdir)/$$file; \
## done
## @end 1
ACLOCAL_AMFLAGS = -I m4
# Makefile.in generated by automake 1.9.3 from Makefile.am.
# Makefile.in generated by automake 1.9.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004 Free Software Foundation, Inc.
# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -75,7 +75,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
uninstall-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DIST_SUBDIRS = m4 src data intl po skim
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -87,7 +87,7 @@ DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = aclocal -I $(ac_aux_dir)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
......@@ -145,6 +145,7 @@ INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
KDEDIR = @KDEDIR@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBICONV = @LIBICONV@
......@@ -177,17 +178,26 @@ RANLIB = @RANLIB@
SCIM_BUILD_SETUP = @SCIM_BUILD_SETUP@
SCIM_BUILD_SETUP_FALSE = @SCIM_BUILD_SETUP_FALSE@
SCIM_BUILD_SETUP_TRUE = @SCIM_BUILD_SETUP_TRUE@
SCIM_BUILD_SKIM_SETUP_FALSE = @SCIM_BUILD_SKIM_SETUP_FALSE@
SCIM_BUILD_SKIM_SETUP_TRUE = @SCIM_BUILD_SKIM_SETUP_TRUE@
SCIM_CFLAGS = @SCIM_CFLAGS@
SCIM_DATADIR = @SCIM_DATADIR@
SCIM_GTKUTILS_CFLAGS = @SCIM_GTKUTILS_CFLAGS@
SCIM_GTKUTILS_LIBS = @SCIM_GTKUTILS_LIBS@
SCIM_ICONDIR = @SCIM_ICONDIR@
SCIM_KDEUTILS_CFLAGS = @SCIM_KDEUTILS_CFLAGS@
SCIM_KDEUTILS_LIBS = @SCIM_KDEUTILS_LIBS@
SCIM_LIBS = @SCIM_LIBS@
SCIM_MODULEDIR = @SCIM_MODULEDIR@
SCIM_PINYIN_DATADIR = @SCIM_PINYIN_DATADIR@
SCIM_PINYIN_ENABLE_SKIM_SUPPORT = @SCIM_PINYIN_ENABLE_SKIM_SUPPORT@
SCIM_PINYIN_ENABLE_SKIM_SUPPORT_FALSE = @SCIM_PINYIN_ENABLE_SKIM_SUPPORT_FALSE@
SCIM_PINYIN_ENABLE_SKIM_SUPPORT_TRUE = @SCIM_PINYIN_ENABLE_SKIM_SUPPORT_TRUE@
SCIM_VERSION = @SCIM_VERSION@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SKIM_CFLAGS = @SKIM_CFLAGS@
SKIM_LIBS = @SKIM_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
......@@ -237,6 +247,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AUX_DIST = $(ac_aux_dir)/config.guess \
......@@ -248,8 +259,9 @@ AUX_DIST = $(ac_aux_dir)/config.guess \
$(ac_aux_dir)/depcomp
EXTRA_DIST = config.rpath mkinstalldirs bootstrap scim-pinyin.spec
@SCIM_PINYIN_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR = skim
AUTOMAKE_OPTIONS = gnu
SUBDIRS = m4 src data intl po
SUBDIRS = m4 src data intl po $(SKIM_SUBDIR)
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in $(AUX_DIST)
CLEANFILES = *.bak src/*.bak
ACLOCAL_AMFLAGS = -I m4
......@@ -329,7 +341,13 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@set fnord $$MAKEFLAGS; amf=$$2; \
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
*k*) failcom='fail=yes';; \
esac; \
done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
......@@ -341,7 +359,7 @@ $(RECURSIVE_TARGETS):
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
......@@ -349,7 +367,13 @@ $(RECURSIVE_TARGETS):
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@set fnord $$MAKEFLAGS; amf=$$2; \
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
*k*) failcom='fail=yes';; \
esac; \
done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
......@@ -370,7 +394,7 @@ maintainer-clean-recursive:
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
......
This diff is collapsed.
......@@ -25,4 +25,7 @@ autoheader
libtoolize -c --automake --force
automake --add-missing --copy --include-deps
autoconf
cd skim
./bootstrap
cd ..
## @end 1
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
timestamp='2004-08-11'
timestamp='2005-02-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -53,7 +53,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
......@@ -213,9 +213,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
amiga:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
arc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
cats:OpenBSD:*:*)
echo arm-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
......@@ -240,18 +237,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
mvmeppc:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
pmax:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
sgi:OpenBSD:*:*)
echo mipseb-unknown-openbsd${UNAME_RELEASE}
echo mips64-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
sun3:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
wgrisc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
......@@ -338,6 +329,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:OS/390:*:*)
echo i370-ibm-openedition
exit 0 ;;
*:z/VM:*:*)
echo s390-ibm-zvmoe
exit 0 ;;
*:OS400:*:*)
echo powerpc-ibm-os400
exit 0 ;;
......@@ -361,7 +355,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
exit 0 ;;
DRS?6000:UNIX_SV:4.2*:7*)
DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7 && exit 0 ;;
esac ;;
......@@ -820,6 +814,9 @@ EOF
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit 0 ;;
amd64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit 0 ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit 0 ;;
......@@ -843,6 +840,12 @@ EOF
cris:Linux:*:*)
echo cris-axis-linux
exit 0 ;;
crisv32:Linux:*:*)
echo crisv32-axis-linux
exit 0 ;;
frv:Linux:*:*)
echo frv-${VENDOR}-linux
exit 0 ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-${VENDOR}-linux
exit 0 ;;
......@@ -1207,6 +1210,9 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
NSE-?:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
......@@ -1260,7 +1266,10 @@ EOF
A*) echo alpha-dec-vms && exit 0 ;;
I*) echo ia64-dec-vms && exit 0 ;;
V*) echo vax-dec-vms && exit 0 ;;
esac
esac ;;
*:XENIX:*:SysV)
echo i386-pc-xenix
exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
......
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
timestamp='2004-06-24'
timestamp='2005-02-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
......@@ -70,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
......@@ -237,7 +237,7 @@ case $basic_machine in
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32r | m32rle | m68000 | m68k | m88k | mcore \
| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
......@@ -267,7 +267,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
| x86 | xscale | xstormy16 | xtensa \
| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
......@@ -310,7 +310,7 @@ case $basic_machine in
| ip2k-* | iq2000-* \
| m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | mcore-* \
| m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
......@@ -343,8 +343,8 @@ case $basic_machine in
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
| xtensa-* \
| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
......@@ -457,6 +457,9 @@ case $basic_machine in
crds | unos)
basic_machine=m68k-crds
;;
crisv32 | crisv32-* | etraxfs*)
basic_machine=crisv32-axis
;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
......@@ -486,6 +489,10 @@ case $basic_machine in
basic_machine=m88k-motorola
os=-sysv3
;;
djgpp)
basic_machine=i586-pc
os=-msdosdjgpp
;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
......@@ -1026,6 +1033,10 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
xbox)
basic_machine=i686-pc
os=-mingw32
;;
xps | xps100)
basic_machine=xps100-honeywell
;;
......@@ -1291,6 +1302,9 @@ case $os in
-kaos*)
os=-kaos
;;
-zvmoe)
os=-zvmoe
;;
-none)
;;
*)
......
This diff is collapsed.
# Process this file with autoconf to produce a configure script.
AC_INIT(scim-pinyin, 0.5.0, suzhe@tsinghua.org.cn)
AC_INIT(scim-pinyin, 0.5.91, suzhe@tsinghua.org.cn) #do not forget to edit skim/configure.in.in to change the version
AC_CONFIG_SRCDIR([src/scim_pinyin_imengine.h])
SCIM_VERSION=1.1.0
SCIM_VERSION=1.2.0
AC_SUBST(SCIM_VERSION)
GETTEXT_PACKAGE=scim-pinyin
......@@ -14,7 +14,7 @@ AM_INIT_AUTOMAKE
AM_CONFIG_HEADER([config.h])
# Init gettext
ALL_LINGUAS="zh_CN zh_TW ko ja de fr"
ALL_LINGUAS="zh_CN zh_TW ko ja de fr it"
AM_GNU_GETTEXT
# Init libtool
......@@ -72,6 +72,13 @@ AC_ARG_ENABLE(debug,
enable_debug=yes,
enable_debug=no)
AC_ARG_ENABLE(skim-support,
[ --disable-skim-support Enable skim Setup UI],
skim_support=no,
skim_support=yes)
AM_CONDITIONAL(SCIM_BUILD_SKIM_SETUP, [test "$skim_support" = "yes"])
if test "$enable_debug" = "yes"; then
AC_DEFINE(ENABLE_DEBUG,1,[Define this to enable the debug facility in libscim])
CFLAGS="$CFLAGS -g"
......@@ -112,10 +119,41 @@ SCIM_PINYIN_DATADIR=$SCIM_DATADIR/pinyin
AC_SUBST(SCIM_PINYIN_DATADIR)
AC_CONFIG_FILES([Makefile
m4/Makefile
src/Makefile
m4/Makefile
src/Makefile
data/Makefile
intl/Makefile
po/Makefile.in
scim-pinyin.spec])
intl/Makefile
po/Makefile.in
scim-pinyin.spec])
if test "$skim_support" = "yes"; then
REQUIRED_SKIM_VERSION=1.2.1
dnl skim probably has been installed under prefix=$KDEDIR, so add it to search path of pkgconfig
kde_libsuffix=`kde-config --libsuffix`
test -z "$KDEDIR" && KDEDIR=`kde-config --prefix`
AC_SUBST(KDEDIR)
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$KDEDIR/lib${kde_libsuffix}/pkgconfig
PKG_CHECK_MODULES(SKIM, [skim >= $REQUIRED_SKIM_VERSION],
[HAS_SKIM=yes],
[HAS_SKIM=no])
else
HAS_SKIM=no
fi
if test "x$HAS_SKIM" = "xyes"; then
PKG_CHECK_MODULES(SCIM_KDEUTILS,[scim_kdeutils >= $REQUIRED_SKIM_VERSION],
[HAS_KDEUTILS=yes],
[HAS_KDEUTILS=no])
if test "x$HAS_KDEUTILS" = "xyes"; then
SCIM_PINYIN_ENABLE_SKIM_SUPPORT=1
AC_CONFIG_SUBDIRS(skim)
else
SCIM_PINYIN_ENABLE_SKIM_SUPPORT=0
fi
fi
AM_CONDITIONAL(SCIM_PINYIN_ENABLE_SKIM_SUPPORT, [test "$HAS_KDEUTILS" = "yes"])
AC_SUBST(SCIM_PINYIN_ENABLE_SKIM_SUPPORT)
AC_OUTPUT
# Makefile.in generated by automake 1.9.3 from Makefile.am.
# Makefile.in generated by automake 1.9.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004 Free Software Foundation, Inc.
# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -131,6 +131,7 @@ INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
KDEDIR = @KDEDIR@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBICONV = @LIBICONV@
......@@ -163,17 +164,26 @@ RANLIB = @RANLIB@
SCIM_BUILD_SETUP = @SCIM_BUILD_SETUP@
SCIM_BUILD_SETUP_FALSE = @SCIM_BUILD_SETUP_FALSE@
SCIM_BUILD_SETUP_TRUE = @SCIM_BUILD_SETUP_TRUE@
SCIM_BUILD_SKIM_SETUP_FALSE = @SCIM_BUILD_SKIM_SETUP_FALSE@
SCIM_BUILD_SKIM_SETUP_TRUE = @SCIM_BUILD_SKIM_SETUP_TRUE@
SCIM_CFLAGS = @SCIM_CFLAGS@
SCIM_DATADIR = @SCIM_DATADIR@
SCIM_GTKUTILS_CFLAGS = @SCIM_GTKUTILS_CFLAGS@
SCIM_GTKUTILS_LIBS = @SCIM_GTKUTILS_LIBS@
SCIM_ICONDIR = @SCIM_ICONDIR@
SCIM_KDEUTILS_CFLAGS = @SCIM_KDEUTILS_CFLAGS@
SCIM_KDEUTILS_LIBS = @SCIM_KDEUTILS_LIBS@
SCIM_LIBS = @SCIM_LIBS@
SCIM_MODULEDIR = @SCIM_MODULEDIR@
SCIM_PINYIN_DATADIR = @SCIM_PINYIN_DATADIR@
SCIM_PINYIN_ENABLE_SKIM_SUPPORT = @SCIM_PINYIN_ENABLE_SKIM_SUPPORT@
SCIM_PINYIN_ENABLE_SKIM_SUPPORT_FALSE = @SCIM_PINYIN_ENABLE_SKIM_SUPPORT_FALSE@
SCIM_PINYIN_ENABLE_SKIM_SUPPORT_TRUE = @SCIM_PINYIN_ENABLE_SKIM_SUPPORT_TRUE@
SCIM_VERSION = @SCIM_VERSION@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SKIM_CFLAGS = @SKIM_CFLAGS@
SKIM_LIBS = @SKIM_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
......@@ -223,6 +233,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
MAINTAINERCLEANFILES = Makefile.in
......
This package scim-pinyin is a SCIM module for Pinyin input method. Please
see /usr/share/doc/scim/README.Debian for usage of scim.
see /usr/share/doc/scim/README.Debian.gz for usage of scim.
SCIM uses TrueType fonts for display. Since scim-pinyin supports both
simplified and traditional Chinese, you need to install fonts for these
......
scim-pinyin (0.5.91-1) unstable; urgency=low
[ Deng Xiyue ]
* New upstream release. (Closes: #459869)
+ Fix FTBFS with gcc-4.3. (Closes: #441594)
* Drop 01gcc-4.0.dpatch. Fixed upstream.
* Drop -1 debian version from libscim-dev b-dep as per lintian.
[ Anthony Fok ]
* Merged 0.5.91-0ubuntu12 from Ubuntu. Many thanks to Zhengpeng Hou
and others for their great works! Remaining differences:
- Do not build skim-scim-pinyin for Debian (will do so in -2).
- Keep Ming Hua's 10_missing-header.dpatch (#define Use_C_STRING)
as per upstream practice rather than "#include <cstring>".
- Do not install /etc/X11/xinit/xinput.d/scim-pinyin. TBD.
* debian/rules:
- Use -O2 instead of -O
- configure: --disable-skim-support for now.
- build: $(MAKE) distclean DIST_SUBDIRS='m4 src data intl po' (no skim)
* debian/copyright:
- Copyright (C) 2002-2005 (was 2004).
-- Anthony Fok <foka@debian.org> Sun, 27 Jul 2008 12:09:37 +0800
scim-pinyin (0.5.0-4.1) unstable; urgency=medium
* Non-maintainer upload.
......@@ -26,6 +50,32 @@ scim-pinyin (0.5.0-4) unstable; urgency=low
-- Ming Hua <minghua-guest@users.alioth.debian.org> Sat, 02 Feb 2008 12:05:33 -0600
scim-pinyin (0.5.91-0ubuntu12) gutsy; urgency=low
* Fix build failure if the build target is run without running
the clean target. LP: #143960.
-- Matthias Klose <doko@ubuntu.com> Thu, 11 Oct 2007 17:50:50 +0000
scim-pinyin (0.5.91-0ubuntu11) gutsy; urgency=low
* Fix build failures with g++-4.3.
-- Matthias Klose <doko@ubuntu.com> Mon, 10 Sep 2007 16:16:53 +0200
scim-pinyin (0.5.91-0ubuntu10) gutsy; urgency=low
* Add build dependency on skim. Fixes another build failure.
* Correctly clean the package, run `make clean'.
-- Matthias Klose <doko@ubuntu.com> Thu, 30 Aug 2007 09:40:44 +0000
scim-pinyin (0.5.91-0ubuntu9) gutsy; urgency=low
* Run clean target, fixes build failure. LP: #128220.
-- Matthias Klose <doko@ubuntu.com> Thu, 30 Aug 2007 09:15:35 +0000
scim-pinyin (0.5.0-3) unstable; urgency=low
* Adapt to scim's $(moduledir) change: (Closes: #422739)
......@@ -41,6 +91,70 @@ scim-pinyin (0.5.0-3) unstable; urgency=low
-- Ming Hua <minghua@rice.edu> Sun, 13 May 2007 17:54:00 -0500
scim-pinyin (0.5.91-0ubuntu8) gutsy; urgency=low
* Drop 10scim-plugin-module-install-dir.dpatch, because scim
has changes, due to the upgrade of libgtk2.0.
* Build-dep on libscim-dev (>= 1.4.6-1).
* Use /usr/lib/scim/1.0/*/ to install modules.
-- ZhengPeng Hou <zhengpeng-hou@ubuntu.com> Fri, 11 May 2007 21:40:45 +0800
scim-pinyin (0.5.91-0ubuntu7) feisty; urgency=low
* Rebuild for ldbl128 change (powerpc, sparc).
* Set Ubuntu maintainer address.
-- Matthias Klose <doko@ubuntu.com> Mon, 5 Mar 2007 01:24:54 +0100
scim-pinyin (0.5.91-0ubuntu6) edgy; urgency=low
* Correct the scim-bridge's dir in
debian/im-switch/scim-pinyin, due to the
change in gtk2
-- Hou ZhengPeng <zhengpeng.hou@gmail.com> Wed, 16 Aug 2006 08:24:12 +0800
scim-pinyin (0.5.91-0ubuntu5) edgy; urgency=low
* Fix the FTBFS, due to the change in scim
add build-dep on scim-gtk2-immodule
-- Hou ZhengPeng <zhengpeng.hou@gmail.com> Tue, 1 Aug 2006 22:29:05 +0800
scim-pinyin (0.5.91-0ubuntu4) edgy; urgency=low
* Improve the conffile of im-switch in
debian/im-switch/scim-pinyin
-- Hou ZhengPeng <zhengpeng.hou@gmail.com> Tue, 18 Jul 2006 14:04:24 +0800
scim-pinyin (0.5.91-0ubuntu3) 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 <zhengpeng.hou@gmail.com> Thu, 23 Mar 2006 11:48:37 +0800
scim-pinyin (0.5.91-0ubuntu2) 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 .
* Fix bug #34413 on malone.
* Upload for Hou ZhengPeng <zhengpeng.hou@gmail.com>.
-- Jonathan Patrick Davies <jpatrick@ubuntu.com> Sat, 11 Mar 2006 15:53:47 +0100
scim-pinyin (0.5.91-0ubuntu1) dapper; urgency=low
* New upstream release
* Add skim-scim-pinyin and build-dep on skim
* Add postinst for register scim to im-switch
-- Hou ZhengPeng <zhengpeng.hou@gmail.com> Thu, 2 Mar 2006 19:18:00 +0800
scim-pinyin (0.5.0-2) unstable; urgency=low
* Make scim-pinyin Replaces scim-chinese (<< 0.5.0) to provide smooth
......
......@@ -2,9 +2,9 @@ Source: scim-pinyin
Section: utils
Priority: optional
Maintainer: Ming Hua <minghua-guest@users.alioth.debian.org>
Uploaders: Osamu Aoki <osamu@debian.org>
Build-Depends: dpkg-dev (>= 1.14.6), debhelper (>= 4.0.0), dpatch, autotools-dev, libgtk2.0-dev, libscim-dev (>= 1.4.6-1)
Standards-Version: 3.7.3
Uploaders: Osamu Aoki <osamu@debian.org>, Anthony Fok <foka@debian.org>
Build-Depends: dpkg-dev (>= 1.14.6), debhelper (>= 5.0.0), dpatch, autotools-dev, libgtk2.0-dev, libscim-dev (>= 1.4.6), scim-gtk2-immodule
Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/pkg-ime/scim-pinyin/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ime/scim-pinyin/trunk/
Homepage: http://www.scim-im.org/
......@@ -12,7 +12,7 @@ Homepage: http://www.scim-im.org/
Package: scim-pinyin
Architecture: any
Depends: ${shlibs:Depends}, scim
Recommends: ttf-arphic-gbsn00lp | ttf-arphic-gkai00mp, ttf-arphic-bsmi00lp | ttf-arphic-bkai00mp
Recommends: ttf-arphic-uming, ttf-arphic-ukai, im-switch
Replaces: scim-chinese (<< 0.5.0)
Description: smart pinyin IM engine for SCIM platform
SCIM (Smart Common Input Method) is an input method (IM) platform.
......@@ -29,3 +29,4 @@ Depends: scim-pinyin
Description: smart pinyin IM engine for SCIM (transitional package)
This is a dummy package for transition during upgrade. You can safely
remove this package once you have scim-pinyin installed.
......@@ -11,7 +11,7 @@ Copyright:
Smart Common Input Method -- Smart Pinyin Module
Copyright 2002-2004, James Su <suzhe@tsinghua.org.cn>
Copyright (C) 2002-2005, James Su <suzhe@tsinghua.org.cn>
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......
01gcc-4.0.dpatch
10_missing-header.dpatch
20_gcc_4.3.dpatch
10_missing-header
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01gcc-4.0.dpatch by Andreas Jochens <aj@andaco.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch to fix FTBFS on amd64 ## DP: with gcc-4.0. See bug #297975
## DP: for details.
@DPATCH@
diff -urNad scim-pinyin-0.5.0~/src/scim_pinyin_imengine_setup.cpp scim-pinyin-0.5.0/src/scim_pinyin_imengine_setup.cpp
--- scim-pinyin-0.5.0~/src/scim_pinyin_imengine_setup.cpp 2005-01-06 07:31:00.000000000 -0600
+++ scim-pinyin-0.5.0/src/scim_pinyin_imengine_setup.cpp 2005-10-01 21:45:08.000000000 -0500
@@ -1290,7 +1290,7 @@
__on_ambiguities_toggled (GtkToggleButton *togglebutton,