intltool r731 - trunk

[dobey svn gnome org]

Author: dobey
Date: Sat Apr 12 18:25:48 2008
New Revision: 731
URL: http://svn.gnome.org/viewvc/intltool?rev=731&view=rev

Log:
2008-04-12  Rodney Dawes  <dobey pwns gmail com>

	* intltool-update.in (FindPackageName):
	Strip "\(+$" off the end of name/version to allow parens with m4 names

	Fixes #489135



Modified:
   trunk/ChangeLog
   trunk/intltool-update.in

Modified: trunk/intltool-update.in
==============================================================================
--- trunk/intltool-update.in	(original)
+++ trunk/intltool-update.in	Sat Apr 12 18:25:48 2008
@@ -1068,6 +1068,9 @@
 	($name, $version) = ($1, $2);
 	$name    =~ s/[\[\]\s]//g;
 	$version =~ s/[\[\]\s]//g;
+	$name    =~ s/\(+$//g;
+	$version =~ s/\(+$//g;
+
 	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
 	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
 	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
@@ -1079,6 +1082,9 @@
 	($name, $version) = ($1, $2);
 	$name    =~ s/[\[\]\s]//g;
 	$version =~ s/[\[\]\s]//g;
+	$name    =~ s/\(+$//g;
+	$version =~ s/\(+$//g;
+
 	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
 	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
 	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);