From f914bfdf5016461cbe849dea21b9056f3c6149a7 Mon Sep 17 00:00:00 2001
From: "Sergey V. Udaltsov" <svu@gnome.org>
Date: Sat, 3 Jan 2009 01:17:02 +0000
Subject: [PATCH] fixed handling of the compat layout substitutions with
 variants, part of b.fd.o#8452

---
 ChangeLog             | 6 ++++++
 rules/compat/ln_s.sh  | 4 +++-
 rules/compat/ml1_s.sh | 4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b944751..f591f07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-03  Sergey Udaltsov
+
+	* rules/compat/ln_s.sh, rules/compat/ml1_s.sh: fixed compat layout
+	renaming involving variants on replacement, part of the fix for
+	http://bugs.freedesktop.org/show_bug.cgi?id=8452
+
 2008-12-30  Sergey Udaltsov
 
 	* symbols/fi: updated 2 mappings according to the new standard,
diff --git a/rules/compat/ln_s.sh b/rules/compat/ln_s.sh
index 00c2f59..3337d0f 100755
--- a/rules/compat/ln_s.sh
+++ b/rules/compat/ln_s.sh
@@ -8,7 +8,9 @@ OUTFILE=base.l${variant}_s.part
 > $OUTFILE
 
 awk '{ 
-  printf "  %s		=	+%s%%(v['${variant}']):'${variant}'\n", $1, $2; 
+  if (index($2, "(") == 0) {
+    printf "  %s		=	+%s%%(v['${variant}']):'${variant}'\n", $1, $2; 
+  }
 }' < $INDIR/layoutRename.lst >> $OUTFILE
 
 awk '{ 
diff --git a/rules/compat/ml1_s.sh b/rules/compat/ml1_s.sh
index 210d1b6..da7a602 100755
--- a/rules/compat/ml1_s.sh
+++ b/rules/compat/ml1_s.sh
@@ -6,7 +6,9 @@ OUTFILE=base.ml1_s.part
 > $OUTFILE
 
 awk '{ 
-  printf "  *		%s			=	pc+%s%%(v[1])\n", $1, $2; 
+  if (index($2, "(") == 0) {
+    printf "  *		%s			=	pc+%s%%(v[1])\n", $1, $2; 
+  }
 }' < $INDIR/layoutRename.lst >> $OUTFILE
 
 awk '{ 
-- 
2.7.4