Bug#648012: cupt: wanted, a 'cupt.conf' man page.

2011-11-10 Thread Eugene V. Lyubimkin 
tags 648012 + fixed-upstream
quit

On 2011-11-09 14:54, Jonathan Nieder wrote:
 Sure thing.  Here it is.  (I just redid the patch, but hopefully it's
 the same.)

Thanks! Applied all of them (added one missing '' to a third one).

-- 
Eugene V. Lyubimkin aka JackYF, JID: jackyf.devel(maildog)gmail.com
C++/Perl developer, Debian Developer



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#648012: cupt: wanted, a 'cupt.conf' man page.

2011-11-10 Thread Jonathan Nieder 
Eugene V. Lyubimkin wrote:

 Thanks! Applied all of them (added one missing '' to a third one).

Thanks for your attention to detail. :)



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#648012: cupt: wanted, a 'cupt.conf' man page.

2011-11-09 Thread Eugene V. Lyubimkin 
tags 648012 + confirmed
quit

Hi,

Thanks to the reporter, indeed sounds reasonable.

Thanks, Jonathan, the patch looks good. I wonder if it would be easy for
you to rebase it against the 'next' branch (it's fine if you don't want).

-- 
Eugene V. Lyubimkin aka JackYF, JID: jackyf.devel(maildog)gmail.com
C++/Perl developer, Debian Developer



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#648012: cupt: wanted, a 'cupt.conf' man page.

2011-11-09 Thread Jonathan Nieder 
tags 648012 + patch
quit

Eugene V. Lyubimkin wrote:

 Thanks, Jonathan, the patch looks good. I wonder if it would be easy for
 you to rebase it against the 'next' branch (it's fine if you don't want).

Sure thing.  Here it is.  (I just redid the patch, but hopefully it's
the same.)
From 4a599e7dde37c731b008091421cca25783c4590b Mon Sep 17 00:00:00 2001
From: Jonathan Nieder jrnie...@gmail.com
Date: Wed, 9 Nov 2011 14:37:20 -0600
Subject: debian: install_pods: permit '.' in manpage names

We are about to add a cupt.conf(5) page.

Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
 debian/install_pods |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/install_pods b/debian/install_pods
index 373e4057..28eb8c94 100644
--- a/debian/install_pods
+++ b/debian/install_pods
@@ -5,7 +5,7 @@ use strict;
 
 foreach my $pod_file (glob(doc/*.pod)) {
# example: doc/cupt.1.pod
-   my ($name, $section) = ($pod_file =~ m{.*/((?:\w|_|-)+)\.(\d)\.pod}) or
+   my ($name, $section) = ($pod_file =~ m{.*/((?:\w|_|-|\.)+)\.(\d)\.pod}) 
or
die badly formatted POD name $pod_file;
my $man_page_name = $name.$section;
my $uppercased_name = uc $name;
-- 
1.7.8.rc1

From ed6795b57b5ed92c6e3c81bc33d515014dc43544 Mon Sep 17 00:00:00 2001
From: Jonathan Nieder jrnie...@gmail.com
Date: Wed, 9 Nov 2011 14:45:29 -0600
Subject: doc: man: add a cupt.conf(5) page

Since on startup, 'cupt' checks for '/etc/cupt/cupt.conf':

% cupt config-dump | egrep '.*cupt::directory::configuration.*'
cupt::directory::configuration etc/cupt;
cupt::directory::configuration::main cupt.conf;
cupt::directory::configuration::main-parts cupt.conf.d;

move the 'man cupt' text under CONFIGURATION VARIABLES to its own
man page, 'cupt.conf(5)'.  This lets us shorten the cupt(1) page a
little bit.

Suggested-by: A. Costa agco...@gis.net
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
 debian/changelog|3 +
 doc/cupt.1.pod  |  460 +
 doc/cupt.conf.5.pod |  484 +++
 3 files changed, 489 insertions(+), 458 deletions(-)
 create mode 100644 doc/cupt.conf.5.pod

diff --git a/debian/changelog b/debian/changelog
index 752223fb..e13397a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,9 @@ cupt (2.3.0~) UNRELEASED; urgency=low
   - Honor 'cupt::cache::limit-releases::*' options.
 - 'fatal', 'warn', 'debug', 'simulate': are deprecated now.
   * doc:
