Update of /cvsroot/fink/fink/perlmod/Fink In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23605
Modified Files: Tag: branch_0_24 ChangeLog VirtPackage.pm Log Message: Dave please add this to the 0.24.1 releasevi ChangeLog Index: VirtPackage.pm =================================================================== RCS file: /cvsroot/fink/fink/perlmod/Fink/VirtPackage.pm,v retrieving revision 1.68.2.2 retrieving revision 1.68.2.3 diff -u -d -r1.68.2.2 -r1.68.2.3 --- VirtPackage.pm 28 Feb 2005 04:12:55 -0000 1.68.2.2 +++ VirtPackage.pm 28 Feb 2005 18:16:39 -0000 1.68.2.3 @@ -992,17 +992,34 @@ if (-x '/Library/PreferencePanes/Growl.prefPane/Contents/Resources/GrowlHelperApp.app/Contents/MacOS/GrowlHelperApp') { print STDERR "found, Growl\n" if ($options{debug}); print STDERR "- checking for Growl version... " if ($options{debug}); - if (-f "/Library/Receipts/Growl.pkg/Contents/Info.plist") { - if (open(FILEIN, '/Library/Receipts/Growl.pkg/Contents/Info.plist')) { + if (-f "/Library/PreferencePanes/Growl.prefPane/Contents/Info.plist") { + if (open(FILEIN, '/Library/PreferencePanes/Growl.prefPane/Contents/Info.plist')) { local $/ = undef; - if (<FILEIN> =~ /<key>CFBundleShortVersionString<\/key>[\r\n\s]*<string>([\d\.]+)<\/string>/) { + if (<FILEIN> =~ /<key>CFBundleVersion<\/key>[\r\n\s]*<string>([\d\.]+)<\/string>/) { $growl_version = $1; } close(FILEIN); - } + } } else { - print STDERR "/Library/Receipts/Growl.pkg/Contents/Info.plist not found... " if ($options{debug}); - $growl_version = "0"; + print STDERR "/Library/PreferencePanes/Growl.prefPane/Contents/Info.plist not found... " if ($options{debug}); + $growl_version = "0"; + } + + ### This check is for growl's less then 0.6 + ### Growl team told me 1.0 would be versioned 1.00 + if ($growl_version eq "1.0") { + if (-f "/Library/Receipts/Growl.pkg/Contents/Info.plist") { + if (open(FILEIN, '/Library/Receipts/Growl.pkg/Contents/Info.plist')) { + local $/ = undef; + if (<FILEIN> =~ /<key>CFBundleShortVersionString<\/key>[\r\n\s]*<string>([\d\.]+)<\/string>/) { + $growl_version = $1; + } + close(FILEIN); + } + } else { + print STDERR "/Library/Receipts/Growl.pkg/Contents/Info.plist not found... " if ($options{debug}); + $growl_version = "0"; + } } } else { print STDERR "missing\n" if ($options{debug}); Index: ChangeLog =================================================================== RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v retrieving revision 1.873.2.7 retrieving revision 1.873.2.8 diff -u -d -r1.873.2.7 -r1.873.2.8 --- ChangeLog 28 Feb 2005 16:53:18 -0000 1.873.2.7 +++ ChangeLog 28 Feb 2005 18:16:38 -0000 1.873.2.8 @@ -1,3 +1,7 @@ +2005-02-28 Justin F. Hallett <[EMAIL PROTECTED]> + + * VirtPackage.pm: Added Growl 0.6 detection + 2005-02-28 Dave Morrison <[EMAIL PROTECTED]> * Services.pm: Repair dumpinfo under perl 5.6 (thanks to Martin ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits