[Frugalware-git] fun: intltool updates

[Priyank]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=941914575d22faeedd0ec2618588704c339093cd

commit 941914575d22faeedd0ec2618588704c339093cd
Author: Priyank <[EMAIL PROTECTED]>
Date:   Thu Dec 20 00:39:28 2007 +0530

intltool updates

diff --git a/intltool-extract.in b/intltool-extract.in
index 7b83435..246b7ac 100644
--- a/intltool-extract.in
+++ b/intltool-extract.in
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM      = "intltool-extract";
my $PACKAGE      = "intltool";
-my $VERSION      = "0.36.2";
+my $VERSION      = "0.36.3";

## Loaded modules
use strict;
diff --git a/intltool-merge.in b/intltool-merge.in
index e5671d7..c574585 100644
--- a/intltool-merge.in
+++ b/intltool-merge.in
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.36.2";
+my $VERSION = "0.36.3";

## Loaded modules
use strict;
@@ -292,10 +292,9 @@ sub gather_po_files
{
next if /^#/;

-                if (/([EMAIL PROTECTED])\n/)
+                for my $lang (split)
{
-                    my $lang = $1;
-
+                    chomp ($lang);
my $po_file = $PO_DIR . "/" . $lang . ".po";
if (-e $po_file) {
$po_files_by_lang{$lang} = $po_file;
@@ -576,6 +575,7 @@ sub entity_encode_int_minimalist
return "&amp;" if $_ == 38;
return "&apos;" if $_ == 39;
return "&lt;" if $_ == 60;
+    return "&gt;" if $_ == 62;
return chr $_;
}

@@ -1076,14 +1076,25 @@ sub xml_merge_output
close OUTPUT;
print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
}
-    }
-    open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
-    binmode (OUTPUT) if $^O eq 'MSWin32';
-    my $tree = readXml($FILE);
-    print_header($FILE, \*OUTPUT);
-    parseTree(\*OUTPUT, $tree);
-    close OUTPUT;
-    print "CREATED $OUTFILE\n" unless $QUIET_ARG;
+        if ( ! -d "C" ) {
+            mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n";
+        }
+        open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n";
+        binmode (OUTPUT) if $^O eq 'MSWin32';
+        my $tree = readXml($FILE);
+        print_header($FILE, \*OUTPUT);
+        parseTree(\*OUTPUT, $tree);
+        close OUTPUT;
+        print "CREATED C/$OUTFILE\n" unless $QUIET_ARG;
+    } else {
+        open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
+        binmode (OUTPUT) if $^O eq 'MSWin32';
+        my $tree = readXml($FILE);
+        print_header($FILE, \*OUTPUT);
+        parseTree(\*OUTPUT, $tree);
+        close OUTPUT;
+        print "CREATED $OUTFILE\n" unless $QUIET_ARG;
+    }
}

sub keys_merge_translations
diff --git a/intltool-update.in b/intltool-update.in
index bffd10f..33f8689 100644
--- a/intltool-update.in
+++ b/intltool-update.in
@@ -30,7 +30,7 @@

## Release information
my $PROGRAM = "intltool-update";
-my $VERSION = "0.36.2";
+my $VERSION = "0.36.3";
my $PACKAGE = "intltool";

## Loaded modules
@@ -334,7 +334,7 @@ sub FindLeftoutFiles
push @buf_i18n_xml,          "$File::Find::name" if /\.($xml_support)$/;
push @buf_i18n_ini,          "$File::Find::name" if /\.($ini_support)$/;
push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
-       }, "$SRCDIR/..";
+       }, "$SRCDIR/.." if "$SRCDIR" ne ".";

open POTFILES, $POTFILES_in or die "$PROGRAM:  there's no POTFILES.in!\n";
@buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
@@ -434,8 +434,8 @@ sub FindLeftoutFiles
last;
}

-            ## N_ Q_ and _ are the three macros defined in gi8n.h
-           if (/[NQ]?_ *\(QUOTEDTEXT/)
+            ## C_ N_ Q_ and _ are the macros defined in gi8n.h
+           if (/[CNQ]?_ *\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
@@ -777,7 +777,7 @@ sub GeneratePOTemplate
my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
push @xgettext_argument, $XGETTEXT_KEYWORDS;
my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
-    push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if 
$MSGID_BUGS_ADDRESS;
+    push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" 
if $MSGID_BUGS_ADDRESS;
push @xgettext_argument, "--from-code\=$encoding" if 
($gettext_support_nonascii);
push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
my $xgettext_command = join ' ', @xgettext_argument;
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git