Merge branch 'master' into el6

.gitignore

@@ -4,3 +4,4 @@
 /ibus-table-chinese-1.3.4-Source.tar.gz
 /ibus-table-chinese-1.3.5-Source.tar.gz
 /ibus-table-chinese-1.4.0-Source.tar.gz
+/ibus-table-chinese-1.4.2-Source.tar.gz

ibus-table-chinese.spec

@@ -3,7 +3,7 @@
 %global ibus_icons_dir %{_datadir}/ibus-table/icons
 %global createdb ibus-table-createdb
 Name:       ibus-table-chinese
-Version:    1.4.0
+Version:    1.4.2
 Release:    1%{?dist}
 Summary:    Chinese input tables for IBus
 Summary(zh_CN): 中文码表输入法
@@ -315,7 +315,7 @@ YongMa input method.
 %__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT
 # We install document using %doc
-(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-table-chinese-1.4.0
+(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-table-chinese-1.4.2
     %__rm -rf AUTHORS README ChangeLog COPYING README
 )
 
@@ -451,6 +451,16 @@ YongMa input method.
 
 
 %changelog
+* Mon Nov 26 2012 Ding-Yi Chen <dchen@redhat.com> - 1.4.2-1
+- Table build scripts has been refactored.
+- cmake-fedora is added as submodule.
+- Fixed Bug 855250 - Change the default filtering for Quick and Cangjie by
+  merging maxiaojun's repository
+- Fixed Google Issue 1405: failed to build ibus-table-chinese due to missing db files
+- Fixed Google issue 1507: Add CJKV Extension C/D support for Array30
+- Merge GitHub Pull request 3: Added the inter punct
+- Merge GitHub Pull request 4: Give Cangjie and Quick users 9 candidates per page
+
 * Fri Sep 07 2012 Ding-Yi Chen <dchen@redhat.com> - 1.4.0-1
 - Table build scripts has been refactored.
 - cmake-fedora is added as submodule.

sources

@@ -1 +1 @@
-f65ce1bb41eb90e7ecc122b7d34df776  ibus-table-chinese-1.4.0-Source.tar.gz
+1866c8bc90d5ef161a058709f22ecbe5  ibus-table-chinese-1.4.2-Source.tar.gz