+- man:
+  - [Jonathan Nieder] Split off a cupt.conf(5) page from cupt(1).
+Thanks to A. Costa for the idea (Closes: #648012).
 - What was referred as 'candidate version' is really
   the 'preferred version'.
 
diff --git a/doc/cupt.1.pod b/doc/cupt.1.pod
index a9940e7a..8afacdfb 100644
--- a/doc/cupt.1.pod
+++ b/doc/cupt.1.pod
@@ -899,463 +899,7 @@ don't output anything to standard output
 
 =head1 CONFIGURATION VARIABLES
 
-Firstly, Cupt uses following APT configuration variables:
-
-acquire::*::timeout, acquire::*::proxy, acquire::http::allowredirect,
-acquire::retries, apt::acquire::translation, apt::cache::allversions,
-apt::cache::important, apt::cache::namesonly, apt::cache::recursedepends,
-apt::default-release, apt::install-recommends, apt::install-suggests,
-apt::neverautoremove, apt::get::assume-yes, apt::get::allowunauthenticated,
-apt::get::automaticremove, apt::get::list-cleanup, apt::get::purge,
-apt::update::pre-invoke, apt::update::post-invoke,
-apt::update::post-invoke-success, dir, dir::bin::dpkg, dir::cache,
-dir::cache::archives, dir::etc, dir::etc::sourcelist, dir::etc::sourceparts,
-dir::etc::parts, dir::etc::main, dir::etc::preferences, dir::state,
-dir::state::extendedstates, dir::state::status, dpkg::options,
-dpkg::pre-invoke, dpkg::post-invoke, dpkg::pre-install-pkgs,
-gpgv::trustedkeyring, quiet
-
-See Lapt.conf(5) for their meanings.
-
-Secondly, Cupt recognizes (but doesn't use) following configuration variables:
-
-apt::archives::*, acquire::pdiffs, apt::cache-limit, apt::periodic::*,
-dir::log*, dir::state::lists, unattended-upgrade::*, acquire::compressiontypes,
-apt::get::show-upgraded, apt::get::build-dep-automatic, rpm::pre-invoke,
-rpm::post-invoke
-
-Thirdly, Cupt introduces cupt-specific configuration variables.
-
-=head2 variable types
-
-=over
-
-=item boolean
-
-false may be specified as 0 or false or no, everything else interpretes 
as true
-
-if undefined, interpretes as false
-
-=item integer
-
-signed 32-bit integer on 32-bit systems, signed 64-bit integer on 64-bit 
systems
-
-if undefined, interpretes as 0
-
-=item string
-
-interpreted as is
-
-if undefined, interpretes as empty string
-
-=item list
-
-list of strings
-
-if undefined, intepretes as empty list
-
-=back
-
-=head2 variables
-
-=over
-
-=item cupt::cache::limit-releases::by-*::type
-
-string, determines the type of limiting repository releases to use
-
-All

Bug#648012: cupt: wanted, a 'cupt.conf' man page.

2011-11-08 Thread A. Costa 
Package: cupt
Version: 2.2.2
Severity: wishlist


Since on startup, 'cupt' checks for '/etc/cupt/cupt.conf':

% cupt config-dump | egrep '.*cupt::directory::configuration.*'
cupt::directory::configuration etc/cupt;
cupt::directory::configuration::main cupt.conf;
cupt::directory::configuration::main-parts cupt.conf.d;

Please consider moving the 'man cupt' text under CONFIGURATION VARIABLES 
to its own man page, e.g. 'cupt.conf(5)'.

The 'apt' package includes an 'apt.conf' man page.

The current 'man cupt' is comparatively long:

% for f in apt-get apt.conf cupt ; do printf '%-10s  ' $f ; man $f | wc 
-l ; done
apt-get 478
apt.conf803
cupt1073

# Count lines in CONFIGURATION VARIABLES section (plus 1).
% man cupt | sed -n '/CONFIG/,/REPO/p' | wc -l
331

Hope this helps...




-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.0.0-2-686-pae (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) (ignored: LC_ALL set to C)
Shell: /bin/sh linked to /bin/bash

Versions of packages cupt depends on:
ii  libboost-program-options1.46.1  1.46.1-7 
ii  libc6   2.13-21  
ii  libcupt2-0  2.2.2
ii  libgcc1 1:4.6.2-4
ii  libstdc++6  4.6.2-4  

cupt recommends no packages.

Versions of packages cupt suggests:
ii  libreadline66.2-7
ii  sensible-utils  0.0.6

-- no debconf information



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#648012: cupt: wanted, a 'cupt.conf' man page.

2011-11-08 Thread Jonathan Nieder 
Hi,

A. Costa wrote:

 Please consider moving the 'man cupt' text under CONFIGURATION VARIABLES 
 to its own man page, e.g. 'cupt.conf(5)'.

Sounds reasonable.  Here's a first sketch; what do you think?

(As you can see, I'm lazy.  Improvements welcome.)
---
 debian/install_pods |2 +-
 doc/cupt.1.pod  |  397 +---
 doc/cupt.conf.5.pod |  421 +++
 3 files changed, 424 insertions(+), 396 deletions(-)
 create mode 100644 doc/cupt.conf.5.pod

diff --git a/debian/install_pods b/debian/install_pods
index 373e4057..28eb8c94 100644
--- a/debian/install_pods
+++ b/debian/install_pods
@@ -5,7 +5,7 @@ use strict;
 
 foreach my $pod_file (glob(doc/*.pod)) {
# example: doc/cupt.1.pod
-   my ($name, $section) = ($pod_file =~ m{.*/((?:\w|_|-)+)\.(\d)\.pod}) or
+   my ($name, $section) = ($pod_file =~ m{.*/((?:\w|_|-|\.)+)\.(\d)\.pod}) 
or
die badly formatted POD name $pod_file;
my $man_page_name = $name.$section;
my $uppercased_name = uc $name;
diff --git a/doc/cupt.1.pod b/doc/cupt.1.pod
index be0f79c6..ffef2ddf 100644
--- a/doc/cupt.1.pod
+++ b/doc/cupt.1.pod
@@ -851,400 +851,7 @@ don't output anything to standard output
 
 =head1 CONFIGURATION VARIABLES
 
-Firstly, Cupt uses following APT configuration variables:
-
-acquire::*::timeout, acquire::*::proxy, acquire::http::allowredirect,
-acquire::retries, apt::acquire::translation, apt::cache::allversions,
-apt::cache::important, apt::cache::namesonly, apt::cache::recursedepends,
-apt::default-release, apt::install-recommends, apt::install-suggests,
-apt::neverautoremove, apt::get::assume-yes, apt::get::allowunauthenticated,
-apt::get::automaticremove, apt::get::list-cleanup, apt::get::purge,
-apt::update::pre-invoke, apt::update::post-invoke,
-apt::update::post-invoke-success, dir, dir::bin::dpkg, dir::cache,
-dir::cache::archives, dir::etc, dir::etc::sourcelist, dir::etc::sourceparts,
-dir::etc::parts, dir::etc::main, dir::etc::preferences, dir::state,
-dir::state::extendedstates, dir::state::status, dpkg::options,
-dpkg::pre-invoke, dpkg::post-invoke, dpkg::pre-install-pkgs,
-gpgv::trustedkeyring, quiet
-
-See Lapt.conf(5) for their meanings.
-
-Secondly, Cupt recognizes (but doesn't use) following configuration variables:
-
-apt::archives::*, acquire::pdiffs, apt::cache-limit, apt::periodic::*,
-dir::state::lists, unattended-upgrade::*, acquire::compressiontypes,
-apt::get::show-upgraded, apt::get::build-dep-automatic, rpm::pre-invoke,
-rpm::post-invoke
-
-Thirdly, Cupt introduces cupt-specific configuration variables.
-
-=head2 variable types
-
-=over
-
-=item boolean
-
-false may be specified as 0 or false or no, everything else interpretes 
as true
-
-if undefined, interpretes as false
-
-=item integer
-
-signed 32-bit integer on 32-bit systems, signed 64-bit integer on 64-bit 
systems
-
-if undefined, interpretes as 0
-
-=item string
-
-interpreted as is
-
-if undefined, interpretes as empty string
-
-=item list
-
-list of strings
-
-if undefined, intepretes as empty list
-
-=back
-
-=head2 variables
-
-=over
-
-=item cupt::cache::pin::addendums::downgrade
-
-integer, specifies priority change for versions that are smaller than currently
-installed. Defaults to -1.
-
-=item cupt::cache::pin::addendums::hold
-
-integer, specifies priority increase for versions that are put on hold.
-Defaults to 100. Set this option to 0 if you do not want to obey holds.
-You may want to increase this option in (very unlikely to happen) situations:
-when you have thousands of manually installed packages and very large query;
-when you have a manually crafted pin priorities system with very large pin
-values.
-
-=item cupt::cache::pin::addendums::not-automatic
-
-integer, specifies priority increase for versions that come only from 'not
-automatic' sources. Defaults to -4000.
-
-=item cupt::cache::release-file-expiration::ignore
-
-boolean, if set to true, Cupt will ignore the fact that a Release file is
-expired and use it anyway. False by default.
-
-BWarning! Setting this option to true will make the system vulnerable to a 
replay attack on package manager indexes.
-
-=item cupt::console::allow-untrusted
-
-boolean, don't treat using untrusted packages as dangerous action
-
-=item cupt::console::assume-yes
-
-boolean, see L--assume-yes|/--assume-yes
-
-=item cupt::directory
-
-string, base directory for all cupt::directory::* options
-
-=item cupt::directory::configuration
-
-string, base directory for Cupt-specific configuration files
-
-=item cupt::directory::configuration::main
-
-string, relative file path for the Cupt main configuration file (same format as
-Lapt.conf(5))
-
-=item cupt::directory::configuration::main-parts
-
-string, relative directory path for additional Cupt configuration files (same
-format as Lapt.conf(5))
-
-=item cupt::directory::log
-
-string, relative file path for the log file
-
-=item