r76651 - in /trunk/libconfig-model-approx-perl: ./ debian/ lib/Config/Model/ lib/Config/Model/models/ lib/Config/Model/system.d/ script/ t/
fabreg-guest at users.alioth.debian.org
fabreg-guest at users.alioth.debian.org
Mon Jun 27 22:17:56 UTC 2011
Author: fabreg-guest
Date: Mon Jun 27 22:17:54 2011
New Revision: 76651
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=76651
Log:
* New upstream release.
* Switch d/compat to 8.
* Bump to 3.9.2 Standard-Version.
* Build-Depends: switch to debhelper (>= 8).
* Add myself to Uploaders and Copyright.
* Updated d/copyright.
* Changed Vcs-* fields.
Added:
trunk/libconfig-model-approx-perl/META.json
- copied unchanged from r76650, branches/upstream/libconfig-model-approx-perl/current/META.json
trunk/libconfig-model-approx-perl/lib/Config/Model/models/Approx.pod
- copied unchanged from r76650, branches/upstream/libconfig-model-approx-perl/current/lib/Config/Model/models/Approx.pod
trunk/libconfig-model-approx-perl/lib/Config/Model/system.d/
- copied from r76650, branches/upstream/libconfig-model-approx-perl/current/lib/Config/Model/system.d/
trunk/libconfig-model-approx-perl/script/
- copied from r76650, branches/upstream/libconfig-model-approx-perl/current/script/
Removed:
trunk/libconfig-model-approx-perl/config-edit-approx
Modified:
trunk/libconfig-model-approx-perl/Build.PL
trunk/libconfig-model-approx-perl/MANIFEST
trunk/libconfig-model-approx-perl/META.yml
trunk/libconfig-model-approx-perl/README
trunk/libconfig-model-approx-perl/debian/changelog
trunk/libconfig-model-approx-perl/debian/compat
trunk/libconfig-model-approx-perl/debian/control
trunk/libconfig-model-approx-perl/debian/copyright
trunk/libconfig-model-approx-perl/lib/Config/Model/Approx.pm
trunk/libconfig-model-approx-perl/lib/Config/Model/models/Approx.pl
trunk/libconfig-model-approx-perl/t/approx_config.t
Modified: trunk/libconfig-model-approx-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-approx-perl/Build.PL?rev=76651&op=diff
==============================================================================
--- trunk/libconfig-model-approx-perl/Build.PL (original)
+++ trunk/libconfig-model-approx-perl/Build.PL Mon Jun 27 22:17:54 2011
@@ -1,8 +1,4 @@
-# $Author: ddumont $
-# $Date: 2009-09-27 16:02:38 +0200 (dim 27 sep 2009) $
-# $Revision: 1036 $
-
-# Copyright (c) 2009 Dominique Dumont.
+# Copyright (c) 2009-2011 Dominique Dumont.
#
# This file is part of Config-Model-Approx.
#
@@ -27,6 +23,10 @@
use warnings FATAL => qw(all) ;
use strict ;
+# check that pod docs are up-to-date
+system("perl -Ilib script/gen_class_pod.pl");
+
+my %appli_files = map { ( $_, $_ ) } glob("lib/Config/Model/*.d/*");
my $build = Module::Build->new
(
@@ -34,10 +34,10 @@
license => 'lgpl',
dist_author => "Dominique Dumont (ddumont at cpan dot org)",
dist_abstract => "Approx configuration files editor",
- script_files => [ qw/config-edit-approx/ ],
+ appli_files => \%appli_files,
requires => {
perl => '5.8.0',
- 'Config::Model' => '0.637',
+ 'Config::Model' => '1.245',
'Log::Log4perl' => 0 ,
},
build_requires => { 'Test::Pod' => 0 },
@@ -50,4 +50,6 @@
$build->add_build_element('pl');
+$build->add_build_element('appli');
+
$build->create_build_script;
Modified: trunk/libconfig-model-approx-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-approx-perl/MANIFEST?rev=76651&op=diff
==============================================================================
--- trunk/libconfig-model-approx-perl/MANIFEST (original)
+++ trunk/libconfig-model-approx-perl/MANIFEST Mon Jun 27 22:17:54 2011
@@ -3,8 +3,11 @@
MANIFEST This list of files
META.yml
README
-config-edit-approx
lib/Config/Model/Approx.pm
lib/Config/Model/models/Approx.pl
+lib/Config/Model/models/Approx.pod
+lib/Config/Model/system.d/approx
+script/gen_class_pod.pl
t/approx_config.t
t/pod.t
+META.json
Modified: trunk/libconfig-model-approx-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-approx-perl/META.yml?rev=76651&op=diff
==============================================================================
--- trunk/libconfig-model-approx-perl/META.yml (original)
+++ trunk/libconfig-model-approx-perl/META.yml Mon Jun 27 22:17:54 2011
@@ -1,28 +1,29 @@
---
-name: Config-Model-Approx
-version: 1.003
+abstract: 'Approx configuration files editor'
author:
- - Dominique Dumont (ddumont at cpan dot org)
-abstract: Approx configuration files editor
-license: lgpl
-resources:
- license: http://opensource.org/licenses/lgpl-license.php
+ - 'Dominique Dumont (ddumont at cpan dot org)'
build_requires:
Test::Pod: 0
-requires:
- Config::Model: 0.637
- Log::Log4perl: 0
- perl: v5.8.0
+configure_requires:
+ Module::Build: 0.38
+dynamic_config: 1
+generated_by: 'Module::Build version 0.38, CPAN::Meta::Converter version 2.110930'
+license: open_source
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
+name: Config-Model-Approx
+provides:
+ Config::Model::Approx:
+ file: lib/Config/Model/Approx.pm
+ version: 1.004
recommends:
Config::Model::CursesUI: 0
Config::Model::TkUI: 0
-configure_requires:
- Module::Build: 0.35
-provides:
- Config::Model::Approx:
- file: lib/Config/Model/Approx.pm
- version: 1.003
-generated_by: Module::Build version 0.35
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
+requires:
+ Config::Model: 1.245
+ Log::Log4perl: 0
+ perl: v5.8.0
+resources:
+ license: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+version: 1.004
Modified: trunk/libconfig-model-approx-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-approx-perl/README?rev=76651&op=diff
==============================================================================
--- trunk/libconfig-model-approx-perl/README (original)
+++ trunk/libconfig-model-approx-perl/README Mon Jun 27 22:17:54 2011
@@ -13,7 +13,7 @@
Once this module is installed, you can run:
- # config-edit-approx
+ # config-edit -application approx
If config-edit fails to load your approx.conf, you can try config-edit
with -force option.
@@ -25,14 +25,14 @@
are the purpose of the main files:
- Build.PL : script to build the Perl module. See Module::Build(3pm)
- lib/Config/Model/models : directory containing Approx model
- file (Approx.pl).
+ file (Approx.pl). and its generated doc (Approx.pod)
- lib/Config/Model/Approx.pm: Read and write approx.conf
- t/ : non-regression tests
--------------------------------------------------------------------
AUTHOR
- Copyright (c) 2009 Dominique Dumont.
+ Copyright (c) 2009-2011 Dominique Dumont.
This file is part of Config-Model-Approx. License is LGPL v2.1 or
any later version.
Modified: trunk/libconfig-model-approx-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-approx-perl/debian/changelog?rev=76651&op=diff
==============================================================================
--- trunk/libconfig-model-approx-perl/debian/changelog (original)
+++ trunk/libconfig-model-approx-perl/debian/changelog Mon Jun 27 22:17:54 2011
@@ -1,3 +1,15 @@
+libconfig-model-approx-perl (1.004-5) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Switch d/compat to 8.
+ * Bump to 3.9.2 Standard-Version.
+ * Build-Depends: switch to debhelper (>= 8).
+ * Add myself to Uploaders and Copyright.
+ * Updated d/copyright.
+ * Changed Vcs-* fields.
+
+ -- Fabrizio Regalli <fabreg at fabreg.it> Mon, 27 Jun 2011 23:41:57 +0200
+
libconfig-model-approx-perl (1.003-1) unstable; urgency=low
[ Jonathan Yu ]
Modified: trunk/libconfig-model-approx-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-approx-perl/debian/compat?rev=76651&op=diff
==============================================================================
--- trunk/libconfig-model-approx-perl/debian/compat (original)
+++ trunk/libconfig-model-approx-perl/debian/compat Mon Jun 27 22:17:54 2011
@@ -1,1 +1,1 @@
-7
+8
Modified: trunk/libconfig-model-approx-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-approx-perl/debian/control?rev=76651&op=diff
==============================================================================
--- trunk/libconfig-model-approx-perl/debian/control (original)
+++ trunk/libconfig-model-approx-perl/debian/control Mon Jun 27 22:17:54 2011
@@ -1,16 +1,17 @@
Source: libconfig-model-approx-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 7), perl (>= 5.10) | libmodule-build-perl
+Build-Depends: debhelper (>= 8), perl (>= 5.10) | libmodule-build-perl
Build-Depends-Indep: perl, libconfig-model-perl (>= 0.637),
liblog-log4perl-perl, libtest-pod-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Dominique Dumont <dominique.dumont at hp.com>,
- gregor herrmann <gregoa at debian.org>, Jonathan Yu <jawnsy at cpan.org>
-Standards-Version: 3.8.3
+ gregor herrmann <gregoa at debian.org>, Jonathan Yu <jawnsy at cpan.org>,
+ Fabrizio Regalli <fabreg at fabreg.it>
+Standards-Version: 3.9.2
Homepage: http://search.cpan.org/dist/Config-Model-Approx/
-Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libconfig-model-itself-perl/
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libconfig-model-itself-perl/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-perl/tags/libconfig-model-approx-perl
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-perl/trunk/libconfig-model-approx-perl/
Package: libconfig-model-approx-perl
Architecture: all
Modified: trunk/libconfig-model-approx-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-approx-perl/debian/copyright?rev=76651&op=diff
==============================================================================
--- trunk/libconfig-model-approx-perl/debian/copyright (original)
+++ trunk/libconfig-model-approx-perl/debian/copyright Mon Jun 27 22:17:54 2011
@@ -1,16 +1,16 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Dominique Dumont <ddumont at cpan.org>
-Upstream-Source: http://search.cpan.org/dist/Config-Model-Approx/
-Upstream-Name: Config-Model-Approx
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Dominique Dumont <ddumont at cpan.org>
+Source: http://search.cpan.org/dist/Config-Model-Approx/
+Name: Config-Model-Approx
Files: *
-Copyright: 2009, Dominique Dumont <ddumont at cpan.org>
+Copyright: 2009-2011, Dominique Dumont <ddumont at cpan.org>
License: LGPL-2.1+
Files: debian/*
Copyright: 2009, Dominique Dumont <dominique.dumont at hp.com>
2009, Jonathan Yu <jawnsy at cpan.org>
+ 2011, Fabrizio Regalli <fabreg at fabreg.it>
License: LGPL-2.1+
License: LGPL-2.1+
Modified: trunk/libconfig-model-approx-perl/lib/Config/Model/Approx.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-approx-perl/lib/Config/Model/Approx.pm?rev=76651&op=diff
==============================================================================
--- trunk/libconfig-model-approx-perl/lib/Config/Model/Approx.pm (original)
+++ trunk/libconfig-model-approx-perl/lib/Config/Model/Approx.pm Mon Jun 27 22:17:54 2011
@@ -1,8 +1,5 @@
-# $Author: ddumont $
-# $Date: 2009-10-22 11:54:11 +0200 (jeu. 22 oct. 2009) $
-# $Revision: 1037 $
-# Copyright (c) 2009 Dominique Dumont.
+# Copyright (c) 2009-2011 Dominique Dumont.
#
# This file is part of Config-Model-Approx.
#
@@ -30,9 +27,7 @@
use File::Copy ;
use File::Path ;
-use vars qw($VERSION) ;
-
-$VERSION = '1.003' ;
+our $VERSION = '1.004' ;
my $logger = Log::Log4perl::get_logger(__PACKAGE__);
Modified: trunk/libconfig-model-approx-perl/lib/Config/Model/models/Approx.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-approx-perl/lib/Config/Model/models/Approx.pl?rev=76651&op=diff
==============================================================================
--- trunk/libconfig-model-approx-perl/lib/Config/Model/models/Approx.pl (original)
+++ trunk/libconfig-model-approx-perl/lib/Config/Model/models/Approx.pl Mon Jun 27 22:17:54 2011
@@ -1,107 +1,138 @@
[
- {
- 'read_config' => [
- {
- 'file' => 'approx.conf',
- 'backend' => 'custom',
- 'class' => 'Config::Model::Approx',
- 'config_dir' => '/etc/approx'
- }
- ],
- 'name' => 'Approx',
- 'element' => [
- 'max_rate',
- {
- 'value_type' => 'uniline',
- 'summary' => 'maximum download rate from remote repositories',
- 'type' => 'leaf',
- 'description' => "Specifies the maximum download rate from remote repositories, in bytes per second (default: unlimited). The value may be suf\x{2010} fixed with \"K\", \"M\", or \"G\" to indicate kilobytes, megabytes, or gigabytes per second, respectively."
- },
- 'max_redirects',
- {
- 'value_type' => 'integer',
- 'summary' => 'maximum number of HTTP redirections',
- 'upstream_default' => '5',
- 'type' => 'leaf',
- 'description' => 'Specifies the maximum number of HTTP redirections that will be followed when downloading a remote file'
- },
- 'user',
- {
- 'value_type' => 'uniline',
- 'summary' => 'user that owns the files in the approx cache',
- 'upstream_default' => 'approx',
- 'type' => 'leaf'
- },
- 'group',
- {
- 'value_type' => 'uniline',
- 'summary' => 'group that owns the files in the approx cache',
- 'upstream_default' => 'approx',
- 'type' => 'leaf'
- },
- 'syslog',
- {
- 'value_type' => 'uniline',
- 'summary' => 'syslog(3) facility to use when logging',
- 'upstream_default' => 'daemon',
- 'type' => 'leaf'
- },
- 'pdiffs',
- {
- 'value_type' => 'boolean',
- 'summary' => 'support IndexFile diffs',
- 'upstream_default' => '1',
- 'type' => 'leaf'
- },
- 'offline',
- {
- 'value_type' => 'boolean',
- 'summary' => 'use cached files when offline',
- 'upstream_default' => '0',
- 'type' => 'leaf',
- 'description' => 'Specifies whether to deliver (possibly out-of-date) cached files when they cannot be downloaded from remote repositories'
- },
- 'max_wait',
- {
- 'value_type' => 'integer',
- 'summary' => 'max wait for concurrent file download',
- 'upstream_default' => '10',
- 'type' => 'leaf',
- 'description' => 'Specifies how many seconds an approx(8) process will wait for a concurrent download of a file to complete, before attempting to download the file itself'
- },
- 'verbose',
- {
- 'value_type' => 'boolean',
- 'upstream_default' => '0',
- 'type' => 'leaf',
- 'description' => 'Specifies whether informational messages should be printed in the log'
- },
- 'debug',
- {
- 'value_type' => 'boolean',
- 'upstream_default' => '0',
- 'type' => 'leaf',
- 'description' => 'Specifies whether debug messages should be printed in the log'
- },
- 'distributions',
- {
- 'level' => 'important',
- 'cargo' => {
- 'value_type' => 'uniline',
- 'type' => 'leaf'
- },
- 'summary' => 'remote repositories',
- 'type' => 'hash',
- 'description' => 'The other name/value pairs are used to map distribution names to remote repositories. For example,
+ {
+ 'class_description' => 'Configuration model to edit C</etc/approc/approx.conf>. This file can be edited with the following command:
+
+ config-edit -application approx
+
+',
+ 'read_config' => [
+ {
+ 'file' => 'approx.conf',
+ 'backend' => 'custom',
+ 'class' => 'Config::Model::Approx',
+ 'config_dir' => '/etc/approx'
+ }
+ ],
+ 'name' => 'Approx',
+ 'copyright' => [
+ '2011, Dominique Dumont'
+ ],
+ 'author' => [
+ 'Dominique Dumont'
+ ],
+ 'license' => 'LGPL-2.1+',
+ 'element' => [
+ 'cache',
+ {
+ 'value_type' => 'uniline',
+ 'summary' => 'approx cache directory',
+ 'upstream_default' => '/var/cache/approx',
+ 'experience' => 'advanced',
+ 'type' => 'leaf',
+ 'description' => 'Specifies the location of the approx cache directory (default: /var/cache/approx). It and all its subdirectories must be owned by the approx server (see also the $user and $group parameters, below.)'
+ },
+ 'interval',
+ {
+ 'value_type' => 'integer',
+ 'summary' => 'file cache expiration in minutes',
+ 'upstream_default' => '720',
+ 'experience' => 'advanced',
+ 'type' => 'leaf',
+ 'description' => 'Specifies the time in minutes after which a cached file will be considered too old to deliver without first checking with the remote repository for a newer version'
+ },
+ 'max_rate',
+ {
+ 'value_type' => 'uniline',
+ 'summary' => 'maximum download rate from remote repositories',
+ 'type' => 'leaf',
+ 'description' => "Specifies the maximum download rate from remote repositories, in bytes per second (default: unlimited). The value may be suf\x{2010} fixed with \"K\", \"M\", or \"G\" to indicate kilobytes, megabytes, or gigabytes per second, respectively."
+ },
+ 'max_redirects',
+ {
+ 'value_type' => 'integer',
+ 'summary' => 'maximum number of HTTP redirections',
+ 'upstream_default' => '5',
+ 'type' => 'leaf',
+ 'description' => 'Specifies the maximum number of HTTP redirections that will be followed when downloading a remote file'
+ },
+ 'user',
+ {
+ 'value_type' => 'uniline',
+ 'summary' => 'user that owns the files in the approx cache',
+ 'upstream_default' => 'approx',
+ 'type' => 'leaf'
+ },
+ 'group',
+ {
+ 'value_type' => 'uniline',
+ 'summary' => 'group that owns the files in the approx cache',
+ 'upstream_default' => 'approx',
+ 'type' => 'leaf'
+ },
+ 'syslog',
+ {
+ 'value_type' => 'uniline',
+ 'summary' => 'syslog(3) facility to use when logging',
+ 'upstream_default' => 'daemon',
+ 'type' => 'leaf'
+ },
+ 'pdiffs',
+ {
+ 'value_type' => 'boolean',
+ 'summary' => 'support IndexFile diffs',
+ 'upstream_default' => '1',
+ 'type' => 'leaf'
+ },
+ 'offline',
+ {
+ 'value_type' => 'boolean',
+ 'summary' => 'use cached files when offline',
+ 'upstream_default' => '0',
+ 'type' => 'leaf',
+ 'description' => 'Specifies whether to deliver (possibly out-of-date) cached files when they cannot be downloaded from remote repositories'
+ },
+ 'max_wait',
+ {
+ 'value_type' => 'integer',
+ 'summary' => 'max wait for concurrent file download',
+ 'upstream_default' => '10',
+ 'type' => 'leaf',
+ 'description' => 'Specifies how many seconds an approx(8) process will wait for a concurrent download of a file to complete, before attempting to download the file itself'
+ },
+ 'verbose',
+ {
+ 'value_type' => 'boolean',
+ 'upstream_default' => '0',
+ 'type' => 'leaf',
+ 'description' => 'Specifies whether informational messages should be printed in the log'
+ },
+ 'debug',
+ {
+ 'value_type' => 'boolean',
+ 'upstream_default' => '0',
+ 'type' => 'leaf',
+ 'description' => 'Specifies whether debug messages should be printed in the log'
+ },
+ 'distributions',
+ {
+ 'level' => 'important',
+ 'cargo' => {
+ 'value_type' => 'uniline',
+ 'type' => 'leaf'
+ },
+ 'summary' => 'remote repositories',
+ 'type' => 'hash',
+ 'description' => 'The other name/value pairs are used to map distribution names to remote repositories. For example,
debian => http://ftp.debian.org/debian
security => http://security.debian.org/debian-security
Use the distribution name as the key of the hash element and the URL as the value
',
- 'index_type' => 'string'
- }
- ]
- }
- ]
+ 'index_type' => 'string'
+ }
+ ]
+ }
+]
;
+
Modified: trunk/libconfig-model-approx-perl/t/approx_config.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-approx-perl/t/approx_config.t?rev=76651&op=diff
==============================================================================
--- trunk/libconfig-model-approx-perl/t/approx_config.t (original)
+++ trunk/libconfig-model-approx-perl/t/approx_config.t Mon Jun 27 22:17:54 2011
@@ -1,7 +1,4 @@
# -*- cperl -*-
-# $Author: ddumont $
-# $Date: 2008-04-15 13:57:49 +0200 (mar, 15 avr 2008) $
-# $Revision: 608 $
use ExtUtils::testlib;
use Test::More tests => 5;
@@ -18,8 +15,6 @@
my ($log,$show) = (0) x 2 ;
my $trace = $arg =~ /t/ ? 1 : 0 ;
-$::verbose = 1 if $arg =~ /v/;
-$::debug = 1 if $arg =~ /d/;
$log = 1 if $arg =~ /l/;
$show = 1 if $arg =~ /s/;
More information about the Pkg-perl-cvs-commits
mailing list