diff -u scim-pinyin-0.5.91/debian/patches/00list scim-pinyin-0.5.91/debian/patches/00list --- scim-pinyin-0.5.91/debian/patches/00list +++ scim-pinyin-0.5.91/debian/patches/00list @@ -2,0 +3 @@ +02smartpinyinui.cpp-typo.dpatch diff -u scim-pinyin-0.5.91/debian/changelog scim-pinyin-0.5.91/debian/changelog --- scim-pinyin-0.5.91/debian/changelog +++ scim-pinyin-0.5.91/debian/changelog @@ -1,3 +1,10 @@ +scim-pinyin (0.5.91-0ubuntu13) intrepid; urgency=low + + * Add 02smartpinyinui.cpp-typo.dpatch to correct spelling + of "combine" in skim/setupui/smartpinyinui.cpp (LP: #63515) + + -- Nathan Handler Wed, 02 Jul 2008 16:44:26 -0500 + scim-pinyin (0.5.91-0ubuntu12) gutsy; urgency=low * Fix build failure if the build target is run without running only in patch2: unchanged: --- scim-pinyin-0.5.91.orig/debian/patches/02smartpinyinui.cpp-typo.dpatch +++ scim-pinyin-0.5.91/debian/patches/02smartpinyinui.cpp-typo.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02smartpinyinui.cpp-typo.dpatch by Nathan Handler +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad scim-pinyin-0.5.91~/skim/setupui/smartpinyinui.cpp scim-pinyin-0.5.91/skim/setupui/smartpinyinui.cpp +--- scim-pinyin-0.5.91~/skim/setupui/smartpinyinui.cpp 2005-08-06 11:23:58.000000000 -0500 ++++ scim-pinyin-0.5.91/skim/setupui/smartpinyinui.cpp 2008-07-02 16:39:59.000000000 -0500 +@@ -397,7 +397,7 @@ + void SmartPinyinSettingUI::languageChange() + { + setCaption( tr2i18n( "Smart Pinyin" ) ); +- kcfg__IMEngine_Pinyin_AutoCombinePhrase->setText( tr2i18n( "Auto &combin phrase" ) ); ++ kcfg__IMEngine_Pinyin_AutoCombinePhrase->setText( tr2i18n( "Auto &combine phrase" ) ); + kcfg__IMEngine_Pinyin_AutoFillPreedit->setText( tr2i18n( "Auto &fill preedit" ) ); + kcfg__IMEngine_Pinyin_MatchLongerPhrase->setText( tr2i18n( "&Match longer phrase" ) ); + kcfg__IMEngine_Pinyin_AlwaysShowLookup->setText( tr2i18n( "Always show lookup &table" ) );