[software/control-center] branch master updated (ad883da -> b643569)

[root-odJJhXpcy38dnm+]

This is an automated email from the git hooks/post-receive script.

tv pushed a change to branch master
in repository software/control-center.

from ad883da Change French translation of MCC
new b643569 fix not displaying contributors in about dialog (mga#13093)

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
NEWS | 2 ++
control-center | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)

[root-odJJhXpcy38dnm+]

This is an automated email from the git hooks/post-receive script.

tv pushed a commit to branch master
in repository software/control-center.

commit b6435692a67adeef743fbca6677931b3e83370a8
Author: Thierry Vignaud <thierry.vignaud-***@public.gmane.org>
Date: Fri Mar 28 21:14:22 2014 +0100

fix not displaying contributors in about dialog (mga#13093)

access to CREDITS was wrongly removed in befd324a2ef5f487e788bc6ed6c5de0dd7a9d751
---
Commit Link:
http://gitweb.mageia.org/software/control-center/commit/?id=b6435692a67adeef743fbca6677931b3e83370a8

Bug links:
Mageia
https://bugs.mageia.org/show_bug.cgi?id=13093

NEWS | 2 ++
control-center | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index 6ecd87d..511158b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- fix not displaying contributors in about dialog (mga#13093)
+
Version 12.51 - 25 January 2014, Colin Guthrie

- do not exec pkexec but run it so it has a parent process to fix double fork
diff --git a/control-center b/control-center
index f0ff8c4..b56e93b 100755
--- a/control-center
+++ b/control-center
@@ -1450,7 +1450,7 @@ sub about_mga_cc() {
my ($previous_type, $not_first_title, $not_first_block);
my $locale = lang::read;
require Gtk2::Pango;
- foreach my $line (grep { $_ ne "\n" && !/^#/ } cat_(top(glob("/usr/share/doc/mageia-release-*/CREDITS.$locale->{lang}")))) {
+ foreach my $line (grep { $_ ne "\n" && !/^#/ } cat_(top(glob("/usr/share/doc/mageia-release-*/CREDITS"), glob("/usr/share/doc/mageia-release-*/CREDITS.$locale->{lang}")))) {
if (my ($type, $comment, $contributor) = split(/\|/, $line, 3)) {
last if !$type;
$comment =~ s/^ //; # fix initial space of first section (CREDITS format should be enhanced to specify lines that really are sections)