[libconfig-model-lcdproc-perl] 03/10: removed patch applied upstream

[dod at debian.org]

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 bed664ee5e79f9e554503712cba3120460c6ab9f
Author: Dominique Dumont <dod at debian.org>
Date:   Thu Dec 31 17:26:52 2015 +0100

    removed patch applied upstream
---
 debian/patches/series              |  1 -
 debian/patches/tweak-lcdconf2model | 51 --------------------------------------
 2 files changed, 52 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 770b5ee..4580887 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 test-driver-path-default
 tweak-lcdd-conf
-tweak-lcdconf2model
 fix-log4perl-init
diff --git a/debian/patches/tweak-lcdconf2model b/debian/patches/tweak-lcdconf2model
deleted file mode 100644
index 0333b3d..0000000
--- a/debian/patches/tweak-lcdconf2model
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: Tweak lcdconf2model
- Fix bugs discoverted while twaeking previous patch
-Forwarded: yes
-Author: dod
---- 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