From 833b45b2de74d6bea30f822668d07f89759581d0 Mon Sep 17 00:00:00 2001 From: David Walser Date: Sat, 6 Apr 2013 16:17:52 +0000 Subject: - properly fix mga #3697 in find-lang.pl (only exclude man directories) - own man pages that have a dot in their name (find-lang.pl regexp bug) --- NEWS | 4 ++++ configure.ac | 2 +- find-lang.pl | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index d110572..c7be022 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +Version 1.171 - 6 April 2013, by David Walser +- properly fix mga #3697 in find-lang.pl (only exclude man directories) +- own man pages that have a dot in their name (find-lang.pl regexp bug) + Version 1.170 - 4 April 2013, by Luc Menut - revert change 1.168 because it introduces a regression when --with-man is used in combination with another --with-xxxx: all the directories diff --git a/configure.ac b/configure.ac index b40b637..861c323 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $ AC_PREREQ(2.59) -AC_INIT(rpm-mageia-setup, 1.170, rtp@mageia.org) +AC_INIT(rpm-mageia-setup, 1.171, rtp@mageia.org) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.9 -Wno-portability no-dist-gzip dist-xz) AC_CONFIG_SRCDIR diff --git a/find-lang.pl b/find-lang.pl index 3b622da..ba35ff9 100755 --- a/find-lang.pl +++ b/find-lang.pl @@ -57,11 +57,11 @@ File::Find::find( return if !$withhtml; my ($pkg, $lang, $langfile) = ($4, $3, $1); parent_to_own($langfile, $file, $lang) if pkg_match($pkg); - } elsif ($file =~ m!^((/+usr/share/man)/([^/@.]+)[^/]*)/man[^/]+/([^/.]+)\.\d[^/]*!) { + } elsif ($file =~ m!^((/+usr/share/man)/([^/@.]+)[^/]*)/man[^/]+/([^/]+)\.\d[^/]*!) { return if !$withman; my ($pkg, $lang, $langfile) = ($4, $3, $1); $file =~ s/\.[^\.]+$/.*/; - parent_to_own($langfile, $file, $lang) if pkg_match($pkg); + own_file($file, $lang) if pkg_match($pkg); } else { return; } -- cgit v1.2.1