--- scim-skk-0.5.2.orig/debian/copyright +++ scim-skk-0.5.2/debian/copyright @@ -0,0 +1,15 @@ +This package was debianized by Ikuya Awashiro on +Thu, 30 Dec 2004 23:21:57 +0900. + +It was downloaded from http://sourceforge.jp/projects/scim-imengine/ + +Copyright: Jun Mukai 2004-2010 + +Upstream Author: Jun Mukai + +License: + + You are free to distribute this software under the terms of + the GNU General Public License. + On Debian systems, the complete text of the GNU General Public + License can be found in the file `/usr/share/common-licenses/GPL'. --- scim-skk-0.5.2.orig/debian/README.source +++ scim-skk-0.5.2/debian/README.source @@ -0,0 +1,38 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get the fully patched source after unpacking the source package, cd +to the root level of the source package and run: + + debian/rules patch + +Removing a patch is as simple as removing its entry from the +debian/patches/00list file, and please also remove the patch file +itself. + +Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" +where you should replace XX with a new number and patchname with a +descriptive shortname of the patch. You can then simply edit all the +files your patch wants to edit, and then simply "exit 0" from the shell +to actually create the patch file. + +To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" +and replace XX_patchname with the actual filename from debian/patches +you want to use. + +To clean up afterwards again, "debian/rules unpatch" will do the +work for you - or you can of course choose to call +"fakeroot debian/rules clean" all together. + + +--- + +this documentation is part of dpatch package, and may be used by +packages using dpatch to comply with policy on README.source. This +documentation is meant to be useful to users who are not proficient in +dpatch in doing work with dpatch-based packages. Please send any +improvements to the BTS of dpatch package. + +original text by Gerfried Fuchs, edited by Junichi Uekawa +10 Aug 2008. --- scim-skk-0.5.2.orig/debian/changelog +++ scim-skk-0.5.2/debian/changelog @@ -0,0 +1,205 @@ +scim-skk (0.5.2-7) unstable; urgency=low + + * debian/control: add "Uploaders: Yukiharu YABUKI" + * debian/copyright: add copyright holder and year [Yukiharu YABUKI] + + -- Ikuya Awashiro Thu, 19 Aug 2010 00:54:41 +0900 + +scim-skk (0.5.2-6) unstable; urgency=medium + + * debian/control: add pkg-config, libltdl-dev to Build-Depends. + (Closes: #590385) + * Urgency medium due to RC bug fix. + * debian/control: add Homepage field. + * debian/control: add ${misc:Depends} to Depends. + * debian/control: Standards-Version: 3.9.1.0. + * debian/compat: set 7. + * debian/control: change debhelper to 7. + * debian/README.source: added. + * debian/rules: copy config.sub and config.guess before configure. + * po/stamp-po.debdiff: removed. + * debian/rules: do not use dh_clean -k. + * debian:rules: use "[ ! -f Makefile ] || $(MAKE) distclean". + + -- Ikuya Awashiro Wed, 18 Aug 2010 22:52:21 +0900 + +scim-skk (0.5.2-5.1) unstable; urgency=low + + * Non-maintainer upload. + * 20_gcc-4.3-fixes.dpatch: fixes FTBFS with gcc-4.3 (Closes: #455270) + + -- Peter Eisentraut Sat, 05 Apr 2008 01:30:52 +0200 + +scim-skk (0.5.2-5) unstable; urgency=low + + * removed debian/patches/10_scim-plugin-module-install-dir. + closes: #422956 + + -- Ikuya Awashiro Sat, 12 May 2007 23:05:28 +0900 + +scim-skk (0.5.2-4) unstable; urgency=low + + * debian/patches/02_scim_skk_dictionary.cpp.dpatch: + updated another fix by Ryo Dairiki. + * remove im-switch support (Closes: #374156) + * Standards-Version bumped to 3.7.2 (no changes requied) + + -- Ikuya Awashiro Sun, 18 Jun 2006 18:19:00 +0900 + +scim-skk (0.5.2-3) unstable; urgency=low + + * debian/patches/02_scim_skk_dictionary.cpp.dpatch: + added. see detail: + http://lists.sourceforge.jp/mailman/archives/scim-imengine-dev/2006-January/000876.html + + -- Ikuya Awashiro Fri, 20 Jan 2006 03:28:38 +0000 + +scim-skk (0.5.2-2) unstable; urgency=low + + * debian/patches/01_error_check_to_cdb_get.dpatch: + added from CVS. + + -- Ikuya Awashiro Fri, 23 Dec 2005 22:21:10 +0900 + +scim-skk (0.5.2-1) unstable; urgency=low + + * New upstream release + * debian/docs: add README.ja + + -- Ikuya Awashiro Thu, 22 Dec 2005 01:45:28 +0900 + +scim-skk (0.5.1-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Wed, 14 Dec 2005 16:44:05 +0900 + +scim-skk (0.5.0-1) unstable; urgency=low + + * New upstream release + * debian/docs: delete README.ja + * debian/control: enable new feature (handling multi-dictionaries) + + -- Ikuya Awashiro Tue, 6 Dec 2005 23:30:09 +0900 + +scim-skk (0.4.0-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Sun, 30 Oct 2005 04:38:16 +0000 + +scim-skk (0.3.0-8) unstable; urgency=low + + * debian/im-switch/scim-skk: Quoted DEPENDS line. + + -- Ikuya Awashiro Thu, 25 Aug 2005 13:59:23 +0000 + +scim-skk (0.3.0-7) unstable; urgency=low + + * debian/control: correct wrong Description. + * closes: bug#323400 (ITP) + * fixed some mistakes. + + -- Ikuya Awashiro Fri, 19 Aug 2005 05:12:17 +0000 + +scim-skk (0.3.0-6) unstable; urgency=low + + * Bump Standards-Version to 3.6.2 (no changes required). + * Add im-swich support. + + -- Ikuya Awashiro Tue, 16 Aug 2005 13:37:24 +0900 + +scim-skk (0.3.0-5) unstable; urgency=low + + * This package is for SCIM 1.3.x or later. + * debian/control: changed Depends and Build-Depends for SCIM 1.3.x. + * debian/rules: add pkg-config to Depends. + + -- Ikuya Awashiro Fri, 22 Jul 2005 08:22:36 +0000 + +scim-skk (0.3.0-4) unstable; urgency=low + + * depends on libscim6c2. + + -- Ikuya Awashiro Mon, 18 Jul 2005 13:10:59 +0000 + +scim-skk (0.3.0-3) unstable; urgency=low + + * rebuild on gcc 4.0 + + -- Ikuya Awashiro Thu, 7 Jul 2005 12:31:23 +0900 + +scim-skk (0.3.0-2) unstable; urgency=low + + * debian/rules: enable dh_strip. + Thanks to Yukiharu Yabuki + + -- Ikuya Awashiro Sun, 3 Jul 2005 22:07:27 +0900 + +scim-skk (0.3.0-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Thu, 30 Jun 2005 13:34:17 +0000 + +scim-skk (0.2.1-2) unstable; urgency=low + + * debian/control: Build-Depends and Depends changed for SCIM 1.2.x. + + -- Ikuya Awashiro Mon, 6 Jun 2005 23:02:14 +0900 + +scim-skk (0.2.1-1) unstable; urgency=low + + * New upstream release + * debian/patches/00list: + Delete 20_scim-skk-hidePreeditStringFix3.dpatch. + This version contains this patch. + * debian/rules: add option "--disable-rpath" to configure. + + -- Ikuya Awashiro Mon, 30 May 2005 18:14:13 +0900 + +scim-skk (0.2.0-3) unstable; urgency=low + + * debian/control: add autotools-dev to Build-depends. + * debian/patches/10_scim-plugin-module-install-dir.dpatch: + fixed SetupUI files are misplaced probrem. + * po/stamp-po: delete. + * debian/docs: delete NEWS. + above all Thanks to Mike Hommey + * debian/control: add scim (<< 1.1) to Depends. + This binary is for 1.0.x only. + + -- Ikuya Awashiro Sun, 15 May 2005 15:07:37 +0000 + +scim-skk (0.2.0-2) unstable; urgency=low + + * debian/02_scim-skk-hidePreeditStringFix3.dpatch + by Teppei Tamra + + -- Ikuya Awashiro Sun, 15 May 2005 01:45:25 +0900 + +scim-skk (0.2.0-1) unstable; urgency=low + + * New upstream release + * debian/control: add libgtk2.0-dev to Build-Depends. + + -- Ikuya Awashiro Tue, 19 Apr 2005 22:33:59 +0900 + +scim-skk (0.1.2-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Mon, 10 Jan 2005 09:38:17 +0900 + +scim-skk (0.1.1-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Sun, 9 Jan 2005 00:31:15 +0900 + +scim-skk (0.1.0-1) unstable; urgency=low + + * Initial Release. + + -- Ikuya Awashiro Thu, 30 Dec 2004 23:21:57 +0900 + --- scim-skk-0.5.2.orig/debian/rules +++ scim-skk-0.5.2/debian/rules @@ -0,0 +1,117 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: configure +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-rpath + + +build: build-stamp + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + msgfmt -o po/ja.gmo po/ja.po + #docbook-to-man debian/scim-skk.sgml > scim-skk.1 + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + rm -f po/ja.gmo + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + rm -rf config.sub config.guess + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean + dh_installdirs + + # Add here commands to install the package into debian/scim-skk. + $(MAKE) install DESTDIR=$(CURDIR)/debian/scim-skk + mv $(CURDIR)/debian/scim-skk/usr/lib/scim-1.0/`pkg-config --variable=scim_binary_version scim`/IMEngine/skk.a \ + $(CURDIR)/debian/scim-skk/usr/lib/scim-1.0/`pkg-config --variable=scim_binary_version scim`/IMEngine/libskk.a + mv $(CURDIR)/debian/scim-skk/usr/lib/scim-1.0/`pkg-config --variable=scim_binary_version scim`/SetupUI/skk-imengine-setup.a \ + $(CURDIR)/debian/scim-skk/usr/lib/scim-1.0/`pkg-config --variable=scim_binary_version scim`/SetupUI/libskk-imengine-setup.a + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install patch unpatch --- scim-skk-0.5.2.orig/debian/docs +++ scim-skk-0.5.2/debian/docs @@ -0,0 +1,3 @@ +README +TODO +README.ja --- scim-skk-0.5.2.orig/debian/compat +++ scim-skk-0.5.2/debian/compat @@ -0,0 +1 @@ +7 --- scim-skk-0.5.2.orig/debian/control +++ scim-skk-0.5.2/debian/control @@ -0,0 +1,18 @@ +Source: scim-skk +Section: utils +Priority: optional +Maintainer: Ikuya Awashiro +Uploaders: Yukiharu YABUKI +Build-Depends: debhelper (>= 7.0.0), dpatch (>= 1.11), libscim-dev (>= 1.4.6), autotools-dev, pkg-config, libltdl-dev +Standards-Version: 3.9.1.0 +Homepage: http://scim-imengine.sourceforge.jp/ + +Package: scim-skk +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, skkdic | skkdic-extra | skkserv | dbskkd-cdb, scim (<< 1.5) +Description: SCIM IMEngine module like SKK input method + Smart Common Input Method platform (SCIM) is an input method server + and a development platform to make Input Method developers' lives + easier. + skk is simple and secure input method in Japanese. + scim-skk comes to be able to input it like skk. --- scim-skk-0.5.2.orig/debian/patches/10_scim-plugin-module-install-dir.dpatch +++ scim-skk-0.5.2/debian/patches/10_scim-plugin-module-install-dir.dpatch @@ -0,0 +1,49 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_scim-plugin-module-install-dir.dpatch by Ikuya Awashiro +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad scim-skk-0.2.0/src/Makefile.am /tmp/dpep.cbMysD/scim-skk-0.2.0/src/Makefile.am +--- scim-skk-0.2.0/src/Makefile.am 2005-05-15 14:55:12.615362040 +0000 ++++ /tmp/dpep.cbMysD/scim-skk-0.2.0/src/Makefile.am 2005-05-15 14:57:16.097589888 +0000 +@@ -15,7 +15,7 @@ + scim_skk_keybind.h \ + scim_skk_prefs.h + +-moduledir = @SCIM_MODULEDIR@/IMEngine ++moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/IMEngine + module_LTLIBRARIES = skk.la + + skk_la_SOURCES = \ +@@ -40,7 +40,7 @@ + SETUP_MODULE = skk-imengine-setup.la + endif + +-setupmoduledir = @SCIM_MODULEDIR@/SetupUI ++setupmoduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/SetupUI + setupmodule_LTLIBRARIES = $(SETUP_MODULE) + + skk_imengine_setup_la_SOURCES = scim_skk_imengine_setup.cpp +diff -urNad scim-skk-0.2.0/src/Makefile.in /tmp/dpep.cbMysD/scim-skk-0.2.0/src/Makefile.in +--- scim-skk-0.2.0/src/Makefile.in 2005-05-15 14:55:12.616361888 +0000 ++++ /tmp/dpep.cbMysD/scim-skk-0.2.0/src/Makefile.in 2005-05-15 14:57:55.294631032 +0000 +@@ -268,7 +268,7 @@ + scim_skk_keybind.h \ + scim_skk_prefs.h + +-moduledir = @SCIM_MODULEDIR@/IMEngine ++moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/IMEngine + module_LTLIBRARIES = skk.la + skk_la_SOURCES = \ + scim_skk_imengine.cpp \ +@@ -287,7 +287,7 @@ + @SCIM_LIBS@ + + @SCIM_BUILD_SETUP_TRUE@SETUP_MODULE = skk-imengine-setup.la +-setupmoduledir = @SCIM_MODULEDIR@/SetupUI ++setupmoduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/SetupUI + setupmodule_LTLIBRARIES = $(SETUP_MODULE) + skk_imengine_setup_la_SOURCES = scim_skk_imengine_setup.cpp + skk_imengine_setup_la_CFLAGS = @SCIM_GTKUTILS_CFLAGS@ @SCIM_CFLAGS@ @SCIM_DEBUG_FLAGS@ --- scim-skk-0.5.2.orig/debian/patches/02_scim_skk_dictionary.cpp.dpatch +++ scim-skk-0.5.2/debian/patches/02_scim_skk_dictionary.cpp.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_scim_skk_dictionary.cpp.dpatch by Ikuya Awashiro +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad scim-skk-0.5.2~/src/scim_skk_dictionary.cpp scim-skk-0.5.2/src/scim_skk_dictionary.cpp +--- scim-skk-0.5.2~/src/scim_skk_dictionary.cpp 2005-12-18 22:02:39.000000000 +0900 ++++ scim-skk-0.5.2/src/scim_skk_dictionary.cpp 2006-06-18 18:12:15.000000000 +0900 +@@ -543,9 +543,11 @@ + UserDict::write (const WideString &key, const CandPair &data) + { + list &cl = m_dictdata[key]; +- for (list::iterator it = cl.begin(); it != cl.end(); it++) { ++ for (list::iterator it = cl.begin(); it != cl.end();) { + if (it->first == data.first) { +- cl.erase(it); ++ it = cl.erase(it); ++ } else { ++ ++it; + } + } + cl.push_front(data); --- scim-skk-0.5.2.orig/debian/patches/20_gcc-4.3-fixes.dpatch +++ scim-skk-0.5.2/debian/patches/20_gcc-4.3-fixes.dpatch @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_gcc-4.3-fixes.dpatch by Cyril Brulebois +## +## DP: fix for building with gcc-4.3 (bug #455270) + +@DPATCH@ +diff -urNad scim-skk-0.5.2~/src/scim_skk_imengine_setup.cpp scim-skk-0.5.2/src/scim_skk_imengine_setup.cpp +--- scim-skk-0.5.2~/src/scim_skk_imengine_setup.cpp 2008-04-05 01:26:25.000000000 +0200 ++++ scim-skk-0.5.2/src/scim_skk_imengine_setup.cpp 2008-04-05 01:27:27.000000000 +0200 +@@ -32,6 +32,7 @@ + #endif + + #include ++#include + + #include + #include --- scim-skk-0.5.2.orig/debian/patches/01_error_check_to_cdb_get.dpatch +++ scim-skk-0.5.2/debian/patches/01_error_check_to_cdb_get.dpatch @@ -0,0 +1,48 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_error_check_to_cdb_get.dpatch by Ikuya Awashiro +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad scim-skk-0.5.2~/src/cdb.cpp scim-skk-0.5.2/src/cdb.cpp +--- scim-skk-0.5.2~/src/cdb.cpp 2005-11-11 20:05:51.000000000 +0900 ++++ scim-skk-0.5.2/src/cdb.cpp 2005-12-23 22:18:33.000000000 +0900 +@@ -70,14 +70,21 @@ + { + if (!m_open_flag) return false; + +- bool retval = false; +- unsigned int hash_val = calc_hash(key); +- unsigned int hashtbl_pos = get_value((hash_val % 256) * 2 * 4); +- unsigned int hashtbl_len = get_value((hash_val % 256) * 2 * 4 + 4); +- unsigned int entry_point = +- hashtbl_pos + ((hash_val / 256) % hashtbl_len) * 2 * 4; +- unsigned int entry_hashval = get_value(entry_point); +- unsigned int entry_pos = get_value(entry_point + 4); ++ unsigned int hash_val; /* hash value of key */ ++ unsigned int hashtbl_pos, hashtbl_len; /* position and length of ++ the hash table */ ++ unsigned int entry_point; /* position of the entry */ ++ unsigned int entry_hashval, entry_pos; /* hash value and position of ++ the entry */ ++ hash_val = calc_hash(key); ++ hashtbl_pos = get_value((hash_val % 256) * 2 * 4); ++ hashtbl_len = get_value((hash_val % 256) * 2 * 4 + 4); ++ if (hashtbl_len == 0) { /* there are no entries for the hash table */ ++ return false; ++ } ++ entry_point = hashtbl_pos + ((hash_val / 256) % hashtbl_len) * 2 * 4; ++ entry_hashval = get_value(entry_point); ++ entry_pos = get_value(entry_point + 4); + while (entry_pos != 0) { + if (entry_hashval == hash_val) { + int entry_keylen = get_value(entry_pos); +@@ -89,6 +96,7 @@ + } + } + entry_point += 8; ++ if (entry_point > m_size - 8) break; + entry_hashval = get_value(entry_point); + entry_pos = get_value(entry_point+4); + } --- scim-skk-0.5.2.orig/debian/patches/00list +++ scim-skk-0.5.2/debian/patches/00list @@ -0,0 +1,3 @@ +01_error_check_to_cdb_get +02_scim_skk_dictionary.cpp +20_gcc-4.3-fixes