modify patch

2019-12-09 14:47:40 +08:00 · 2019-12-09 14:47:40 +08:00 · 11c1b29a04
commit 11c1b29a04
parent 3540035ace
5 changed files with 0 additions and 65 deletions
--- a/m17n-db-1.6.5-bn-itrans-bug182227.patch
+++ b/m17n-db-1.6.5-bn-itrans-bug182227.patch
@ -1,10 +1,5 @@
-<<<<<<< HEAD
 --- a/MIM/bn-itrans.mim.orig	2013-05-23 18:22:04.000000000 +0530
 +++ b/MIM/bn-itrans.mim	2014-01-27 19:27:28.818981529 +0530
-=======
--- MIM/bn-itrans.mim.orig	2013-05-23 18:22:04.000000000 +0530
-+++ MIM/bn-itrans.mim	2014-01-27 19:27:28.818981529 +0530
->>>>>>> 8f23436ee09b0d9785069f97b08faa52279bf983
@@ -127,16 +127,10 @@
   ("U" "ঊ")
   ("RRi" "ঋ")
--- a/m17n-db-1.6.5-kn-inscript-ZWNJ-bug440007.patch
+++ b/m17n-db-1.6.5-kn-inscript-ZWNJ-bug440007.patch
@ -1,10 +1,5 @@
-<<<<<<< HEAD
 --- a/MIM/kn-inscript.mim.orig	2013-05-23 18:22:04.000000000 +0530
 +++ b/MIM/kn-inscript.mim	2014-01-27 14:55:52.000000000 +0530
-=======
--- MIM/kn-inscript.mim.orig	2013-05-23 18:22:04.000000000 +0530
-+++ MIM/kn-inscript.mim	2014-01-27 14:55:52.000000000 +0530
->>>>>>> 8f23436ee09b0d9785069f97b08faa52279bf983
@@ -59,6 +59,9 @@
 	\"ಜ್ಞ\" : ಜ + ್ + ಞ
 	p + d + } [OR] %
--- a/m17n-db-1.6.5-kn-itrans_key-summary_bug228806.patch
+++ b/m17n-db-1.6.5-kn-itrans_key-summary_bug228806.patch
@ -1,10 +1,5 @@
-<<<<<<< HEAD
 --- a/MIM/kn-itrans.mim.orig	2013-08-20 14:55:29.000000000 +0530
 +++ b/MIM/kn-itrans.mim	2014-01-27 19:36:23.056606114 +0530
-=======
--- MIM/kn-itrans.mim.orig	2013-08-20 14:55:29.000000000 +0530
-+++ MIM/kn-itrans.mim	2014-01-27 19:36:23.056606114 +0530
->>>>>>> 8f23436ee09b0d9785069f97b08faa52279bf983
@@ -46,8 +46,44 @@
 Kannada l10n Team, kannada.l10n@gmail.com
   <http://kannada.sourceforge.net>
--- a/m17n-db-1.6.5-number_pad_itrans-222634.patch
+++ b/m17n-db-1.6.5-number_pad_itrans-222634.patch
@ -1,11 +1,6 @@
 diff -urN MIM/as-itrans.mim.old MIM/as-itrans.mim
-<<<<<<< HEAD
 --- a/MIM/as-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530
 +++ b/MIM/as-itrans.mim	2014-01-27 19:43:43.608461146 +0530
-=======
--- MIM/as-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530
-+++ MIM/as-itrans.mim	2014-01-27 19:43:43.608461146 +0530
->>>>>>> 8f23436ee09b0d9785069f97b08faa52279bf983
@@ -142,6 +142,11 @@
   ((KP_8) "৮")
   ((KP_9) "৯")
@ -19,13 +14,8 @@ diff -urN MIM/as-itrans.mim.old MIM/as-itrans.mim
   ((C-@) "‍"))
 
 diff -urN MIM/gu-itrans.mim.old MIM/gu-itrans.mim
-<<<<<<< HEAD
 --- a/MIM/gu-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530
 +++ b/MIM/gu-itrans.mim	2014-01-27 19:44:15.069380103 +0530
-=======
--- MIM/gu-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530
-+++ MIM/gu-itrans.mim	2014-01-27 19:44:15.069380103 +0530
->>>>>>> 8f23436ee09b0d9785069f97b08faa52279bf983
@@ -143,6 +143,11 @@
   ((KP_8) "૮")
   ((KP_9) "૯")
@ -39,13 +29,8 @@ diff -urN MIM/gu-itrans.mim.old MIM/gu-itrans.mim
   ((C-@) "‍"))				; not in ITRANS Gujarati table
 
 diff -urN MIM/hi-itrans.mim.old MIM/hi-itrans.mim
-<<<<<<< HEAD
 --- a/MIM/hi-itrans.mim.old 2013-11-09 14:48:20.000000000 +0530
 +++ b/MIM/hi-itrans.mim	2014-01-27 19:50:10.952215133 +0530
-=======
--- MIM/hi-itrans.mim.old 2013-11-09 14:48:20.000000000 +0530
-+++ MIM/hi-itrans.mim	2014-01-27 19:50:10.952215133 +0530
->>>>>>> 8f23436ee09b0d9785069f97b08faa52279bf983
@@ -229,7 +229,12 @@
   ((KP_6) "६")
   ((KP_7) "७")
