This is an automated email from the git hooks/post-receive script. dod pushed a commit to branch master in repository libconfig-model-lcdproc-perl.
commit 323060e4966d4f29a08c3b053fe1c8633f9fb31a Author: Dominique Dumont <d...@debian.org> Date: Fri May 30 21:00:11 2014 +0200 fork tweak-lcdd-conf in 2 patches --- debian/patches/series | 1 + .../{tweak-lcdd-conf => tweak-lcdconf2model} | 42 ------------------- debian/patches/tweak-lcdd-conf | 47 ---------------------- 3 files changed, 1 insertion(+), 89 deletions(-) diff --git a/debian/patches/series b/debian/patches/series index c9c78df..ade6577 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ test-driver-path-default tweak-lcdd-conf +tweak-lcdconf2model diff --git a/debian/patches/tweak-lcdd-conf b/debian/patches/tweak-lcdconf2model similarity index 57% copy from debian/patches/tweak-lcdd-conf copy to debian/patches/tweak-lcdconf2model index 719c611..4f91c6e 100644 --- a/debian/patches/tweak-lcdd-conf +++ b/debian/patches/tweak-lcdconf2model @@ -1,45 +1,3 @@ ---- a/examples/lcdproc/LCDd.conf -+++ b/examples/lcdproc/LCDd.conf -@@ -34,6 +34,26 @@ - # the driver modules and will thus not be able to - # function properly. - # NOTE: Always place a slash as last character ! -+# {% -+# default~ -+# value_type=uniline -+# compute -+# formula="my $triplet = `/usr/bin/dpkg-architecture -qDEB_HOST_MULTIARCH`; -+# warn \"cannot run dpkg-architecture\" unless $triplet ; -+# chomp $triplet; -+# \"/usr/lib/$triplet/lcdproc/\";" -+# use_eval=1 -+# allow_override=1 - -+# warn_unless:dir -+# code=" defined $_ ? -d : 1" -+# msg="missing DriverPath dir" -+# fix="my $triplet = `/usr/bin/dpkg-architecture -qDEB_HOST_MULTIARCH`; -+# warn \"cannot run dpkg-architecture\" unless $triplet ; -+# chomp $triplet; -+# my $res = \"/usr/lib/$triplet/lcdproc/\"; -+# $_ = $res; -+# " -+# - %} - DriverPath=server/drivers/ - - # Tells the server to load the given drivers. Multiple lines can be given. -@@ -63,10 +83,11 @@ - #ReportLevel=3 - - # Should we report to syslog instead of stderr? [default: no; legal: yes, no] -+# {% upstream_default~ default=yes %} - #ReportToSyslog=yes - - # User to run as. LCDd will drop its root privileges and run as this user --# instead. [default: nobody] -+# instead. {% default~ %} - User=nobody - - # The server will stay in the foreground if set to yes. --- a/examples/lcdproc/lcdconf2model.pl +++ b/examples/lcdproc/lcdconf2model.pl @@ -197,10 +197,10 @@ diff --git a/debian/patches/tweak-lcdd-conf b/debian/patches/tweak-lcdd-conf index 719c611..bc3d211 100644 --- a/debian/patches/tweak-lcdd-conf +++ b/debian/patches/tweak-lcdd-conf @@ -40,50 +40,3 @@ User=nobody # The server will stay in the foreground if set to yes. ---- a/examples/lcdproc/lcdconf2model.pl -+++ b/examples/lcdproc/lcdconf2model.pl -@@ -197,10 +197,10 @@ - my $square_model = ''; - - my $square_rexp = '\[(\s*\w+\s*:[^\]]*)\]'; -- if ($$info_r =~ /$square_rexp/ ) { -+ if ($$info_r =~ /$square_rexp/s) { - my $info = $1 ; - say "class $ini_class element $ini_param info: '$info'" if $verbose; -- $$info_r =~ s/$square_rexp//g; # remove all remaining square_rexp -+ $$info_r =~ s/$square_rexp//gs; # remove all remaining square_rexp - $square_model .= ' '. info_to_model($info,$value_type, $info_r) ; - } - -@@ -208,22 +208,23 @@ - # or use the value found in INI file as default - $ini_v =~ s/^"//g; - $ini_v =~ s/"$//g; -- $square_model .= qq! value_type=$value_type default="$ini_v"! if length($ini_v); -+ $square_model .= qq! value_type=$value_type!; -+ $square_model .= qq! default="$ini_v"! if length($ini_v); - } - - # get model information from comment (written between curly brackets) - my $curly_model = ''; -- my $curly_rexp = '{(\s*\w+.*)}' ; -- while ($$info_r =~ /$curly_rexp/) { -- my $model_snippet = $1 ; -- say "class $ini_class element $ini_param model snippet: '$model_snippet'" -+ my $curly_rexp = '{%(\s*\w+.*?)%}' ; -+ while ($$info_r =~ /$curly_rexp/s) { -+ $curly_model = $1 ; -+ say "class $ini_class element $ini_param model snippet: '$curly_model'" - if $verbose; -- $$info_r =~ s/$curly_rexp//; -- $load .= ' '. $model_snippet ; -+ $$info_r =~ s/$curly_rexp//s; - } - - # return a string containing model specifications -- return $load.$square_model; -+ # spec in curly model may override spec in square model -+ return $load . $square_model . $curly_model ; - }; - - # Now let's take care of the special cases. This one deals with "Driver" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-lcdproc-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits