Team upload: git snapshot 20120222;
* Team upload: git snapshot 20120222.
- fix breaks if LDFLAGS in environment contains
multiple words (Closese #646001).
- rm patches merged to upstream:
append-os-environ-toenv.patch
fix-ftbfs-on-sh.patch
remove-10-candidate-words-limitation.patch
- refresh disable-lm-dict-compile.patch.
* Bump stardard version to 3.9.3: no modify needed.
* add libsunpinyin3-dbg and python-sunpinyin packages.
* debian/compat to 9, multiarch it.
* rewrite debian/rules with dh 7 format.
YunQiang Su
12 years ago
0 | sunpinyin (2.0.3+git20120222-1) unstable; urgency=low | |
1 | ||
2 | * Team upload: git snapshot 20120222. | |
3 | - fix breaks if LDFLAGS in environment contains | |
4 | multiple words (Closese #646001). | |
5 | - rm patches merged to upstream: | |
6 | append-os-environ-toenv.patch | |
7 | fix-ftbfs-on-sh.patch | |
8 | remove-10-candidate-words-limitation.patch | |
9 | - refresh disable-lm-dict-compile.patch. | |
10 | * Bump stardard version to 3.9.3: no modify needed. | |
11 | * add libsunpinyin3-dbg and python-sunpinyin packages. | |
12 | * debian/compat to 9, multiarch it. | |
13 | * rewrite debian/rules with dh 7 format. | |
14 | ||
15 | -- YunQiang Su <wzssyqa@gmail.com> Fri, 30 Mar 2012 15:31:55 +0800 | |
16 | ||
0 | 17 | sunpinyin (2.0.3-5) unstable; urgency=low |
1 | 18 | |
2 | 19 | * Call dh_makeshlibs with -V, rather than dh_shlibdeps |
0 | doc/*.1 | |
1 | ||
2 | python/*.pyc | |
3 | python/importer/*.pyc | |
4 | config.log | |
5 | config.h | |
6 | .sconsign.dblite | |
7 | configure.conf | |
8 | sunpinyin-2.0.pc |
1 | 1 | Priority: optional |
2 | 2 | Maintainer: IME Packaging Team <pkg-ime-devel@lists.alioth.debian.org> |
3 | 3 | Uploaders: Liang Guo <bluestonechina@gmail.com> |
4 | Build-Depends: debhelper (>= 7.0.50~), scons, libsqlite3-dev, pkg-config, quilt (>= 0.46-8~) | |
5 | Standards-Version: 3.9.2 | |
4 | Build-Depends: debhelper (>= 9), scons, libsqlite3-dev, pkg-config, | |
5 | quilt (>= 0.46-8~), python-dev (>= 2.6.6-3~) | |
6 | Standards-Version: 3.9.3 | |
6 | 7 | Section: libs |
7 | 8 | DM-Upload-Allowed: yes |
8 | 9 | Homepage: http://code.google.com/p/sunpinyin |
23 | 24 | Package: libsunpinyin3 |
24 | 25 | Architecture: any |
25 | 26 | Depends: ${shlibs:Depends}, ${misc:Depends} |
27 | Pre-Depends: ${misc:Pre-Depends} | |
26 | 28 | Recommends: sunpinyin-data |
27 | 29 | Description: Simplified Chinese Input Method from SUN (runtime) |
28 | 30 | Sunpinyin is a statistical language model (SLM) based input method |
29 | 31 | engine for Simplified Chinese, it features full sentence input. |
30 | 32 | . |
31 | 33 | This package contains the runtime library. |
34 | ||
35 | Package: libsunpinyin3-dbg | |
36 | Priority: extra | |
37 | Architecture: any | |
38 | Depends: ${shlibs:Depends}, ${misc:Depends}, libsunpinyin3 (= ${binary:Version}) | |
39 | Section: debug | |
40 | Description: Simplified Chinese Input Method from SUN (debug) | |
41 | Sunpinyin is a statistical language model (SLM) based input method | |
42 | engine for Simplified Chinese, it features full sentence input. | |
43 | . | |
44 | This package contains the debug symbols of shared library. | |
45 | ||
46 | Package: python-sunpinyin | |
47 | Architecture: all | |
48 | Depends: ${python:Depends}, ${misc:Depends}, libsunpinyin3 | |
49 | Section: python | |
50 | Description: Simplified Chinese Input Method from SUN (python binding) | |
51 | Sunpinyin is a statistical language model (SLM) based input method | |
52 | engine for Simplified Chinese, it features full sentence input. | |
53 | . | |
54 | This package contains the python binding of sunpinyin. | |
32 | 55 | |
33 | 56 | Package: sunpinyin-utils |
34 | 57 | Section: utils |
0 | 0 | usr/include/* |
1 | usr/lib/lib*.so | |
2 | usr/lib/pkgconfig/* | |
1 | usr/lib/*/lib*.so | |
2 | usr/lib/*/pkgconfig/* |
0 | From: Mike <mikeandmore@gmail.com> | |
1 | Description: force some flags always on in linkflags | |
2 | ||
3 | * SConstruct: force some flags always on in linkflags | |
4 | ||
5 | Origin: upstream | |
6 | ||
7 | --- a/SConstruct | |
8 | +++ b/SConstruct | |
9 | @@ -180,12 +180,6 @@ | |
10 | libdatadir = env['LIBDATADIR'] + '/sunpinyin/data' | |
11 | headersdir = env['PREFIX'] + '/include/sunpinyin-2.0' | |
12 | ||
13 | -if GetOS() != 'Darwin': | |
14 | - env.Append(LINKFLAGS=['-Wl,-soname=libsunpinyin.so.%d' % abi_major]) | |
15 | - | |
16 | -if GetOption('rpath') is not None and GetOS() != 'Darwin': | |
17 | - env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath')) | |
18 | - | |
19 | # pass through environmental variables | |
20 | envvar = [('CC', 'CC'), | |
21 | ('CXX', 'CXX'), | |
22 | @@ -202,6 +196,12 @@ | |
23 | env.Append(CFLAGS=extra_cflags) | |
24 | env.Append(CXXFLAGS=extra_cflags) | |
25 | ||
26 | +if GetOS() != 'Darwin': | |
27 | + env.Append(LINKFLAGS=['-Wl,-soname=libsunpinyin.so.%d' % abi_major]) | |
28 | + | |
29 | +if GetOption('rpath') is not None and GetOS() != 'Darwin': | |
30 | + env.Append(LINKFLAGS=['-Wl,-R', '-Wl,%s' % GetOption('rpath')]) | |
31 | + | |
32 | # | |
33 | #==============================configure================================ | |
34 | # |
0 | 0 | Disable LM data and dictionary data compile, these data will be |
1 | 1 | in another package. |
2 | --- a/SConstruct | |
3 | +++ b/SConstruct | |
4 | @@ -350,12 +350,6 @@ | |
2 | Index: sunpinyin/SConstruct | |
3 | =================================================================== | |
4 | --- sunpinyin.orig/SConstruct 2012-03-30 15:49:08.623210295 +0800 | |
5 | +++ sunpinyin/SConstruct 2012-03-30 15:49:14.659240221 +0800 | |
6 | @@ -367,12 +367,6 @@ | |
5 | 7 | lib = env.SharedLibrary('sunpinyin-%d.%d' % (abi_major, abi_minor), |
6 | 8 | source=imesource) |
7 | 9 | |
14 | 16 | if GetOption('clean'): |
15 | 17 | os.environ['TAR'] = env['TAR'] |
16 | 18 | os.environ['MAKE'] = env['MAKE'] |
17 | @@ -384,9 +378,7 @@ | |
19 | @@ -401,9 +395,7 @@ | |
18 | 20 | |
19 | 21 | lib_pkgconfig_target = env.Install(libdir+'/pkgconfig', |
20 | 22 | ['sunpinyin-2.0.pc']) |
0 | Fix FTBFS on SuperH platform, thanks to Nobuhiro Iwamatsu. | |
1 | --- a/SConstruct | |
2 | +++ b/SConstruct | |
3 | @@ -230,7 +230,7 @@ | |
4 | || defined(_POWER) || defined(__powerpc__) \ | |
5 | || defined(__ppc__) || defined(__hpux) || defined(__hppa) \ | |
6 | || defined(_MIPSEB) || defined(_POWER) \ | |
7 | - || defined(__s390__) | |
8 | + || defined(__s390__) || (defined(__sh__) && defined(__BIG_ENDIAN__)) | |
9 | # define WORDS_BIGENDIAN 1 | |
10 | ||
11 | #elif defined(__i386__) || defined(__i386) \ | |
12 | @@ -240,7 +240,8 @@ | |
13 | || defined(__amd64__) || defined(_M_AMD64) \ | |
14 | || defined(__x86_64) || defined(__x86_64__) \ | |
15 | || defined(_M_X64) || defined(__bfin__) \ | |
16 | - || defined(__alpha__) || defined(__ARMEL__) | |
17 | + || defined(__alpha__) || defined(__ARMEL__) \ | |
18 | + || (defined(__sh__) && defined(__LITTLE_ENDIAN__)) | |
19 | # undef WORDS_BIGENDIAN | |
20 | ||
21 | #else |
0 | From: Weng Xuetian <wengxt@gmail.com> | |
1 | Description: remove 10 candidate words limitation | |
2 | Origin: vendor, https://github.com/sunpinyin/sunpinyin/commit/ecd26da914d672193149af651d6f01647fde7f88 | |
3 | ||
4 | --- a/src/ime-core/imi_view.h | |
5 | +++ b/src/ime-core/imi_view.h | |
6 | @@ -188,7 +188,7 @@ | |
7 | CIMIWinHandler* getWinHandler(void) {return m_pWinHandler;} | |
8 | ||
9 | void setHotkeyProfile (CHotkeyProfile *prof) { m_pHotkeyProfile = prof;} | |
10 | - void setCandiWindowSize (unsigned size) {m_candiWindowSize = size<10? size: 10;} | |
11 | + void setCandiWindowSize (unsigned size) {m_candiWindowSize = size;} | |
12 | CHotkeyProfile* getHotkeyProfile() { return m_pHotkeyProfile; } | |
13 | unsigned getCandiWindowSize() { return m_candiWindowSize; } | |
14 |
0 | append-os-environ-toenv.patch | |
0 | strndup_in_cxx.patch | |
1 | 1 | disable-lm-dict-compile.patch |
2 | fix-ftbfs-on-sh.patch | |
3 | fix-ftbfs-on-mipsel.patch | |
4 | remove-10-candidate-words-limitation.patch |
0 | Index: sunpinyin/src/portability.cpp | |
1 | =================================================================== | |
2 | --- sunpinyin.orig/src/portability.cpp 2012-03-30 17:55:51.000000000 +0800 | |
3 | +++ sunpinyin/src/portability.cpp 2012-03-30 17:59:24.869968967 +0800 | |
4 | @@ -265,26 +265,4 @@ | |
5 | return sz; | |
6 | } | |
7 | ||
8 | -#if !defined (HAVE_STRNDUP) | |
9 | -extern "C" char * | |
10 | -strndup(const char *s, size_t n) | |
11 | -{ | |
12 | - size_t nMost; | |
13 | - char *p = NULL; | |
14 | - | |
15 | - if (!s) | |
16 | - return NULL; | |
17 | - | |
18 | -#ifdef __cplusplus | |
19 | - nMost = std::min(strlen(s) + 1, n + 1); | |
20 | -#else | |
21 | - nMost = min(strlen(s) + 1, n + 1); | |
22 | -#endif | |
23 | - p = (char*)malloc(nMost); | |
24 | - memcpy(p, s, nMost); | |
25 | - p[nMost - 1] = '\0'; | |
26 | - | |
27 | - return p; | |
28 | -} | |
29 | -#endif //HAVE_STRNDUP | |
30 | ||
31 | Index: sunpinyin/src/portability.h | |
32 | =================================================================== | |
33 | --- sunpinyin.orig/src/portability.h 2012-03-30 17:55:51.000000000 +0800 | |
34 | +++ sunpinyin/src/portability.h 2012-03-30 18:01:23.390556674 +0800 | |
35 | @@ -326,8 +326,4 @@ | |
36 | } | |
37 | #endif | |
38 | ||
39 | -#if !defined (HAVE_STRNDUP) | |
40 | -extern "C" char *strndup(const char *s, size_t n); | |
41 | -#endif //HAVE_STRNDUP | |
42 | - | |
43 | #endif |
0 | python/* /usr/share/pyshared/sunpinyin/ |
0 | 0 | #!/usr/bin/make -f |
1 | # Sample debian/rules that uses debhelper. | |
2 | # GNU copyright 1997 to 1999 by Joey Hess. | |
3 | # | |
4 | # Modified for sunpinyin package by | |
1 | export DH_VERBOSE=1 | |
5 | 2 | # Liang Guo <bluestonechina@gmail.com> 2010 |
3 | # YunQiang Su <wzssyqa@gmail.com>, 2012 | |
4 | ||
5 | DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) | |
6 | 6 | |
7 | 7 | SCONS=scons |
8 | 8 | POD2MAN=pod2man |
9 | 9 | PROGS=genpyt idngram_merge slminfo slmseg tslminfo getWordFreq ids2ngram \ |
10 | 10 | mmseg slmbuild slmprune slmthread tslmendian tslmpack |
11 | 11 | |
12 | ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) | |
13 | CXXFLAGS += -g | |
14 | endif | |
12 | %: | |
13 | dh $@ --with python2 | |
15 | 14 | |
16 | CXXFLAGS += -pipe | |
15 | override_dh_auto_clean: | |
16 | dh_auto_clean | |
17 | scons -c . | |
18 | rm -rf .sconf_temp | |
17 | 19 | |
18 | build: build-arch build-indep | |
19 | build-arch: build-stamp | |
20 | build-indep: build-stamp | |
21 | build-stamp: | |
22 | dh_quilt_patch | |
23 | -$(SCONS) --prefix=$(DEB_DESTDIR)/usr | |
20 | override_dh_auto_build: | |
21 | $(SCONS) --prefix=/usr --libdir=/usr/lib/${DEB_HOST_MULTIARCH}/ --libdatadir=/usr/lib/${DEB_HOST_MULTIARCH} | |
24 | 22 | for p in $(PROGS); do $(POD2MAN) --section 1 doc/$$p.pod > doc/$$p.1; done |
25 | touch build-stamp | |
23 | ||
24 | override_dh_auto_install: | |
25 | $(SCONS) install --install-sandbox=debian/tmp | |
26 | for p in $(PROGS); do install -D -m 0755 build/$$p $(CURDIR)/debian/tmp/usr/bin/$$p; done | |
26 | 27 | |
27 | clean: clean-patched | |
28 | clean-patched: | |
29 | dh_testdir | |
30 | dh_testroot | |
31 | -$(SCONS) -c | |
32 | -rm -r config.log config.h \ | |
33 | .sconf_temp .sconsign.dblite \ | |
34 | configure.conf sunpinyin-2.0.pc | |
35 | -for p in $(PROGS); do rm doc/$$p.1; done | |
36 | dh_quilt_unpatch | |
37 | dh_clean | |
28 | override_dh_install: | |
29 | dh_install --fail-missing | |
30 | rm -f debian/tmp/python-sunpinyin/usr/share/pyshared/sunpinyin/setup.py | |
38 | 31 | |
39 | install: install-stamp | |
40 | install-stamp: build-stamp | |
41 | dh_testdir | |
42 | dh_testroot | |
43 | dh_prep | |
44 | dh_installdirs | |
45 | -$(SCONS) install --prefix=$(DEB_DESTDIR)/usr --install-sandbox=debian/tmp | |
46 | -for p in $(PROGS); do install -D -m 0755 build/$$p $(CURDIR)/debian/tmp/usr/bin/$$p; done | |
47 | mkdir -p $(CURDIR)/debian/tmp/usr/share/sunpinyin/ | |
48 | cp -r python $(CURDIR)/debian/tmp/usr/share/sunpinyin/ | |
49 | dh_install --sourcedir=debian/tmp --fail-missing | |
50 | touch install-stamp | |
51 | ||
52 | binary-arch: build install | |
53 | dh_testdir | |
54 | dh_testroot | |
55 | dh_installchangelogs | |
56 | dh_installdocs | |
57 | dh_installexamples | |
58 | dh_installman | |
59 | dh_link | |
32 | override_dh_strip: | |
33 | dh_strip -plibsunpinyin3 --dbg-package=libsunpinyin3-dbg | |
60 | 34 | dh_strip |
61 | dh_compress | |
62 | dh_fixperms | |
63 | dh_makeshlibs -V | |
64 | dh_installdeb | |
65 | dh_shlibdeps | |
66 | dh_gencontrol | |
67 | dh_md5sums | |
68 | dh_builddeb | |
69 | ||
70 | # Build architecture-independent files here. | |
71 | binary-indep: build install | |
72 | # We have nothing to do by default. | |
73 | ||
74 | binary: binary-indep binary-arch | |
75 | .PHONY: build clean binary-indep binary-arch binary install | |
76 |