[libconfig-model-lcdproc-perl] 01/05: updated tweak-default to fix wrong DriverPath Values

dod at debian.org dod at debian.org
Thu Jan 16 20:32:24 UTC 2014


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 028b4cf140b9db2ac3a4fda9b329d8cfd4b736ae
Author: Dominique Dumont <dod at debian.org>
Date:   Sat Jan 11 16:36:02 2014 +0100

    updated tweak-default to fix wrong DriverPath Values
---
 debian/patches/tweak-defaults | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/debian/patches/tweak-defaults b/debian/patches/tweak-defaults
index a26aa8e..d0a4d4f 100644
--- a/debian/patches/tweak-defaults
+++ b/debian/patches/tweak-defaults
@@ -5,20 +5,49 @@ Forwarded:NA
 Author:dod
 --- a/lib/Config/Model/models/LCDd/server.pl
 +++ b/lib/Config/Model/models/LCDd/server.pl
-@@ -199,10 +199,9 @@
+@@ -117,7 +117,27 @@
+       },
+       'DriverPath',
+       {
+-        'default' => 'server/drivers/',
++        compute => {
++            formula => 'my $triplet = `/usr/bin/dpkg-architecture -qDEB_HOST_MULTIARCH`;
++warn "cannot run dpkg-architecture" unless $triplet ;
++chomp $triplet;
++"/usr/lib/$triplet/lcdproc/";',
++            allow_override => 1,
++            use_eval => 1
++        },
++        warn_unless => {
++            'dir' => {
++                code => ' -d ' ,
++                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;
++',
++             }
++        },
++        #'default' => 'server/drivers/',
+         'description' => 'Where can we find the driver modules ?
+ IMPORTANT: Make sure to change this setting to reflect your
+            specific setup! Otherwise LCDd won\'t be able to find
+@@ -199,10 +219,9 @@
        },
        'ReportToSyslog',
        {
 -        'description' => 'Should we report to syslog instead of stderr ? 
 -[default: yes]',
++        'default' => 'yes',
 +        'description' => 'Should we report to syslog instead of stderr ?',
          'type' => 'leaf',
 -        'upstream_default' => 'no',
-+        'default' => 'yes',
          'value_type' => 'boolean',
          'write_as' => [
            'no',
-@@ -261,7 +260,6 @@
+@@ -261,7 +280,6 @@
        },
        'User',
        {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-lcdproc-perl.git



More information about the Pkg-perl-cvs-commits mailing list