Imported Debian patch 0.11~svn13-1
Nobuhiro Iwamatsu authored 13 years ago
iwamatsu committed 13 years ago
0 | mozc source package infomation | |
1 | ||
2 | - about patch system | |
3 | The source package uses quilt to manage all modifications to the upstream | |
4 | source. Changes are stored in the source package as diffs in debian/patches | |
5 | and applied during the build. | |
6 | ||
7 | See /usr/share/doc/quilt/README.source for a detailed explanation. | |
8 | ||
9 | - Remove source code | |
10 | mozc debian source package deletes some source codes. | |
11 | ||
12 | The deleted source code is the following directories. | |
13 | * ./protobuf | |
14 | * ./third_party/gtest/ | |
15 | ||
16 | These have already become Debian pakcage and are not necessary. | |
17 | * protobuf | |
18 | http://packages.qa.debian.org/p/protobuf.html | |
19 | * gtest | |
20 | http://packages.qa.debian.org/g/gtest.html | |
21 | ||
22 | -- Nobuhiro Iwamatsu <iwamatsu@debian.org> Fri, 14 May 2010 06:34:06 +0900 |
0 | mozc (0.11~svn13-1) unstable; urgency=low | |
1 | ||
2 | * Initial release (Closes: #581158) | |
3 | ||
4 | -- Nobuhiro Iwamatsu <iwamatsu@debian.org> Wed, 12 May 2010 05:34:49 +0900 |
0 | 7 |
0 | Source: mozc | |
1 | Section: utils | |
2 | Priority: optional | |
3 | Maintainer: Nobuhiro Iwamatsu <iwamatsu@debian.org> | |
4 | Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~), | |
5 | libibus-dev (>= 1.2), libcurl4-openssl-dev, gyp, pkg-config, | |
6 | python-dev, gyp (>=0.1~svn824), protobuf-compiler, libgtest-dev, | |
7 | libprotobuf-dev | |
8 | Standards-Version: 3.8.4 | |
9 | Homepage: http://code.google.com/p/mozc/ | |
10 | ||
11 | Package: ibus-mozc | |
12 | Architecture: any | |
13 | Depends: ${misc:Depends}, ${shlibs:Depends}, ibus (>= 1.2) | |
14 | Description: Mozc engine for IBus | |
15 | IBus is an Intelligent Input Bus. It is a new input framework for Linux OS. | |
16 | It provides full featured and user friendly input method user interface. | |
17 | It also may help developers to develop input method easily. | |
18 | . | |
19 | IBus-Mozc is a Japanese Input Method Editor (IME) designed for multi-platform | |
20 | such as Chromium OS, Windows, Mac and Linux. | |
21 | . | |
22 | This open-source project originates from Google Japanese Input. |
0 | This work was packaged for Debian by: | |
1 | ||
2 | Nobuhiro Iwamatsu <iwamatsu@debian.org> on Wed, 12 May 2010 05:34:49 +0900 | |
3 | ||
4 | It was downloaded from http://code.google.com/p/mozc/ | |
5 | ||
6 | Upstream Author: | |
7 | ||
8 | Copyright 2010, Google Inc. | |
9 | All rights reserved. | |
10 | ||
11 | Copyright: | |
12 | ||
13 | Copyright 2010, Google Inc. | |
14 | All rights reserved. | |
15 | ||
16 | - third_party/rx | |
17 | Copyright (c) 2008 (tabata.yusuke@gmail.com) | |
18 | ||
19 | - data/unicode/* | |
20 | Copyright (c) 1991-1999 Unicode, Inc. | |
21 | ||
22 | License: | |
23 | - mozc | |
24 | License: BSD license | |
25 | ||
26 | Redistribution and use in source and binary forms, with or without | |
27 | modification, are permitted provided that the following conditions are | |
28 | met: | |
29 | ||
30 | * Redistributions of source code must retain the above copyright | |
31 | notice, this list of conditions and the following disclaimer. | |
32 | * Redistributions in binary form must reproduce the above | |
33 | copyright notice, this list of conditions and the following disclaimer | |
34 | in the documentation and/or other materials provided with the | |
35 | distribution. | |
36 | * Neither the name of Google Inc. nor the names of its | |
37 | contributors may be used to endorse or promote products derived from | |
38 | this software without specific prior written permission. | |
39 | ||
40 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | |
41 | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | |
42 | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | |
43 | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | |
44 | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |
45 | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | |
46 | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
47 | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
48 | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
49 | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | |
50 | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
51 | ||
52 | - rx | |
53 | source: third_party/rx | |
54 | License: Apache License Version 2.0 | |
55 | ||
56 | - base/scoped_ptr.h | |
57 | License: Boost Software License - Version 1.0 | |
58 | ||
59 | - data/unicode/* | |
60 | License: | |
61 | ||
62 | (copy from http://unicode.org/copyright.html) | |
63 | UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE | |
64 | ||
65 | Unicode Data Files include all data files under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/ . Unicode Software includes any source code published in the Unicode Standard or under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/. | |
66 | ||
67 | NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE. | |
68 | ||
69 | COPYRIGHT AND PERMISSION NOTICE | |
70 | ||
71 | Copyright © 1991-2010 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. | |
72 | ||
73 | Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified. | |
74 | ||
75 | THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE. | |
76 | ||
77 | Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. | |
78 | ||
79 | The Debian packaging is: | |
80 | ||
81 | Copyright (C) 2010 Nobuhiro Iwamatsu <iwamatsu@debian.org> |
0 | # Change two_pass_build. | |
1 | # This patch is suitable workaround. | |
2 | ||
3 | --- a/build_mozc.py 2010-05-13 05:44:19.000000000 +0900 | |
4 | +++ b/build_mozc.py 2010-05-13 05:44:36.000000000 +0900 | |
5 | @@ -268,8 +268,7 @@ | |
6 | '--no-circular-check', | |
7 | '--depth=.', | |
8 | '--include=%s/gyp/common.gypi' % SRC_DIR] | |
9 | - if options.onepass: | |
10 | - command_line.extend(['-D', 'two_pass_build=0']) | |
11 | + command_line.extend(['-D', 'two_pass_build=1']) | |
12 | command_line.extend(gyp_file_names) | |
13 | ||
14 | if options.branding: |
0 | # Copyright 2010 Nobuhiro Iwamatsu <iwamatsu@debian.org> | |
1 | # | |
2 | # Change to use the debian package | |
3 | ||
4 | --- a/build_mozc.py 2010-05-11 05:06:46.000000000 +0900 | |
5 | +++ b/build_mozc.py 2010-05-11 05:07:33.000000000 +0900 | |
6 | @@ -256,7 +256,8 @@ | |
7 | for file_name in gyp_file_names: | |
8 | print '- %s' % file_name | |
9 | # We use the one in mozc_build_tools/gyp | |
10 | - gyp_script = 'mozc_build_tools/gyp/gyp' | |
11 | + #gyp_script = 'mozc_build_tools/gyp/gyp' | |
12 | + gyp_script = '/usr/bin/gyp' | |
13 | # If we don't have a copy of gyp, download it. | |
14 | if not os.path.isfile(gyp_script): | |
15 | # SVN creates mozc_build_tools directory if it's not present. |
0 | --- a/unix/ibus/ibus.gyp 2010-05-13 05:11:01.000000000 +0900 | |
1 | +++ b/unix/ibus/ibus.gyp 2010-05-13 05:12:45.000000000 +0900 | |
2 | @@ -51,21 +51,13 @@ | |
3 | '../../usage_stats/usage_stats.gyp:usage_stats', | |
4 | ], | |
5 | 'ibus_include_dirs': [ | |
6 | - '<(sysroot)/usr/include/dbus-1.0', | |
7 | - '<(sysroot)/usr/include/glib-2.0', | |
8 | - '<(sysroot)/usr/include/ibus-1.0', | |
9 | - '<(sysroot)/usr/lib/dbus-1.0/include', | |
10 | - '<(sysroot)/usr/lib/glib-2.0/include' | |
11 | + ' <!@(pkg-config --cflags-only-I ibus-1.0)' | |
12 | ], | |
13 | 'ibus_libraries': [ | |
14 | - '-lcurl', | |
15 | - '-ldbus-1', | |
16 | - '-lglib-2.0', | |
17 | - '-lgobject-2.0', | |
18 | - '-libus', | |
19 | + ' <!@(pkg-config --libs ibus-1.0)' | |
20 | ], | |
21 | 'ibus_ldflags': [ | |
22 | - '-L<(sysroot)/usr/lib', | |
23 | + ' <!@(pkg-config --libs-only-L ibus-1.0)' | |
24 | ], | |
25 | }, | |
26 | 'targets': [ |
0 | # Copyright Nobuhiro Iwamatsu <iwamatsu@debian.org> | |
1 | # | |
2 | # Disable protbuf build and replace to debian package | |
3 | ||
4 | --- a/build_tools/primitive_tools/primitive_tools.gyp 2010-05-12 05:03:47.000000000 +0900 | |
5 | +++ b/build_tools/primitive_tools/primitive_tools.gyp 2010-05-12 05:03:57.000000000 +0900 | |
6 | @@ -39,7 +39,6 @@ | |
7 | 'dependencies': [ | |
8 | '../../converter/converter.gyp:install_gen_pos_data_main', | |
9 | '../../prediction/prediction.gyp:install_gen_suggestion_filter_main', | |
10 | - '../../protobuf/protobuf.gyp:install_protoc', | |
11 | ], | |
12 | }, | |
13 | ], | |
14 | --- a/usage_stats/usage_stats.gyp 2010-05-13 06:49:56.000000000 +0900 | |
15 | +++ b/usage_stats/usage_stats.gyp 2010-05-13 06:50:03.000000000 +0900 | |
16 | @@ -42,7 +42,6 @@ | |
17 | 'usage_stats.cc', | |
18 | ], | |
19 | 'dependencies': [ | |
20 | - '../protobuf/protobuf.gyp:protobuf', | |
21 | '../base/base.gyp:base', | |
22 | '../net/net.gyp:net', | |
23 | '../storage/storage.gyp:storage', | |
24 | --- a/ipc/ipc.gyp 2010-05-13 06:48:53.000000000 +0900 | |
25 | +++ b/ipc/ipc.gyp 2010-05-13 06:49:14.000000000 +0900 | |
26 | @@ -47,7 +47,6 @@ | |
27 | 'win32_ipc.cc', | |
28 | ], | |
29 | 'dependencies': [ | |
30 | - '../protobuf/protobuf.gyp:protobuf', | |
31 | '../base/base.gyp:base', | |
32 | 'genproto_ipc', | |
33 | ], | |
34 | --- a/session/session.gyp 2010-05-13 06:56:40.000000000 +0900 | |
35 | +++ b/session/session.gyp 2010-05-13 06:56:55.000000000 +0900 | |
36 | @@ -50,7 +50,6 @@ | |
37 | 'session_watch_dog.cc', | |
38 | ], | |
39 | 'dependencies': [ | |
40 | - '../protobuf/protobuf.gyp:protobuf', | |
41 | '../base/base.gyp:base', | |
42 | '../client/client.gyp:client', | |
43 | '../composer/composer.gyp:composer', | |
44 | @@ -131,7 +130,6 @@ | |
45 | '<(proto_out_dir)/<(relative_dir)/state.pb.cc', | |
46 | ], | |
47 | 'dependencies': [ | |
48 | - '../protobuf/protobuf.gyp:protobuf', | |
49 | 'genproto_session' | |
50 | ], | |
51 | }, | |
52 | --- a/gyp/common.gypi 2010-05-13 06:24:09.000000000 +0900 | |
53 | +++ b/gyp/common.gypi 2010-05-13 06:24:32.000000000 +0900 | |
54 | @@ -288,7 +288,7 @@ | |
55 | '<(DEPTH)/third_party/breakpad/src', | |
56 | '<(SHARED_INTERMEDIATE_DIR)', | |
57 | '<(SHARED_INTERMEDIATE_DIR)/proto_out', | |
58 | - '../protobuf/files/src', | |
59 | + '/usr/include', | |
60 | ], | |
61 | 'conditions': [ | |
62 | ['OS=="win"', { | |
63 | --- a/unix/ibus/ibus.gyp 2010-05-13 05:00:43.000000000 +0900 | |
64 | +++ b/unix/ibus/ibus.gyp 2010-05-13 06:03:06.000000000 +0900 | |
65 | @@ -54,7 +54,8 @@ | |
66 | ' <!@(pkg-config --cflags-only-I ibus-1.0)' | |
67 | ], | |
68 | 'ibus_libraries': [ | |
69 | - ' <!@(pkg-config --libs ibus-1.0)' | |
70 | + ' <!@(pkg-config --libs ibus-1.0)', | |
71 | + '/usr/lib/libprotobuf.a', | |
72 | ], | |
73 | 'ibus_ldflags': [ | |
74 | ' <!@(pkg-config --libs-only-L ibus-1.0)' |
0 | # Copyright Nobuhiro Iwamatsu <iwamatsu@debian.org> | |
1 | # | |
2 | # Change to use the debian package | |
3 | ||
4 | --- a/dictionary/dictionary.gyp 2010-05-12 05:12:21.000000000 +0900 | |
5 | +++ b/dictionary/dictionary.gyp 2010-05-12 05:14:25.000000000 +0900 | |
6 | @@ -105,7 +105,7 @@ | |
7 | 'action': [ | |
8 | 'python', '../build_tools/run_after_chdir.py', | |
9 | '<(DEPTH)', | |
10 | - '<(relative_dir)/<(mozc_build_tools_dir)/protoc<(EXECUTABLE_SUFFIX)', | |
11 | + 'protoc<(EXECUTABLE_SUFFIX)', | |
12 | '<(relative_dir)/<(RULE_INPUT_NAME)', | |
13 | '--cpp_out=<(proto_out_dir)', | |
14 | ], | |
15 | --- a/session/session.gyp 2010-05-12 05:13:56.000000000 +0900 | |
16 | +++ b/session/session.gyp 2010-05-12 05:14:16.000000000 +0900 | |
17 | @@ -114,7 +114,7 @@ | |
18 | 'action': [ | |
19 | 'python', '../build_tools/run_after_chdir.py', | |
20 | '<(DEPTH)', | |
21 | - '<(relative_dir)/<(mozc_build_tools_dir)/protoc<(EXECUTABLE_SUFFIX)', | |
22 | + 'protoc<(EXECUTABLE_SUFFIX)', | |
23 | '<(relative_dir)/<(RULE_INPUT_NAME)', | |
24 | '--cpp_out=<(proto_out_dir)', | |
25 | ], | |
26 | --- a/ipc/ipc.gyp 2010-05-11 05:40:51.000000000 +0900 | |
27 | +++ b/ipc/ipc.gyp 2010-05-12 05:15:18.000000000 +0900 | |
28 | @@ -78,7 +78,7 @@ | |
29 | 'action': [ | |
30 | 'python', '../build_tools/run_after_chdir.py', | |
31 | '<(DEPTH)', | |
32 | - '<(relative_dir)/<(mozc_build_tools_dir)/protoc<(EXECUTABLE_SUFFIX)', | |
33 | + 'protoc<(EXECUTABLE_SUFFIX)', | |
34 | '<(relative_dir)/<(RULE_INPUT_NAME)', | |
35 | '--cpp_out=<(proto_out_dir)', | |
36 | ], | |
37 | --- a/prediction/prediction.gyp 2010-05-12 05:15:46.000000000 +0900 | |
38 | +++ b/prediction/prediction.gyp 2010-05-12 05:15:58.000000000 +0900 | |
39 | @@ -169,7 +169,7 @@ | |
40 | 'action': [ | |
41 | 'python', '../build_tools/run_after_chdir.py', | |
42 | '<(DEPTH)', | |
43 | - '<(relative_dir)/<(mozc_build_tools_dir)/protoc<(EXECUTABLE_SUFFIX)', | |
44 | + 'protoc<(EXECUTABLE_SUFFIX)', | |
45 | '<(relative_dir)/<(RULE_INPUT_NAME)', | |
46 | '--cpp_out=<(proto_out_dir)', | |
47 | ], | |
48 | --- a/usage_stats/usage_stats.gyp 2010-05-12 05:22:07.000000000 +0900 | |
49 | +++ b/usage_stats/usage_stats.gyp 2010-05-12 05:22:21.000000000 +0900 | |
50 | @@ -97,7 +97,7 @@ | |
51 | 'action': [ | |
52 | 'python', '../build_tools/run_after_chdir.py', | |
53 | '<(DEPTH)', | |
54 | - '<(relative_dir)/<(mozc_build_tools_dir)/protoc<(EXECUTABLE_SUFFIX)', | |
55 | + 'protoc<(EXECUTABLE_SUFFIX)', | |
56 | '<(relative_dir)/<(RULE_INPUT_NAME)', | |
57 | '--cpp_out=<(proto_out_dir)', | |
58 | ], |
0 | diff --git a/testing/base/public/gunit_prod.h b/testing/base/public/gunit_prod.h | |
1 | index 3077667..fe051f2 100755 | |
2 | --- a/testing/base/public/gunit_prod.h | |
3 | +++ b/testing/base/public/gunit_prod.h | |
4 | @@ -30,6 +30,6 @@ | |
5 | #ifndef MOZC_TESTING_BASE_PUBLIC_GUNIT_PROD_H_ | |
6 | #define MOZC_TESTING_BASE_PUBLIC_GUNIT_PROD_H_ | |
7 | ||
8 | -#include "third_party/gtest/include/gtest/gtest_prod.h" | |
9 | +#include "gtest/gtest_prod.h" | |
10 | ||
11 | #endif // MOZC_TESTING_BASE_PUBLIC_GUNIT_PROD_H_ |
0 | build.patch | |
1 | ibus_pkgconfig.patch | |
2 | gyp.patch | |
3 | protobuf.patch | |
4 | protoc.patch | |
5 | remove_gtest.patch |
0 | #!/usr/bin/make -f | |
1 | # -*- makefile -*- | |
2 | # | |
3 | BUILD_DIR=./out | |
4 | TARGETS=unix/ibus/ibus.gyp:ibus_mozc | |
5 | ||
6 | %: | |
7 | dh --with quilt $@ | |
8 | ||
9 | override_dh_auto_configure: | |
10 | python build_mozc.py gyp | |
11 | python build_mozc.py build_tools -c Release | |
12 | ||
13 | override_dh_auto_build: | |
14 | python build_mozc.py build $(TARGETS) -c Release | |
15 | ||
16 | override_dh_auto_clean: | |
17 | python build_mozc.py clean | |
18 | rm -rf build_tools/__init__.pyc | |
19 | rm -rf build_tools/mozc_version.pyc | |
20 | ||
21 | override_dh_auto_install: | |
22 | mkdir -p $(CURDIR)/debian/ibus-mozc/usr/lib/ibus-mozc/ | |
23 | cp -p $(BUILD_DIR)/Release/ibus_mozc $(CURDIR)/debian/ibus-mozc/usr/lib/ibus-mozc/ibus-engine-mozc | |
24 | mkdir -p $(CURDIR)/debian/ibus-mozc/usr/share/ibus/component/ | |
25 | sed 's|/usr/libexec/ibus-engine-mozc|/usr/lib/ibus-mozc/ibus-engine-mozc|' < unix/ibus/mozc.xml > $(CURDIR)/debian/ibus-mozc/usr/share/ibus/component/mozc.xml |
0 | 3.0 (quilt) |