diffstat for skkdic-20190217 skkdic-20190217 changelog | 7 +++++++ patches/010_reiwa.patch | 33 +++++++++++++++++++++++++++++++++ patches/series | 1 + 3 files changed, 41 insertions(+) diff -Nru skkdic-20190217/debian/changelog skkdic-20190217/debian/changelog --- skkdic-20190217/debian/changelog 2019-02-18 21:49:25.000000000 +0900 +++ skkdic-20190217/debian/changelog 2019-04-11 21:52:37.000000000 +0900 @@ -1,3 +1,10 @@ +skkdic (20190217-2) unstable; urgency=medium + + * New patch 010_reiwa.patch to add Japan's new era 令和 (Reiwa) + (closes: #926862, #926863) + + -- Tatsuya Kinoshita Thu, 11 Apr 2019 21:52:37 +0900 + skkdic (20190217-1) unstable; urgency=medium * New upstream version 20190217 diff -Nru skkdic-20190217/debian/patches/010_reiwa.patch skkdic-20190217/debian/patches/010_reiwa.patch --- skkdic-20190217/debian/patches/010_reiwa.patch 1970-01-01 09:00:00.000000000 +0900 +++ skkdic-20190217/debian/patches/010_reiwa.patch 2019-04-11 21:52:37.000000000 +0900 @@ -0,0 +1,33 @@ +Subject: Add Japan's new era 令和 (Reiwa) + +Origin: upstream, https://github.com/skk-dev/dict/commit/02706f96f53f3cc5c2e525cde68d030b38848b3a +Origin: upstream, https://github.com/skk-dev/dict/commit/560be44f20707eec3a6011984d566e3684dc7308 +Origin: upstream, https://github.com/skk-dev/dict/commit/b9f98bc878f89557dca6c059991350a728542b94 +Bug: https://github.com/skk-dev/dict/pull/12 +Bug: https://github.com/skk-dev/dict/pull/14 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=926862 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=926863 + +diff --git a/SKK-JISYO.L b/SKK-JISYO.L +index 4d364df..4aa7c4d 100644 +--- a/SKK-JISYO.L ++++ b/SKK-JISYO.L +@@ -173633,7 +173633,8 @@ zyklus / + ¤ì¤¤¤ê¤ç¤¦ /ÎäÎÃ/ + ¤ì¤¤¤ê¤ç¤¯ /ÎîÎÏ/ + ¤ì¤¤¤í¤¦ /Îèàü/ +-¤ì¤¤¤ï /ÎãÏÃ/ ++¤ì¤¤¤ï /ÎáÏÂ;ǯ¹æ(2019-)/ÎãÏÃ/ ++¤ì¤¤¤ï#¤Í¤ó /ÎáÏÂ#0ǯ/ÎáÏÂ#1ǯ/ÎáÏÂ#2ǯ/ÎáÏÂ#3ǯ/ + ¤ì¤ª¤Ê /Îè±÷Æà/Îè±û̾/ + ¤ì¤­ /Îò;¢÷history/Îñ;¢÷calendar/ãª;¾®ÀÐ/íà;-»à/ݬ;¥¯¥Ì¥®/ßÍ;pitch/Ý®;¥¯¥Ì¥®/áü;áðáü/íá/ðÎ;(ÀÄÅ·¤Î)ðÈðÎ/ò¯;Ť/ + ¤ì¤­¤¬¤ó /㪴ä/ +diff --git a/SKK-JISYO.lisp b/SKK-JISYO.lisp +index bd98885..9626629 100644 +--- a/SKK-JISYO.lisp ++++ b/SKK-JISYO.lisp +@@ -94,3 +94,4 @@ yesterday /(skk-relative-date (lambda (date-information format gengo and-time) ( + ¤á¤¤¤¸#¤Í¤ó /(skk-gengo-to-ad "" "ǯ")/(skk-gengo-to-ad "À¾Îñ" "ǯ")/ + ¤é¤¤¤²¤Ä /(skk-relative-date (lambda (date-information format gengo and-time) (skk-default-current-date date-information "%sǯ%s·î" 0 nil 0 0 0)) nil nil :mm 1)/(skk-relative-date (lambda (date-information format gengo and-time) (skk-default-current-date date-information "%sǯ%s·î" 0 'gengo 0 0 0)) nil nil :mm 1)/(skk-relative-date (lambda (date-information format gengo and-time) (skk-default-current-date date-information "%sǯ%s·î" 3 'gengo 0 0 0)) nil nil :mm 1)/ + ¤é¤¤¤Í¤ó /(skk-relative-date (lambda (date-information format gengo and-time) (skk-default-current-date date-information "%sǯ" 0 nil 0 0 0)) nil nil :yy 1)/(skk-relative-date (lambda (date-information format gengo and-time) (skk-default-current-date date-information "%sǯ" 0 'gengo 0 0 0)) nil nil :yy 1)/(skk-relative-date (lambda (date-information format gengo and-time) (skk-default-current-date date-information "%sǯ" 3 'gengo 0 0 0)) nil nil :yy 1)/(skk-relative-date (lambda (date-information format gengo and-time) (skk-default-current-date date-information "%sǯ" 1 'gengo 0 0 0)) nil nil :yy 1)/ ++¤ì¤¤¤ï#¤Í¤ó /(skk-gengo-to-ad "" "ǯ")/(skk-gengo-to-ad "À¾Îñ" "ǯ")/ diff -Nru skkdic-20190217/debian/patches/series skkdic-20190217/debian/patches/series --- skkdic-20190217/debian/patches/series 1970-01-01 09:00:00.000000000 +0900 +++ skkdic-20190217/debian/patches/series 2019-04-11 21:52:37.000000000 +0900 @@ -0,0 +1 @@ +010_reiwa.patch