@ -61,13 +46,8 @@ diff -urN MIM/hi-itrans.mim.old MIM/hi-itrans.mim
  (dependent
   ("a" (delete @-) "")
 diff -urN MIM/kn-itrans.mim.old MIM/kn-itrans.mim
-<<<<<<< HEAD
 --- a/MIM/kn-itrans.mim.old 2014-01-27 19:51:21.086953700 +0530
 +++ b/MIM/kn-itrans.mim	2014-01-27 19:47:10.035916349 +0530
-=======
--- MIM/kn-itrans.mim.old 2014-01-27 19:51:21.086953700 +0530
-+++ MIM/kn-itrans.mim	2014-01-27 19:47:10.035916349 +0530
->>>>>>> 8f23436ee09b0d9785069f97b08faa52279bf983
@@ -251,6 +251,11 @@
   ((KP_8) "೮")
   ((KP_9) "೯")
@ -81,13 +61,8 @@ diff -urN MIM/kn-itrans.mim.old MIM/kn-itrans.mim
   ((C-@) "‍"))				; not in ITRANS Kannada table
 
 diff -urN MIM/ml-itrans.mim.old MIM/ml-itrans.mim
-<<<<<<< HEAD
 --- a/MIM/ml-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530
 +++ b/MIM/ml-itrans.mim	2014-01-27 19:46:50.472981057 +0530
-=======
--- MIM/ml-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530
-+++ MIM/ml-itrans.mim	2014-01-27 19:46:50.472981057 +0530
->>>>>>> 8f23436ee09b0d9785069f97b08faa52279bf983
@@ -175,6 +175,11 @@
   ((KP_8) "൮")
   ((KP_9) "൯")
@ -101,13 +76,8 @@ diff -urN MIM/ml-itrans.mim.old MIM/ml-itrans.mim
   ((C-@) "‍"))
 
 diff -urN MIM/or-itrans.mim.old MIM/or-itrans.mim
-<<<<<<< HEAD
 --- a/MIM/or-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530
 +++ b/MIM/or-itrans.mim	2014-01-27 19:46:33.923023456 +0530
-=======
--- MIM/or-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530
-+++ MIM/or-itrans.mim	2014-01-27 19:46:33.923023456 +0530
->>>>>>> 8f23436ee09b0d9785069f97b08faa52279bf983
@@ -143,6 +143,11 @@
   ((KP_8) "୮")
   ((KP_9) "୯")
@ -121,13 +91,8 @@ diff -urN MIM/or-itrans.mim.old MIM/or-itrans.mim
   ((C-@) "‍"))
 
 diff -urN MIM/pa-itrans.mim.old MIM/pa-itrans.mim
-<<<<<<< HEAD
 --- a/MIM/pa-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530
 +++ b/MIM/pa-itrans.mim	2014-01-27 19:46:13.724075235 +0530
-=======
--- MIM/pa-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530
-+++ MIM/pa-itrans.mim	2014-01-27 19:46:13.724075235 +0530
->>>>>>> 8f23436ee09b0d9785069f97b08faa52279bf983
@@ -136,6 +136,11 @@
   ((KP_8) "੮")
   ((KP_9) "੯")
@ -141,13 +106,8 @@ diff -urN MIM/pa-itrans.mim.old MIM/pa-itrans.mim
   ((C-@) "‍"))				; not in ITRANS Gurmukhi table
 
 diff -urN MIM/ta-itrans.mim.old MIM/ta-itrans.mim
-<<<<<<< HEAD
 --- a/MIM/ta-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530
 +++ b/MIM/ta-itrans.mim	2014-01-27 19:45:52.657129275 +0530
-=======
--- MIM/ta-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530
-+++ MIM/ta-itrans.mim	2014-01-27 19:45:52.657129275 +0530
->>>>>>> 8f23436ee09b0d9785069f97b08faa52279bf983
@@ -130,6 +130,11 @@
   ((KP_8) "௮")
   ((KP_9) "௯")
@ -161,13 +121,8 @@ diff -urN MIM/ta-itrans.mim.old MIM/ta-itrans.mim
   ((C-@) "‍")				; not in ITRANS Tamil table
   ("SRI" "ஶ்ரீ"))
 diff -urN MIM/te-itrans.mim.old MIM/te-itrans.mim
-<<<<<<< HEAD
 --- a/MIM/te-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530
 +++ b/MIM/te-itrans.mim	2014-01-27 19:44:51.452286491 +0530
-=======
--- MIM/te-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530
-+++ MIM/te-itrans.mim	2014-01-27 19:44:51.452286491 +0530
->>>>>>> 8f23436ee09b0d9785069f97b08faa52279bf983
@@ -146,6 +146,11 @@
   ((KP_8) "౮")
   ((KP_9) "౯")
--- a/m17n-db-1.7.0-fix-e-o-mappings.patch
+++ b/m17n-db-1.7.0-fix-e-o-mappings.patch
@ -1,11 +1,6 @@
 diff -urN MIM/gu-itrans.mim.old MIM/gu-itrans.mim
-<<<<<<< HEAD
 --- a/MIM/gu-itrans.mim.old	2015-08-24 22:30:15.723875911 +0530
 +++ b/MIM/gu-itrans.mim	2015-08-24 22:32:56.198910959 +0530
-=======
--- MIM/gu-itrans.mim.old	2015-08-24 22:30:15.723875911 +0530
-+++ MIM/gu-itrans.mim	2015-08-24 22:32:56.198910959 +0530
->>>>>>> 8f23436ee09b0d9785069f97b08faa52279bf983
@@ -166,11 +166,13 @@
   ("RRI" (delete @-) "ૄ")		; not in ITRANS Gujarati table
   ("R^I" (delete @-) "ૄ")		; not in ITRANS Gujarati table