merge with master

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..87b656d
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,31 @@
+ise-engine-sunpinyin (0.0.1223) unstable; urgency=low
+
+  * Showing candidate in reset.
+  * Git: 165.213.149.219:framework/uifw/ise-engine-sunpinyin
+  * Tag: ise-engine-sunpinyin_0.0.1223-1
+
+ -- Li Zhang <li2012.zhang@samsung.com>  Wed, 23 Jan 2013 14:44:00 +0800
+
+ise-engine-sunpinyin (0.0.1116) unstable; urgency=low
+
+  * [N_SE-12861]Always show candidate.
+  * Git: 165.213.149.219:framework/uifw/ise-engine-sunpinyin
+  * Tag: ise-engine-sunpinyin_0.0.1116-1
+
+ -- Li Zhang <li2012.zhang@samsung.com>  Fri, 16 Nov 2012 18:30:00 +0800
+
+ise-engine-sunpinyin (0.0.1108) unstable; urgency=low
+
+  * [N_SE-12903][N_SE-12802]flush to commit the first candidate.
+  * Git: 165.213.149.219:framework/uifw/ise-engine-sunpinyin
+  * Tag: ise-engine-sunpinyin_0.0.1108-1
+
+ -- Li Zhang <li2012.zhang@samsung.com>  Thu, 08 Nov 2012 14:30:00 +0800
+
+ise-engine-sunpinyin (0.0.0910) unstable; urgency=low
+
+  * Initial Release.
+  * Git: 165.213.149.219:framework/uifw/ise-engine-sunpinyin
+  * Tag: ise-engine-sunpinyin_0.0.0910-2
+
+ -- Li Zhang <li2012.zhang@samsung.com>  Mon, 10 Sep 2012 11:30:44 +0800

diff --git a/packaging/sunpinyin.changes b/packaging/sunpinyin.changes
deleted file mode 100644 (file)
index 213a143..0000000
--- a/packaging/sunpinyin.changes
+++ /dev/null
@@ -1,6 +0,0 @@
-* Thu Jan 31 2013 Li Zhang <li2012.zhang@samsung.com> accepted/tizen_2.0/20130123.093018@a110cbf
-- Always show candidate
-- [N_SE-12903][N_SE-12802]flush to commit the first candidate.
-- Modifed to install LICENSE information
-- Initial Release
-