[Debian-tex-commits] SVN tex-common commit + diffs: r5102 - in tex-common/branches/v3: debian scripts

[Norbert Preining]

Author: preining
Date: 2012-03-01 01:40:33 +0000 (Thu, 01 Mar 2012)
New Revision: 5102

Modified:
   tex-common/branches/v3/debian/changelog
   tex-common/branches/v3/scripts/dh_installtex
Log:
allow KanjiMap entries


Modified: tex-common/branches/v3/debian/changelog
===================================================================
--- tex-common/branches/v3/debian/changelog	2012-02-29 14:02:00 UTC (rev 5101)
+++ tex-common/branches/v3/debian/changelog	2012-03-01 01:40:33 UTC (rev 5102)
@@ -1,3 +1,9 @@
+tex-common (3.0-1~4) unstable; urgency=low
+
+  * properly treat KanjiMap entries in dh_installtex
+
+ -- Norbert Preining <preining at debian.org>  Thu, 01 Mar 2012 10:39:46 +0900
+
 tex-common (3.0-1~3) unstable; urgency=low
 
   * postinst-tex: don't break if a fmt.d snipped has been removed

Modified: tex-common/branches/v3/scripts/dh_installtex
===================================================================
--- tex-common/branches/v3/scripts/dh_installtex	2012-02-29 14:02:00 UTC (rev 5101)
+++ tex-common/branches/v3/scripts/dh_installtex	2012-03-01 01:40:33 UTC (rev 5102)
@@ -37,6 +37,7 @@
 [B<--flavor=>I<flavor>[,I<flavor>]]
 [B<map=MixedMap,>I<file.map>]
 [B<map=Map,>I<file.map>]
+[B<map=KanjiMap,>I<file.map>]
 [B<mapfile=>I<file.cfg>[=I<n>]]
 [B<hyphen=>I<lang>,I<file>[,lhm=I<n>][,rhm=I<n>][,synonym=I<syn>,...]]
 [B<hyphenfile=>I<file.cnf>[=I<n>]]
@@ -317,7 +318,7 @@
 sub extract_map {
 	my ($line,$mapdoconfig) = @_;
 	if ($mapdoconfig == 0) { return ""; }
-	if ($line =~ m/^[[:space:]]*([#[:space:]]*)[[:space:]]*(Mixed)?Map[[:space:]]*(.*\.map)[[:space:]]*(#.*)?$/) {
+	if ($line =~ m/^[[:space:]]*([#[:space:]]*)[[:space:]]*(Mixed|Kanji)?Map[[:space:]]*(.*\.map)[[:space:]]*(#.*)?$/) {
 		my $comment = $1;
 		my $map = $3;
 		if (($comment eq "") || ($mapdoconfig == 2)) {
@@ -333,7 +334,7 @@
 sub build_line {
 	my ($type,$line) = @_;
 	if ($type eq "map") {
-		if ($line =~ m/^(Map|MixedMap),(.*)$/) {
+		if ($line =~ m/^(Map|MixedMap|KanjiMap),(.*)$/) {
 			return("$1 $2");
 		} else {
 			error("$line is neither of the form Map filename.map, nor MixedMap filename.map.");